aboutsummaryrefslogtreecommitdiffstats
path: root/dvb-s
diff options
context:
space:
mode:
Diffstat (limited to 'dvb-s')
-rw-r--r--dvb-s/ABS1-75.0E72
-rw-r--r--dvb-s/AMC1-103w18
-rw-r--r--dvb-s/AMC16-85.0W27
-rw-r--r--dvb-s/AMC4-101w63
-rw-r--r--dvb-s/AMC5-79w18
-rw-r--r--dvb-s/AMC6-72w369
-rw-r--r--dvb-s/AMC9-83.0W135
-rw-r--r--dvb-s/Agila2_C-146.0E162
-rw-r--r--dvb-s/Amazonas-61.0W459
-rw-r--r--dvb-s/Amos-4w414
-rw-r--r--dvb-s/Anik-F1-107.3W36
-rw-r--r--dvb-s/Apstar6_C-134.0E27
-rw-r--r--dvb-s/AsiaSat2_C-100.5E135
-rw-r--r--dvb-s/AsiaSat3S_C-105.5E288
-rw-r--r--dvb-s/Asiasat4_C-122.2E63
-rw-r--r--dvb-s/Astra-19.2E9
-rw-r--r--dvb-s/Astra-23.5E480
-rw-r--r--dvb-s/Astra-28.2E792
-rw-r--r--dvb-s/Astra-31.5E57
-rw-r--r--dvb-s/Atlantic-Bird-1-12.5W300
-rw-r--r--dvb-s/Atlantic-Bird-3-5.0W392
-rw-r--r--dvb-s/BrasilSat-B1-75.0W72
-rw-r--r--dvb-s/BrasilSat-B2-65.0W279
-rw-r--r--dvb-s/BrasilSat-B4-70.0W324
-rw-r--r--dvb-s/BrasilsatB4-84.0W738
-rw-r--r--dvb-s/ChinaSat5A-87.5E27
-rw-r--r--dvb-s/Estrela-do-Sul-63.0W216
-rw-r--r--dvb-s/Eurobird1-28.5E27
-rw-r--r--dvb-s/Eutelsat9-9.0E126
-rw-r--r--dvb-s/EutelsatW2-16E504
-rw-r--r--dvb-s/Express-3A-11.0W9
-rw-r--r--dvb-s/ExpressAM1-40.0E27
-rw-r--r--dvb-s/ExpressAM2-80.0E171
-rw-r--r--dvb-s/ExpressAM22-53.0E54
-rw-r--r--dvb-s/Galaxy10R-123w63
-rw-r--r--dvb-s/Galaxy17-91.0W414
-rw-r--r--dvb-s/Galaxy19-97.0W144
-rw-r--r--dvb-s/Galaxy25-93.0W531
-rw-r--r--dvb-s/Galaxy27-129w9
-rw-r--r--dvb-s/Galaxy28-89.0W351
-rw-r--r--dvb-s/Galaxy3C-95.0W9
-rw-r--r--dvb-s/Hispasat-30.0W360
-rw-r--r--dvb-s/Hotbird-13.0E880
-rw-r--r--dvb-s/IA7-129w9
-rw-r--r--dvb-s/Insat2E_C-83.0E261
-rw-r--r--dvb-s/Insat3A_C-93.5E180
-rw-r--r--dvb-s/Insat4A_C-83.0E261
-rw-r--r--dvb-s/Insat4B_C-93.5E135
-rw-r--r--dvb-s/Intel4-72.0E36
-rw-r--r--dvb-s/Intel904-60.0E99
-rw-r--r--dvb-s/Intelsat-1002-1.0W162
-rw-r--r--dvb-s/Intelsat-11-43.0W9
-rw-r--r--dvb-s/Intelsat-12-45.0E114
-rw-r--r--dvb-s/Intelsat-1R-45.0W369
-rw-r--r--dvb-s/Intelsat-3R-43.0W288
-rw-r--r--dvb-s/Intelsat-6B-43.0W126
-rw-r--r--dvb-s/Intelsat-705-50.0W36
-rw-r--r--dvb-s/Intelsat-707-53.0W18
-rw-r--r--dvb-s/Intelsat-805-55.5W576
-rw-r--r--dvb-s/Intelsat-9-58.0W495
-rw-r--r--dvb-s/Intelsat-903-34.5W36
-rw-r--r--dvb-s/Intelsat-905-24.5W54
-rw-r--r--dvb-s/Intelsat-907-27.5W54
-rw-r--r--dvb-s/Intelsat8_C-166.0E99
-rw-r--r--dvb-s/JCSat3A_C-128.0E36
-rw-r--r--dvb-s/Measat3_C-91.5E144
-rw-r--r--dvb-s/NSS-10-37.5W81
-rw-r--r--dvb-s/NSS-7-22.0W198
-rw-r--r--dvb-s/NSS-806-40.5W945
-rw-r--r--dvb-s/Nahuel-1-71.8W72
-rw-r--r--dvb-s/Nilesat101+102-7.0W351
-rw-r--r--dvb-s/OptusC1-156E162
-rw-r--r--dvb-s/OptusD1-160.0E18
-rw-r--r--dvb-s/PAS-43.0W36
-rw-r--r--dvb-s/PalapaC2_C-113.0E99
-rw-r--r--dvb-s/SBS6-74w9
-rw-r--r--dvb-s/SES2-87.0W63
-rw-r--r--dvb-s/ST1_C-80.0E63
-rw-r--r--dvb-s/Satmex-5-116.8W621
-rw-r--r--dvb-s/Satmex-6-113.0W144
-rw-r--r--dvb-s/Sirius-5.0E540
-rw-r--r--dvb-s/Telecom2-8.0W135
-rw-r--r--dvb-s/Telkom1_C-108.0E126
-rw-r--r--dvb-s/Telstar10_C-76.5E171
-rw-r--r--dvb-s/Telstar12-15.0W216
-rw-r--r--dvb-s/Telstar18_C-138.0E36
-rw-r--r--dvb-s/Thaicom1A_C-120.0E54
-rw-r--r--dvb-s/Thaicom2_C-78.5E81
-rw-r--r--dvb-s/Thaicom5_C-78.5E189
-rw-r--r--dvb-s/Thor-1.0W567
-rw-r--r--dvb-s/Turksat-42.0E918
-rw-r--r--dvb-s/Vinasat1_C-132.0E18
-rw-r--r--dvb-s/Yamal201-90.0E207
93 files changed, 17242 insertions, 2126 deletions
diff --git a/dvb-s/ABS1-75.0E b/dvb-s/ABS1-75.0E
index 26ea163..2183628 100644
--- a/dvb-s/ABS1-75.0E
+++ b/dvb-s/ABS1-75.0E
@@ -1,10 +1,66 @@
# ABS-1 @ 75E
# freq pol sr fec
-S 12518000 V 22000000 AUTO
-S 12548000 V 22000000 AUTO
-S 12579000 V 22000000 AUTO
-S 12640000 V 22000000 AUTO
-S 12670000 V 22000000 AUTO
-S 12693000 V 10000000 AUTO
-S 12704000 V 3900000 AUTO
-S 12740000 V 7408000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12518000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12548000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12579000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12640000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12670000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12693000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12704000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3900000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12740000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7408000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC1-103w b/dvb-s/AMC1-103w
index f09dc62..bb9db84 100644
--- a/dvb-s/AMC1-103w
+++ b/dvb-s/AMC1-103w
@@ -1,5 +1,19 @@
# AMC 1 @ 103W
# freq pol sr fec
-S 11942000 V 20000000 AUTO
-S 12100000 V 20000000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11942000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12100000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC16-85.0W b/dvb-s/AMC16-85.0W
index 0cd0611..8d89f91 100644
--- a/dvb-s/AMC16-85.0W
+++ b/dvb-s/AMC16-85.0W
@@ -1,6 +1,27 @@
# AMC 2 @ 85W
# freq pol sr fec
-S 11731000 H 13021000 AUTO
-S 11744000 H 13021000 AUTO
-S 11771000 H 13021000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11731000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11744000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11771000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC4-101w b/dvb-s/AMC4-101w
index dd732dd..11397d5 100644
--- a/dvb-s/AMC4-101w
+++ b/dvb-s/AMC4-101w
@@ -1,10 +1,59 @@
# AMC 4 @ 101.0W
# freq pol sr fec
-S 11573000 V 07234000 AUTO
-S 11655000 V 30000000 AUTO
-S 11708000 V 02170000 AUTO
-S 11822000 H 05700000 AUTO
-S 11860000 H 28138000 AUTO
-S 12120000 V 30000000 AUTO
-S 12169000 H 03003000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11573000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7234000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11655000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11708000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11822000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11860000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28138000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12120000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12169000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3003000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC5-79w b/dvb-s/AMC5-79w
index 0aeebc6..6d8f7ec 100644
--- a/dvb-s/AMC5-79w
+++ b/dvb-s/AMC5-79w
@@ -1,5 +1,19 @@
# AMC 5 @ 79W
# freq pol sr fec
-S 11742000 V 11110000 AUTO
-S 12182000 H 23000000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11742000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11110000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12182000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 23000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC6-72w b/dvb-s/AMC6-72w
index 75307da..525972a 100644
--- a/dvb-s/AMC6-72w
+++ b/dvb-s/AMC6-72w
@@ -1,44 +1,331 @@
# AMC 6 @ 72W
# freq pol sr fec
-S 11482000 V 02656000 AUTO
-S 11494000 V 06560000 AUTO
-S 11499000 V 02964000 AUTO
-S 11505000 V 02963000 AUTO
-S 11546000 V 12000000 AUTO
-S 11548000 H 03002000 AUTO
-S 11552000 H 03002000 AUTO
-S 11557000 H 04392000 AUTO
-S 11563000 H 04392000 AUTO
-S 11570000 H 04392000 AUTO
-S 11576000 H 04392000 AUTO
-S 11586000 H 02652000 AUTO
-S 11603000 V 08500000 AUTO
-S 11605000 V 03600000 AUTO
-S 11611000 V 03400000 AUTO
-S 11628000 V 06560000 AUTO
-S 11637000 V 02800000 AUTO
-S 11641000 V 03702000 AUTO
-S 11648000 V 07500000 AUTO
-S 11667000 V 07400000 AUTO
-S 11674000 V 04000000 AUTO
-S 11680000 V 03255000 AUTO
-S 11703000 V 03979000 AUTO
-S 11709000 V 03979000 AUTO
-S 11715000 V 03979000 AUTO
-S 11746000 V 03979000 AUTO
-S 11748000 H 14015000 AUTO
-S 11752000 V 03979000 AUTO
-S 11763000 V 03979000 AUTO
-S 11817000 H 05000000 AUTO
-S 11874000 V 04000000 AUTO
-S 11986000 V 03979000 AUTO
-S 11995000 V 03979000 AUTO
-S 12004000 V 03979000 AUTO
-S 12013000 V 03979000 AUTO
-S 12025000 V 03979000 AUTO
-S 12031000 V 03979000 AUTO
-S 12046000 H 06111000 AUTO
-S 12055000 V 06890000 AUTO
-S 12144000 V 02573000 AUTO
-S 12188000 H 06511000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11482000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2656000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11494000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6560000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11499000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2964000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11505000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11546000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 12000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11548000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3002000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11552000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3002000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11557000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4392000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11563000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4392000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11570000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4392000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11576000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4392000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11586000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2652000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11603000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11605000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11611000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11628000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6560000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11637000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11641000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3702000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11648000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11667000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11674000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11680000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11703000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11709000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11715000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11746000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11748000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 14015000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11752000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11763000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11817000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11874000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11986000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11995000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12004000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12013000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12025000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12031000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12046000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12055000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6890000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12144000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2573000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12188000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6511000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/AMC9-83.0W b/dvb-s/AMC9-83.0W
index b7d0882..847ab2a 100644
--- a/dvb-s/AMC9-83.0W
+++ b/dvb-s/AMC9-83.0W
@@ -1,18 +1,123 @@
# AMC 9 @ 83W
# freq pol sr fec
-S 11745000 H 04232000 AUTO
-S 11751000 H 04232000 AUTO
-S 11757000 H 04232000 AUTO
-S 11763000 H 04232000 AUTO
-S 11769000 H 04232000 AUTO
-S 11775000 H 04232000 AUTO
-S 11826000 H 05632000 AUTO
-S 11864000 H 03979000 AUTO
-S 11871000 H 13000000 AUTO
-S 11889000 H 13025000 AUTO
-S 11926000 V 06511000 AUTO
-S 11953000 V 03979000 AUTO
-S 11960000 H 05000000 AUTO
-S 12002000 H 03979000 AUTO
-S 12011000 H 03979000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11745000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11751000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11757000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11763000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11769000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11775000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11826000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11864000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11871000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11889000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13025000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11926000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6511000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11953000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11960000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12002000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12011000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Agila2_C-146.0E b/dvb-s/Agila2_C-146.0E
index ac30747..5591e50 100644
--- a/dvb-s/Agila2_C-146.0E
+++ b/dvb-s/Agila2_C-146.0E
@@ -6,55 +6,181 @@
# freq pol sr fec
# Viva Prime Channel
-S 3725000 H 2345000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3725000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2345000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Zoe Philippines
-S 3774000 V 3300000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3774000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3300000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Da Ai TV indonesia
-S 3791000 H 3100000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3791000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3100000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Trinity Broadcasting Multiplex
-S 3791000 V 10091000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3791000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10091000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Bayon TV
-S 3796000 H 3360000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3796000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3360000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# White Springs TV
-S 3846000 H 6110000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3846000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6110000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TCT World
-S 3854000 H 2603000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3854000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2603000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# CCTN
-S 3873000 V 2532000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3873000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2532000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# NBN Philippines
-S 3875000 H 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3875000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Al Masriyah
-S 3880000 H 2000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3880000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Viva Entertainment Multiplex
-S 3887000 H 6716000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3887000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6716000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# IBC13
-S 3896000 H 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3896000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# CTN Cambodia Multiplex
-S 3979000 V 9628000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3979000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 9628000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Divya TV
-S 3990000 V 13330000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3990000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13330000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Familyland TV Network
-S 4164000 V 3735000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4164000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3735000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# MTV Philippines
-S 4171000 V 3213000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4171000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3213000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# The Old Path TV
-S 4183000 V 2170000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4183000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# UNTV
-S 4188000 V 2170000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4188000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Amazonas-61.0W b/dvb-s/Amazonas-61.0W
index 825b18a..b7471c1 100644
--- a/dvb-s/Amazonas-61.0W
+++ b/dvb-s/Amazonas-61.0W
@@ -1,54 +1,411 @@
# Amazonas @ 61.0W
# freq pol sr fec
-S 3957000 H 06666000 AUTO
-S 3966000 H 06666000 AUTO
-S 3975000 H 06666000 AUTO
-S 3993000 H 06666000 AUTO
-S 4137000 H 03409000 AUTO
-S 3941000 V 03480000 AUTO
-S 12092000 V 30000000 AUTO
-S 12132000 V 30000000 AUTO
-S 4174000 H 03330000 AUTO
-S 11128000 V 06666000 AUTO
-S 11185000 V 11800000 AUTO
-S 11049000 V 02000000 AUTO
-S 12052000 V 27000000 AUTO
-S 10975000 V 27000000 AUTO
-S 3631000 H 02785000 AUTO
-S 10975000 H 26666000 AUTO
-S 3677000 H 04400000 AUTO
-S 3985000 H 04444000 AUTO
-S 11810000 V 06666000 AUTO
-S 11921000 V 21740000 AUTO
-S 11943000 V 04750000 AUTO
-S 4168000 H 07307000 AUTO
-S 12052000 H 26667000 AUTO
-S 12172000 H 27500000 AUTO
-S 12092000 H 27500000 AUTO
-S 11175000 H 28880000 AUTO
-S 4154000 H 09615000 AUTO
-S 11099000 V 07576000 AUTO
-S 11885000 H 04890000 AUTO
-S 11882000 V 11343000 AUTO
-S 11133000 V 03111000 AUTO
-S 11078000 V 01862000 AUTO
-S 11912000 H 02222000 AUTO
-S 11906000 H 02220000 AUTO
-S 11108000 V 02170000 AUTO
-S 12132000 H 27500000 AUTO
-S 11135000 H 26667000 AUTO
-S 4144000 V 04540000 AUTO
-S 11808000 H 11111000 AUTO
-S 11972000 H 26667000 AUTO
-S 4156000 V 04540000 AUTO
-S 4149000 V 04540000 AUTO
-S 3948000 H 13300000 AUTO
-S 4178000 H 03333000 AUTO
-S 11844000 V 16600000 AUTO
-S 11095000 H 30000000 AUTO
-S 11790000 H 03600000 AUTO
-S 12172000 V 30000000 AUTO
-S 11015000 H 26666000 AUTO
-S 11055000 H 27500000 AUTO
-S 12012000 H 27500000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3957000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3966000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3975000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3993000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4137000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3409000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3941000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3480000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12092000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12132000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4174000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3330000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11128000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11185000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11049000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12052000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10975000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3631000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2785000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10975000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3677000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3985000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11810000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11921000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 21740000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11943000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4750000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4168000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7307000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12052000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12172000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12092000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11175000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28880000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4154000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 9615000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11099000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7576000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11885000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4890000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11882000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11343000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11133000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11078000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1862000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11912000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11906000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2220000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11108000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12132000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11135000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4144000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11808000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 11111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11972000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4156000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4149000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3948000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13300000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4178000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11844000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 16600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11095000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11790000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12172000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11055000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12012000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Amos-4w b/dvb-s/Amos-4w
index d10c48a..522280c 100644
--- a/dvb-s/Amos-4w
+++ b/dvb-s/Amos-4w
@@ -1,48 +1,370 @@
# Amos 6 @ 4W
# freq pol sr fec
-S 10722000 H 27500000 3/4
-S 10722000 V 27500000 3/4
-S 10722000 V 30000000 2/3
-S 10758000 V 27500000 3/4
-S 10758000 V 30000000 2/3
-S 10759000 H 30000000 3/4
-S 10806000 H 27500000 5/6
-S 10806000 V 27500000 3/4
-S 10842000 H 27500000 7/8
-S 10842000 V 27500000 3/4
-S 10842000 V 30000000 2/3
-S 10890000 H 27500000 7/8
-S 10890000 V 27500000 3/4
-S 10925000 H 27500000 7/8
-S 10925000 V 27500000 3/4
-S 10972000 V 27500000 3/4
-S 11008000 V 27500000 3/4
-S 11015000 H 2295000 3/4
-S 11123000 H 1850000 7/8
-S 11167000 H 12500000 5/6
-S 11179000 H 6666000 3/4
-S 11260000 H 27500000 3/4
-S 11304000 H 19540000 3/4
-S 11319000 H 2750000 3/4
-S 11329000 H 3333000 3/4
-S 11333000 H 3500000 3/4
-S 11347000 H 3350000 3/4
-S 11384000 H 19000000 5/6
-S 11411000 H 7925000 5/6
-S 11429000 H 5925000 3/4
-S 11435000 H 2089000 3/4
-S 11474000 V 27500000 3/4
-S 11510000 V 30000000 2/3
-S 11558000 V 27500000 3/4
-S 11559000 H 13400000 7/8
-S 11572000 H 8888000 3/4
-S 11592000 H 21350000 3/4
-S 11593000 V 27500000 3/4
-S 11625000 V 3000000 3/4
-S 11630000 H 2963000 3/4
-S 11630000 V 3000000 3/4
-S 11637000 V 1480000 3/4
-S 11647000 H 9167000 3/4
-S 11647000 V 8518000 3/4
-S 11654000 H 2000000 5/6
-S 11658000 V 8520000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10722000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10722000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10722000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10758000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10758000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10759000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10806000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10806000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10842000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10842000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10842000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10890000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10890000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10925000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10925000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10972000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11008000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2295000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11123000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1850000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11167000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 12500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11179000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11260000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11304000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19540000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11319000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2750000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11329000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11333000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11347000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3350000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11384000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11411000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7925000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11429000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5925000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11435000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2089000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11474000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11510000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11558000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11559000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13400000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11572000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8888000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11592000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 21350000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11593000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11625000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11630000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11630000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11637000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1480000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11647000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 9167000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11647000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8518000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11654000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11658000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8520000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
diff --git a/dvb-s/Anik-F1-107.3W b/dvb-s/Anik-F1-107.3W
index 2cf82aa..4613024 100644
--- a/dvb-s/Anik-F1-107.3W
+++ b/dvb-s/Anik-F1-107.3W
@@ -1,7 +1,35 @@
# Anik F1 @ 107.3W
# freq pol sr fec
-S 12002000 H 19980000 AUTO
-S 12063000 H 19980000 AUTO
-S 12155000 H 22500000 AUTO
-S 12185000 H 19980000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12002000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19980000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12063000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19980000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12155000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12185000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19980000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Apstar6_C-134.0E b/dvb-s/Apstar6_C-134.0E
index 6a8a1f1..b61c7c7 100644
--- a/dvb-s/Apstar6_C-134.0E
+++ b/dvb-s/Apstar6_C-134.0E
@@ -6,10 +6,31 @@
# freq pol sr fec
# New Entertainment
-S 3766000 H 4285000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3766000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Test
-S 3840000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3840000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV Nusantara
-S 3905000 H 3250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3905000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/AsiaSat2_C-100.5E b/dvb-s/AsiaSat2_C-100.5E
index 1cc8035..c0889c8 100644
--- a/dvb-s/AsiaSat2_C-100.5E
+++ b/dvb-s/AsiaSat2_C-100.5E
@@ -6,46 +6,151 @@
# freq pol sr fec
# Iris Sat Multiplex
-S 3660000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3660000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# APTN Direct
-S 3706000 H 4167000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3706000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4167000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# APTN Global Video Wire (MPEG-4 S/2)
-S 3732000 H 8889000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3732000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8889000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# BYU TV
-S 3767000 V 6527000 1/2
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3767000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6527000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
# AJK TV
-S 3778000 V 3333000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3778000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RTB International Brunei
-S 3786000 H 6000000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3786000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Shamshad TV
-S 3790000 V 2444000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3790000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2444000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# FTV HD (MPEG-4 S/2)
-S 3794000 H 4640000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3794000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4640000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Arabsat ASBU Bouquet Multiplex
-S 3820000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3820000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Star TV Multiplex (MPEG-4 S/2)
-S 3840000 H 30000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3840000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# E Network Multiplex
-S 3880000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3880000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# SatLink Multiplex
-S 3960000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3960000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Star TV Multiplex
-S 3980000 V 28100000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3980000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28100000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# SatLink European Bouquet (MPEG-2 & MPEG-4 S2)
-S 4000000 H 28125000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4000000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28125000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Macau Satellite TV Multiplex
-S 4148000 V 11852000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4148000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11852000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/AsiaSat3S_C-105.5E b/dvb-s/AsiaSat3S_C-105.5E
index 4d09ef5..4454e44 100644
--- a/dvb-s/AsiaSat3S_C-105.5E
+++ b/dvb-s/AsiaSat3S_C-105.5E
@@ -6,97 +6,321 @@
# freq pol sr fec
# China Entertainment TV & Maharishi Veda Vision
-S 3680000 H 26670000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3680000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26670000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# MediaCorp Channel News Asia
-S 3706000 H 6000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3706000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# BTV World
-S 3725000 V 4450000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3725000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4450000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Galaxy TVB
-S 3729000 H 13650000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3729000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13650000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Zee Network
-S 3733000 V 6500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3733000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Madani Channel
-S 3739000 V 2815000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3739000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2815000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Fashion TV
-S 3746000 V 2625000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3746000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2625000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Aaj News
-S 3750000 V 2821000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3750000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2821000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Arirang Arab
-S 3755000 V 4418000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3755000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4418000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Globecast multiplex
-S 3760000 H 26000000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3760000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Star TV Multiplex
-S 3780000 V 28100000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3780000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28100000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Airwaves Media Multiplex
-S 3786000 H 5700000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3786000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5700000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Zee Network Multiplex
-S 3820000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3820000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Star TV Multiplex
-S 3840000 H 26850000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3840000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26850000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Star TV Multiplex
-S 3860000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3860000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# B4U INDIA - MPEG-4 S/2 Multiplex
-S 3880000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3880000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Star TV Multiplex
-S 3940000 V 28100000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3940000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28100000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Tuner International Multiplex
-S 3960000 H 28100000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3960000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28100000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Star TV Multiplex
-S 3980000 V 28100000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3980000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28100000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Star TV Multiplex
-S 4000000 H 26850000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4000000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26850000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Sahara Samay Multiplex
-S 4020000 V 27250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4020000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# VOA Voice Of America Multiplex
-S 4040000 H 20400000 1/2
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4040000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 20400000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
# Globecast Multiplex
-S 4071000 H 14240000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4071000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 14240000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# PTV Multiplex
-S 4091000 V 13333000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4091000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Sun TV
-S 4095000 H 5554000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4095000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5554000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# PTV Global USA
-S 4102000 V 2894000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4102000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2894000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# PTV Global UK & Europe
-S 4106000 V 2894000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4106000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2894000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Galaxy TVB Multiplex
-S 4111000 H 13650000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4111000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13650000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# PTV Multiplex
-S 4114000 V 7000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4114000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Eye TV Multiplex
-S 4129000 H 13600000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4129000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13600000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Zee Network Multiplex
-S 4140000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4140000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Geo TV Network Multiplex
-S 4180000 V 26666000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4180000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26666000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Asiasat4_C-122.2E b/dvb-s/Asiasat4_C-122.2E
index 60a9730..3bc0c09 100644
--- a/dvb-s/Asiasat4_C-122.2E
+++ b/dvb-s/Asiasat4_C-122.2E
@@ -6,22 +6,71 @@
# freq pol sr fec
# SITI Digital Network Multiplex
-S 3760000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3760000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# SITI Digital Network Multiplex
-S 3820000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3820000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Henan Radio Multiplex
-S 3856000 H 2170000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3856000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# SITI Digital Network Multiplex
-S 3880000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3880000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# SITI Digital network Multiplex
-S 3920000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3920000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# SITI Digital network Multiplex
-S 3960000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3960000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# SITI Digital network Multiplex
-S 4180000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4180000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Astra-19.2E b/dvb-s/Astra-19.2E
index 74e1b59..2d1f0b2 100644
--- a/dvb-s/Astra-19.2E
+++ b/dvb-s/Astra-19.2E
@@ -1,3 +1,10 @@
# Astra 19.2E SDT info service transponder
# freq pol sr fec
-S 12551500 V 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12551500
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
diff --git a/dvb-s/Astra-23.5E b/dvb-s/Astra-23.5E
index 6e45dbf..ed505ea 100644
--- a/dvb-s/Astra-23.5E
+++ b/dvb-s/Astra-23.5E
@@ -1,44 +1,303 @@
# Astra 23.5E
# freq pol sr fec
-S 10758000 V 22000000 7/8
-S 10788000 V 22000000 5/6
-S 10802000 H 22000000 5/6
-S 10842000 V 13333000 5/6
-S 10862000 H 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10758000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10788000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10802000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10842000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13333000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10862000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Astra2Connect
# S2 10891250 H 22000000 3/4 AUTO 8PSK
-S 11475000 V 27500000 3/4
-S 11515000 H 27500000 3/4
-S2 11515000 V 28500000 9/10 AUTO QPSK
-S2 11555000 H 28500000 9/10 AUTO QPSK
-S2 11555000 V 28500000 9/10 AUTO QPSK
-S2 11592000 V 28500000 9/10 AUTO QPSK
-S2 11595000 H 28500000 9/10 AUTO QPSK
-S2 11635000 H 28500000 9/10 AUTO QPSK
-S2 11635000 V 28500000 9/10 AUTO QPSK
-S 11675000 H 27500000 3/4
-S2 11675000 V 28500000 9/10 AUTO QPSK
-S2 11719000 H 27500000 9/10 AUTO QPSK
-S 11739000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11475000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11515000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11515000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11555000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11555000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11592000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11595000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11635000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11635000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11719000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11739000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Astra2Connect
# S2 11758000 H 27500000 5/6 AUTO 8PSK
-S2 11778000 V 27500000 9/10 AUTO QPSK
-S 11798000 H 27500000 3/4
-S2 11817000 V 27500000 9/10 AUTO QPSK
-S 11836000 H 29900000 3/4
-S2 11856000 V 27500000 5/6 AUTO QPSK
-S 11875000 H 27500000 3/4
-S 11914000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11778000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11798000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11817000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11836000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29900000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11856000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11875000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11914000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Astra2Connect
# S2 11954000 H 27500000 3/4 AUTO 8PSK
-S 11992000 H 27500000 3/4
-S 12012000 V 27500000 3/4
-S2 12032000 H 27500000 9/10 AUTO QPSK
-S 12070000 H 27500000 3/4
-S2 12109000 H 27500000 9/10 AUTO QPSK
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11992000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12012000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12032000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12070000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12109000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
# Astra2Connect
# S2 12148000 H 27500000 3/4 AUTO 8PSK
-S 12168000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12168000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Astra2Connect
# S2 12226000 H 27500000 3/5 AUTO 8PSK
# Astra2Connect
@@ -47,20 +306,145 @@ S 12168000 V 27500000 3/4
# S2 12344000 H 28200000 5/6 AUTO 8PSK
# Astra2Connect
# S2 12382000 H 27500000 3/4 AUTO 8PSK
-S 12525000 H 27500000 3/4
-S 12525000 V 27500000 3/4
-S 12565000 H 27500000 2/3
-S 12565000 V 27500000 3/4
-S2 12605000 H 28500000 9/10 AUTO QPSK
-S2 12605000 V 28500000 9/10 AUTO QPSK
-S 12630000 V 6000000 3/4
-S 12631000 H 6666000 7/8
-S 12636000 V 2277000 5/6
-S 12641000 H 2220000 7/8
-S 12644000 H 2170000 3/4
-S 12649000 H 5600000 5/6
-S 12661000 H 2170000 5/6
-S 12685000 V 27500000 3/4
-S 12696000 H 3255000 1/2
-S 12711000 H 6111000 AUTO
-S 12725000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12525000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12525000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12565000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12565000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12605000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12605000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 9/10
+ ROLLOFF = AUTO
+ MODULATION = QPSK
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12630000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12631000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12636000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2277000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12641000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2220000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12644000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12649000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5600000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12661000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12685000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12696000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12711000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12725000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Astra-28.2E b/dvb-s/Astra-28.2E
index 908e428..c9588da 100644
--- a/dvb-s/Astra-28.2E
+++ b/dvb-s/Astra-28.2E
@@ -3,184 +3,800 @@
## Astra 2A
# Transponder 1
-S 11720000 H 29500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11720000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Transponder 2
-S 11740000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11740000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 3
-S 11758000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11758000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 4
-S 11778000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11778000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 5
-S 11798000 H 29500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11798000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Transponder 6
-S 11817000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11817000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 7
-S 11836000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11836000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 8
-S 11856000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11856000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 9
-S 11876000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11876000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 10
-S 11895000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11895000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 11
-S 11914000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11914000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 12
-S 11934000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11934000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 13
-S 11954000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11954000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 18
-S 12051000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12051000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 22
-S 12129000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12129000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 23
-S 12148000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12148000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 24
-S 12168000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12168000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 27
-S 12226000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12226000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 28
-S 12246000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12246000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 37
-S 12422000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12422000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 40
-S 12480000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12480000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
## Astra 2B
# Transponder 14
-S 11973000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11973000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 15
-S 11992000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11992000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 16
-S 12012000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12012000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 17
-S 12032000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12032000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 19
-S 12070000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12070000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 20
-S 12090000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12090000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 21
-S 12110000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12110000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 25
-S 12188000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12188000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 26
-S 12207000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12207000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 29
-S 12266000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12266000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 30
-S 12285000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12285000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 31
-S 12304000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12304000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 32
-S 12324000 V 29500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12324000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Transponder 33
-S 12344000 H 29500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12344000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Transponder 34
-S 12363000 V 29500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12363000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Transponder 35
-S 12382000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12382000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 36
-S 12402000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12402000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 38
-S 12441000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12441000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder 39
-S 12460000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12460000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
## Astra 2D
# Transponder 41
-S 10714000 H 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10714000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 42
-S 10729000 V 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10729000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 43
-S 10744000 H 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10744000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 44
-S 10758000 V 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10758000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 45
-S 10773000 H 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10773000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 46
-S 10788000 V 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10788000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 47
-S 10803000 H 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10803000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 48
-S 10818000 V 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10818000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 49
-S 10832000 H 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10832000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 50
-S 10847000 V 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10847000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 51
-S 10862000 H 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10862000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 52
-S 10876000 V 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10876000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 53
-S 10891000 H 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10891000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 54
-S 10906000 V 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10906000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 55
-S 10921000 H 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10921000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Transponder 56
-S 10936000 V 22000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10936000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
## Eurobird 1
# Transponder C1
-S 11222170 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11222170
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C2
-S 11223670 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11223670
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C2
-S 11259000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11259000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C1
-S 11261000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11261000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C3
-S 11307000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11307000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C4
-S 11307000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11307000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C4
-S 11343000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11343000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C3
-S 11344000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11344000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C5
-S 11390000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11390000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C6
-S 11390000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11390000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C5
-S 11426000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11426000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder C6
-S 11426000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11426000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D1
-S 11469000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11469000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D2S
-S 11488000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11488000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D3S
-S 11508000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11508000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D4S
-S 11527000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11527000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D5
-S 11546000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11546000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D6
-S 11565000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11565000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D7
-S 11585000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11585000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D8
-S 11603850 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11603850
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D9
-S 11623000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11623000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D10
-S 11642000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11642000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D11
-S 11661540 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11661540
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder D12
-S 11680770 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11680770
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder F1
-S 12524000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12524000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder F2
-S 12524000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12524000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder F1
-S 12560000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12560000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder F2
-S 12560000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12560000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder F4
-S 12596000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12596000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Transponder F3
-S 12607000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12607000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Transponder F4
-S 12629000 V 6111000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12629000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Transponder F5
-S 12692000 V 19532000 1/2
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12692000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 19532000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
diff --git a/dvb-s/Astra-31.5E b/dvb-s/Astra-31.5E
index a18479e..31266ff 100644
--- a/dvb-s/Astra-31.5E
+++ b/dvb-s/Astra-31.5E
@@ -1,8 +1,55 @@
# Astra 1G @ 31.5E
# std freq pol sr fec rolloff mod is_id pls_code pls_mode
-S2 11992000 H 27500000 AUTO AUTO 8PSK 10
-S2 11992000 H 27500000 AUTO AUTO 8PSK 20
-S2 12148000 H 27500000 AUTO AUTO 8PSK 30
-S2 12148000 H 27500000 AUTO AUTO 8PSK 40
-S 12304500 H 27500000 AUTO AUTO QPSK
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11992000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 10
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11992000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 20
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12148000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 30
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12148000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 40
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12304500
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Atlantic-Bird-1-12.5W b/dvb-s/Atlantic-Bird-1-12.5W
index e2d5cbe..383b122 100644
--- a/dvb-s/Atlantic-Bird-1-12.5W
+++ b/dvb-s/Atlantic-Bird-1-12.5W
@@ -1,35 +1,271 @@
# Atlantic Bird 1 @ 12.5W
# std freq pol sr fec rolloff mod is_id pls_code pls_mode
-S 11099000 H 2000000 5/6
-S 11132000 H 3255000 3/4
-S 11136000 V 3700000 5/6
-S 11174000 H 15190000 3/4
-S 11179000 V 22400000 2/3
-S 11188000 H 5722000 5/6
-S 11332000 H 6428000 2/3
-S 11337000 H 1923000 7/8
-S 11340000 H 2279000 5/6
-S 11355000 H 11781000 7/8
-S 11408000 V 27500000 3/4
-S 11428000 H 30000000 5/6
-S 11595000 V 27500000 5/6
-S 11622000 H 3255000 AUTO
-S 11643000 H 2398000 AUTO
-S 11645000 V 4790000 AUTO
-S 11651000 V 3688000 AUTO
-S 12515000 H 17455000 3/4
-S 12535000 V 2000000 3/4
-S 12545000 H 17455000 3/4
-S 12594000 H 2170000 3/4
-S 12597000 H 1730000 3/4
-S 12604000 H 1481000 3/4
-S 12655000 H 4285000 3/4
-S 12658000 H 2141000 3/4
-S 12662000 V 3928000 3/4
-S2 12718000 H 36510000 AUTO AUTO 8PSK 33
-S2 12718000 H 36510000 AUTO AUTO 8PSK 34
-S2 12718000 H 36510000 AUTO AUTO 8PSK 35
-S2 12718000 H 36510000 AUTO AUTO 8PSK 36
-S 12720000 V 1808000 3/4
-S 12743000 V 3214000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11099000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11132000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11136000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3700000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11174000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 15190000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11179000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22400000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11188000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5722000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11332000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6428000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11337000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1923000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11340000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2279000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11355000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 11781000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11408000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11428000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11595000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11622000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11643000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2398000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11645000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4790000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11651000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3688000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12515000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 17455000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12535000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12545000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 17455000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12594000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12597000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1730000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12604000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1481000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12655000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12658000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2141000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12662000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3928000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12718000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 36510000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 33
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12718000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 36510000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 34
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12718000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 36510000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 35
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12718000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 36510000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 36
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12720000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1808000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12743000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3214000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Atlantic-Bird-3-5.0W b/dvb-s/Atlantic-Bird-3-5.0W
index 671ecb4..2800188 100644
--- a/dvb-s/Atlantic-Bird-3-5.0W
+++ b/dvb-s/Atlantic-Bird-3-5.0W
@@ -1,33 +1,365 @@
# Atlantic Bird 3 @ 5.0W
# std freq pol sr fec rolloff mod is_id pls_code pls_mode
-S2 11012000 V 30000000 AUTO AUTO 8PSK 2 16416
-S2 11012000 V 30000000 AUTO AUTO 8PSK 3 16416
-S2 11012000 V 30000000 AUTO AUTO 8PSK 11 16416
-S2 11179000 V 30000000 AUTO AUTO 8PSK 4 16416
-S2 11179000 V 30000000 AUTO AUTO 8PSK 5 16416
-S2 11179000 V 30000000 AUTO AUTO 8PSK 12 16416
-S2 11637000 V 30000000 AUTO AUTO 8PSK 1 16416
-S2 11637000 V 30000000 AUTO AUTO 8PSK 2 16416
-S2 11637000 V 30000000 AUTO AUTO 8PSK 3 16416
-S2 11637000 V 30000000 AUTO AUTO 8PSK 4 16416
-S2 11637000 V 30000000 AUTO AUTO 8PSK 5 16416
-S2 11637000 V 30000000 AUTO AUTO 8PSK 6 16416
-S2 11675000 H 30000000 AUTO AUTO 8PSK 7 16416
-S2 11675000 H 30000000 AUTO AUTO 8PSK 8 16416
-S2 11675000 H 30000000 AUTO AUTO 8PSK 9 16416
-S2 11675000 H 30000000 AUTO AUTO 8PSK 10 16416
-S2 11675000 H 30000000 AUTO AUTO 8PSK 11 16416
-S2 11675000 H 30000000 AUTO AUTO 8PSK 12 16416
-S2 11675000 H 30000000 AUTO AUTO 8PSK 13 16416
-S2 11675000 H 30000000 AUTO AUTO 8PSK 14 16416
-S2 11675000 H 30000000 AUTO AUTO 8PSK 15 16416
-S2 11675000 H 30000000 AUTO AUTO 8PSK 16 16416
-S2 12585000 H 27500000 AUTO AUTO 8PSK 1 8
-S2 12585000 H 27500000 AUTO AUTO 8PSK 2 8
-S2 12606000 V 29900000 AUTO AUTO 8PSK 1 8
-S2 12606000 V 29900000 AUTO AUTO 8PSK 2 8
-S2 12648000 V 29500000 AUTO AUTO 8PSK 1 121212 1
-S2 12648000 V 29500000 AUTO AUTO 8PSK 2 121212 1
-S2 12669000 H 30080000 AUTO AUTO 8PSK 1 8
-S2 12669000 H 30080000 AUTO AUTO 8PSK 2 8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11012000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 2
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11012000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 3
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11012000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 11
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11179000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 4
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11179000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 5
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11179000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 12
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11637000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 1
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11637000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 2
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11637000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 3
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11637000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 4
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11637000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 5
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11637000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 6
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 7
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 8
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 9
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 10
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 11
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 12
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 13
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 14
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 15
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11675000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 16
+ PLS CODE = 16416
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12585000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 1
+ PLS CODE = 8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12585000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 2
+ PLS CODE = 8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12606000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29900000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 1
+ PLS CODE = 8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12606000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29900000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 2
+ PLS CODE = 8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12648000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29500000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 1
+ PLS CODE = 121212
+ PLS MODE = 1
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12648000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29500000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 2
+ PLS CODE = 121212
+ PLS MODE = 1
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12669000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30080000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 1
+ PLS CODE = 8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12669000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30080000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 2
+ PLS CODE = 8
+ INVERSION = AUTO
+
diff --git a/dvb-s/BrasilSat-B1-75.0W b/dvb-s/BrasilSat-B1-75.0W
index 9349d93..b031ca6 100644
--- a/dvb-s/BrasilSat-B1-75.0W
+++ b/dvb-s/BrasilSat-B1-75.0W
@@ -1,11 +1,67 @@
# Brasilsat B1 @ 75.0W
# freq pol sr fec
-S 3648000 V 04285000 AUTO
-S 3657000 V 06620000 AUTO
-S 3653000 V 04710000 AUTO
-S 3655000 H 06620000 AUTO
-S 3629000 H 06620000 AUTO
-S 3711000 H 03200000 AUTO
-S 3644000 V 04440000 AUTO
-S 3638000 H 04440000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3648000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3657000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3653000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4710000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3655000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3629000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3711000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3644000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4440000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3638000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4440000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/BrasilSat-B2-65.0W b/dvb-s/BrasilSat-B2-65.0W
index 383c223..bc24954 100644
--- a/dvb-s/BrasilSat-B2-65.0W
+++ b/dvb-s/BrasilSat-B2-65.0W
@@ -1,34 +1,251 @@
# Brasilsat B2 @ 65.0W
# freq pol sr fec
-S 3745000 H 03540000 AUTO
-S 4008000 H 03333000 AUTO
-S 4011000 V 05000000 AUTO
-S 3792000 V 03393000 AUTO
-S 4104000 V 03214000 AUTO
-S 4097000 V 06667000 AUTO
-S 3905000 H 06666000 AUTO
-S 3935000 H 06666000 AUTO
-S 3890000 H 06666000 AUTO
-S 3925000 H 06666000 AUTO
-S 4112000 V 04285000 AUTO
-S 3650000 V 04440000 AUTO
-S 3736000 H 01808000 AUTO
-S 3787000 H 06666000 AUTO
-S 3876000 V 02740000 AUTO
-S 4117000 V 02963000 AUTO
-S 3815000 H 06666000 AUTO
-S 3793000 H 06666000 AUTO
-S 3721000 H 02963000 AUTO
-S 3684000 H 06666000 AUTO
-S 3915000 H 06666000 AUTO
-S 3766000 H 03336000 AUTO
-S 3847000 H 04444000 AUTO
-S 3706000 H 02462000 AUTO
-S 3667000 H 07236000 AUTO
-S 3771000 V 01480000 AUTO
-S 3734000 V 02852000 AUTO
-S 3810000 H 13333000 AUTO
-S 3762000 H 02222000 AUTO
-S 3834000 H 03572000 AUTO
-S 3850000 H 01570000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3745000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4008000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4011000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3792000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3393000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4104000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3214000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4097000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3905000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3935000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3890000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3925000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4112000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3650000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4440000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3736000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1808000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3787000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3876000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2740000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4117000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3815000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3793000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3721000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3684000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3915000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3766000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3336000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3847000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3706000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2462000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3667000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7236000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3771000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1480000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3734000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2852000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3810000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13333000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3762000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3834000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3572000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3850000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1570000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/BrasilSat-B4-70.0W b/dvb-s/BrasilSat-B4-70.0W
index 9ff8c1b..b73c9ff 100644
--- a/dvb-s/BrasilSat-B4-70.0W
+++ b/dvb-s/BrasilSat-B4-70.0W
@@ -1,39 +1,291 @@
# Brasilsat B4 @ 70.0W
# freq pol sr fec
-S 3951000 H 03214000 AUTO
-S 3714000 V 04400000 AUTO
-S 3672000 H 04713000 AUTO
-S 3955000 H 04400000 AUTO
-S 3965000 V 02930000 AUTO
-S 3628000 H 03000000 AUTO
-S 3644000 V 03214000 AUTO
-S 3650000 H 04285000 AUTO
-S 3688000 H 06000000 AUTO
-S 3680000 H 06000000 AUTO
-S 3662000 V 04606000 AUTO
-S 3945000 H 03214000 AUTO
-S 3640000 H 03263000 AUTO
-S 3979000 V 03617000 AUTO
-S 3752000 V 06220000 AUTO
-S 3685000 V 04500000 AUTO
-S 3650000 V 04400000 AUTO
-S 3985000 H 02170000 AUTO
-S 4010000 H 13021000 AUTO
-S 3665000 H 04700000 AUTO
-S 3637000 H 02228000 AUTO
-S 3708000 V 03928000 AUTO
-S 4047000 V 07143000 AUTO
-S 3672000 V 08454000 AUTO
-S 3820000 V 27500000 AUTO
-S 3940000 V 27500000 AUTO
-S 3964000 H 01875000 AUTO
-S 3695000 H 03598000 AUTO
-S 3900000 V 27500000 AUTO
-S 3645000 H 03520000 AUTO
-S 3983000 V 01630000 AUTO
-S 3631000 H 04687000 AUTO
-S 3874000 V 05926000 AUTO
-S 3700000 V 09123000 AUTO
-S 3997000 V 02300000 AUTO
-S 3973000 V 04338000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3951000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3214000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3714000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3672000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4713000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3955000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3965000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2930000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3628000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3644000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3214000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3650000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3688000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3680000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3662000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4606000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3945000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3214000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3640000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3263000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3979000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3617000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3752000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6220000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3685000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3650000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3985000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4010000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3665000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3637000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2228000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3708000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3928000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4047000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7143000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3672000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8454000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3820000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3940000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3964000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1875000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3695000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3598000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3900000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3645000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3520000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3983000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1630000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3631000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4687000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3874000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5926000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3700000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 9123000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3997000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2300000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3973000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4338000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/BrasilsatB4-84.0W b/dvb-s/BrasilsatB4-84.0W
index 5ad005e..a4d4d0a 100644
--- a/dvb-s/BrasilsatB4-84.0W
+++ b/dvb-s/BrasilsatB4-84.0W
@@ -1,85 +1,659 @@
# Brasilsat B3 @ 84.0W
# freq pol sr fec
-S 3728000 H 04340000 AUTO
-S 3698000 V 03333000 AUTO
-S 4054000 V 01287000 AUTO
-S 3745000 H 04300000 AUTO
-S 3738000 V 04708000 AUTO
-S 3923000 V 01808000 AUTO
-S 3768000 V 08000000 AUTO
-S 3955000 V 04340000 AUTO
-S 4167000 H 03255000 AUTO
-S 3791000 V 03330000 AUTO
-S 3866000 H 04425000 AUTO
-S 3932000 V 03255000 AUTO
-S 4132000 V 02532000 AUTO
-S 3906000 H 03928000 AUTO
-S 3858000 V 04288000 AUTO
-S 3665000 V 03177000 AUTO
-S 3732000 V 03214000 AUTO
-S 3774000 H 03330000 AUTO
-S 3927000 V 03255000 AUTO
-S 3710000 H 03261000 AUTO
-S 3883000 H 04278000 AUTO
-S 3770000 H 03333000 AUTO
-S 3754000 V 05000000 AUTO
-S 3764000 H 04285000 AUTO
-S 3910000 H 03616000 AUTO
-S 3705000 H 04280000 AUTO
-S 3852000 V 03806000 AUTO
-S 3845000 H 10127000 AUTO
-S 3936000 V 03255000 AUTO
-S 3653000 V 03807000 AUTO
-S 3751000 H 03565000 AUTO
-S 3871000 H 04435000 AUTO
-S 3895000 H 04430000 AUTO
-S 3936000 H 03255000 AUTO
-S 3800000 H 03255000 AUTO
-S 3855000 H 04000000 AUTO
-S 4171000 H 02170000 AUTO
-S 3716000 H 04800000 AUTO
-S 4068000 H 02600000 AUTO
-S 4070000 V 02964000 AUTO
-S 3949000 V 04340000 AUTO
-S 3684000 V 03200000 AUTO
-S 4169000 V 08140000 AUTO
-S 4144000 H 02734000 AUTO
-S 3736000 H 04285000 AUTO
-S 3790000 H 10444000 AUTO
-S 3724000 V 02075000 AUTO
-S 4121000 H 02500000 AUTO
-S 3629000 H 06666000 AUTO
-S 3970000 V 04445000 AUTO
-S 3985000 V 03300000 AUTO
-S 3916000 H 03255000 AUTO
-S 4155000 V 03255000 AUTO
-S 3692000 V 03330000 AUTO
-S 3644000 V 04687000 AUTO
-S 4087000 H 17200000 AUTO
-S 3889000 H 04440000 AUTO
-S 4176000 V 03515000 AUTO
-S 3829000 V 04340000 AUTO
-S 3805000 V 02662000 AUTO
-S 3943000 V 02460000 AUTO
-S 3757000 H 03565000 AUTO
-S 3696000 H 01808000 AUTO
-S 3989000 V 02666000 AUTO
-S 3690000 V 03200000 AUTO
-S 3657000 V 03600000 AUTO
-S 3996000 V 02300000 AUTO
-S 3926000 H 04000000 AUTO
-S 4126000 H 04000000 AUTO
-S 4136000 H 02142000 AUTO
-S 3675000 V 04285000 AUTO
-S 3931000 H 04000000 AUTO
-S 3786000 V 04286000 AUTO
-S 3688000 V 02308000 AUTO
-S 4075000 V 04444000 AUTO
-S 3911000 V 03255000 AUTO
-S 3824000 H 03002000 AUTO
-S 3778000 V 06850000 AUTO
-S 3710000 V 12960000 AUTO
-S 3877000 H 04450000 AUTO
-S 3940000 V 03255000 AUTO
-S 4064000 H 03300000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3728000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3698000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4054000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1287000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3745000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4300000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3738000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4708000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3923000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1808000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3768000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3955000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4167000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3791000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3330000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3866000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4425000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3932000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4132000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2532000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3906000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3928000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3858000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4288000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3665000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3177000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3732000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3214000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3774000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3330000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3927000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3710000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3261000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3883000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4278000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3770000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3754000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3764000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3910000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3616000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3705000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4280000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3852000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3806000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3845000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 10127000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3936000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3653000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3807000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3751000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3565000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3871000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4435000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3895000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4430000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3936000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3800000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3855000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4171000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3716000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4068000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4070000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2964000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3949000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3684000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4169000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8140000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4144000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2734000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3736000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3790000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 10444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3724000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2075000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4121000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3629000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3970000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4445000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3985000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3300000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3916000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4155000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3692000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3330000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3644000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4687000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4087000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 17200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3889000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4440000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4176000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3515000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3829000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3805000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2662000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3943000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2460000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3757000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3565000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3696000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1808000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3989000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3690000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3657000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3996000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2300000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3926000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4126000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4136000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2142000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3675000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3931000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3786000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4286000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3688000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2308000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4075000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3911000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3824000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3002000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3778000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6850000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3710000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 12960000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3877000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4450000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3940000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4064000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3300000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/ChinaSat5A-87.5E b/dvb-s/ChinaSat5A-87.5E
index 0c03cfc..b31fc0a 100644
--- a/dvb-s/ChinaSat5A-87.5E
+++ b/dvb-s/ChinaSat5A-87.5E
@@ -6,10 +6,31 @@
# freq pol sr fec
# Myawady TV
-S 3734000 H 5925000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3734000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5925000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Zam TV Tests
-S 4076000 H 2532000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4076000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2532000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Test Card
-S 4081000 H 4687000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4081000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4687000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Estrela-do-Sul-63.0W b/dvb-s/Estrela-do-Sul-63.0W
index fc3cfa0..fe06930 100644
--- a/dvb-s/Estrela-do-Sul-63.0W
+++ b/dvb-s/Estrela-do-Sul-63.0W
@@ -1,27 +1,195 @@
# Estrela do Sul @ 63.0W
# freq pol sr fec
-S 11892000 V 02964000 AUTO
-S 11987000 H 03330000 AUTO
-S 12054000 H 26660000 AUTO
-S 11830000 V 06000000 AUTO
-S 11603000 V 03124000 AUTO
-S 11598000 V 03124000 AUTO
-S 11803000 V 04444000 AUTO
-S 11958000 H 04444000 AUTO
-S 11610000 V 03124000 AUTO
-S 11861000 V 02964000 AUTO
-S 11879000 V 02964000 AUTO
-S 11903000 V 02362000 AUTO
-S 11817000 V 06666000 AUTO
-S 11577000 V 03124000 AUTO
-S 11582000 V 03124000 AUTO
-S 11982000 H 08888000 AUTO
-S 11888000 V 02392000 AUTO
-S 11898000 V 02480000 AUTO
-S 11871000 V 02000000 AUTO
-S 11795000 V 04444000 AUTO
-S 11845000 V 04444000 AUTO
-S 11640000 V 18100000 AUTO
-S 11875000 V 03333000 AUTO
-S 11543000 V 10410000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11892000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2964000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11987000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3330000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12054000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26660000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11830000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11603000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3124000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11598000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3124000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11803000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11958000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11610000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3124000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11861000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2964000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11879000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2964000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11903000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2362000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11817000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11577000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3124000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11582000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3124000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11982000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8888000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11888000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2392000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11898000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2480000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11871000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11795000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11845000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11640000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 18100000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11875000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11543000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10410000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Eurobird1-28.5E b/dvb-s/Eurobird1-28.5E
index 5fd4a90..95f6eb9 100644
--- a/dvb-s/Eurobird1-28.5E
+++ b/dvb-s/Eurobird1-28.5E
@@ -1,5 +1,26 @@
# Eurobird 28.5E SDT info service transponder
# freq pol sr fec
-S 11623000 H 27500000 2/3
-S 11224000 V 27500000 2/3
-S 11527000 V 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11623000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11224000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11527000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
diff --git a/dvb-s/Eutelsat9-9.0E b/dvb-s/Eutelsat9-9.0E
index 925980a..49e65d6 100644
--- a/dvb-s/Eutelsat9-9.0E
+++ b/dvb-s/Eutelsat9-9.0E
@@ -1,16 +1,114 @@
# Eurobird 9.0E
# freq pol sr fec
-S 11727000 V 27500000 5/6
-S 11747000 H 27500000 3/4
-S 11766000 V 27500000 5/6
-S 11785000 H 27500000 3/4
-S 11804000 V 27500000 3/4
-S 11823000 H 27500000 3/4
-S 11843000 V 27500000 3/4
-S 11881000 V 26700000 3/4
-S 11919000 V 27500000 5/6
-S 11938000 H 27500000 3/4
-S 11977000 H 27500000 3/4
-S 11996000 V 27500000 3/4
-S 12054000 H 27500000 3/4
-S 12092000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11727000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11747000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11766000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11785000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11804000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11823000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11843000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11881000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26700000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11919000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11938000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11977000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11996000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12054000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12092000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/EutelsatW2-16E b/dvb-s/EutelsatW2-16E
index 40023a8..5b2ba88 100644
--- a/dvb-s/EutelsatW2-16E
+++ b/dvb-s/EutelsatW2-16E
@@ -1,59 +1,451 @@
# Eutelsat W2 @ 16E
# freq pol sr fec
-S 10957000 H 2821000 AUTO
-S 10968000 H 6400000 AUTO
-S 10972000 V 27500000 AUTO
-S 10976000 H 6400000 AUTO
-S 10989000 H 6400000 AUTO
-S 10997000 H 6400000 AUTO
-S 11005000 H 6400000 AUTO
-S 11011000 V 27500000 AUTO
-S 11015000 H 6400000 AUTO
-S 11025000 H 2894000 AUTO
-S 11046000 H 10555000 AUTO
-S 11057000 H 3327000 AUTO
-S 11061000 H 5722000 AUTO
-S 11078000 H 5208000 AUTO
-S 11092000 V 32000000 AUTO
-S 11094000 H 2734000 AUTO
-S 11132000 V 14185000 AUTO
-S 11178000 V 27500000 AUTO
-S 11192000 H 2667000 AUTO
-S 11267000 H 2170000 AUTO
-S 11276000 H 11100000 AUTO
-S 11294000 H 13333000 AUTO
-S 11304000 V 30000000 AUTO
-S 11324000 H 27500000 AUTO
-S 11428000 V 30000000 AUTO
-S 11449000 H 27500000 AUTO
-S 11471000 V 29950000 AUTO
-S 11492000 H 29950000 AUTO
-S 11513000 V 29950000 AUTO
-S 11534000 H 30000000 AUTO
-S 11554000 V 30000000 AUTO
-S 11575000 H 30000000 AUTO
-S 11594000 V 28800000 AUTO
-S 11617000 H 29950000 AUTO
-S 11634000 V 17578000 AUTO
-S 11658000 H 30000000 AUTO
-S 11659000 V 17578000 AUTO
-S 11682000 V 14468000 AUTO
-S 12538000 V 4340000 AUTO
-S 12549000 V 2894000 AUTO
-S 12555000 H 5632000 AUTO
-S 12557000 V 2156000 AUTO
-S 12562000 H 5632000 AUTO
-S 12563000 V 2222000 AUTO
-S 12568000 H 3703000 AUTO
-S 12625000 V 4444000 AUTO
-S 12633000 V 4883000 AUTO
-S 12642000 V 3418000 AUTO
-S 12650000 H 15000000 AUTO
-S 12656000 V 4883000 AUTO
-S 12677000 V 6111000 AUTO
-S 12683000 H 2894000 AUTO
-S 12703000 H 2748000 AUTO
-S 12716000 H 6000000 AUTO
-S 12723000 H 3000000 AUTO
-S 12733000 V 16277000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10957000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2821000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10968000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10972000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10976000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10989000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10997000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11005000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11011000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11025000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2894000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11046000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 10555000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11057000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3327000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11061000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5722000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11078000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5208000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11092000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 32000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11094000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2734000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11132000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 14185000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11178000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11192000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11267000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11276000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 11100000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11294000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13333000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11304000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11324000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11428000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11449000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11471000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29950000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11492000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29950000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11513000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29950000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11534000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11554000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11575000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11594000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11617000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29950000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11634000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 17578000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11658000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11659000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 17578000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11682000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 14468000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12538000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12549000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2894000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12555000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12557000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2156000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12562000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12563000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12568000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3703000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12625000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12633000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4883000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12642000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3418000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12650000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 15000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12656000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4883000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12677000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12683000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2894000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12703000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2748000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12716000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12723000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12733000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 16277000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Express-3A-11.0W b/dvb-s/Express-3A-11.0W
index 1deef03..2be272a 100644
--- a/dvb-s/Express-3A-11.0W
+++ b/dvb-s/Express-3A-11.0W
@@ -1,4 +1,11 @@
# Express 3A @ 11.0W
# freq pol sr fec
-S 3675000 V 29623000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3675000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29623000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/ExpressAM1-40.0E b/dvb-s/ExpressAM1-40.0E
index 3ffbf01..6d31da9 100644
--- a/dvb-s/ExpressAM1-40.0E
+++ b/dvb-s/ExpressAM1-40.0E
@@ -1,5 +1,26 @@
# Express AM1 @ 40E
# freq pol sr fec
-S 10967000 V 20000000 AUTO
-S 10995000 V 20000000 AUTO
-S 11097000 H 4000000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10967000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10995000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11097000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/ExpressAM2-80.0E b/dvb-s/ExpressAM2-80.0E
index 0a9a990..9dfcfc0 100644
--- a/dvb-s/ExpressAM2-80.0E
+++ b/dvb-s/ExpressAM2-80.0E
@@ -1,16 +1,93 @@
# Express AM2 @ 80E
# freq pol sr fec
-S 10973000 V 4444000 AUTO
-S 10991000 V 4444000 AUTO
-S 11044000 H 44948000 AUTO
-S 11081000 V 5064000 AUTO
-S 11088000 V 4548000 AUTO
-S 11191000 H 3255000 AUTO
-S 11462000 V 3200000 AUTO
-S 11478000 H 4400000 AUTO
-S 11544000 V 44950000 AUTO
-S 11606000 V 44948000 AUTO
-S 11650000 V 3500000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10973000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10991000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11044000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 44948000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11081000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5064000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11088000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4548000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11191000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11462000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11478000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11544000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 44950000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11606000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 44948000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11650000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
# Express AM2 @ 80E C-BAND
# Generated by Roman Kashcheev
@@ -18,18 +95,74 @@ S 11650000 V 3500000 AUTO
# freq pol sr fec
# RSCC
-S 3525000 V 31106000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3525000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 31106000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TRK Sever
-S 3558000 V 3215000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3558000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3215000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TRV Muji
-S 3562000 V 3225000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3562000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3225000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# OTV Sakhalin
-S 3625000 V 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3625000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RSCC
-S 3675000 V 33483000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3675000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 33483000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# 5 Kanal
-S 3929000 H 8705000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3929000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8705000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV Centr
-S 4147000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4147000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Blagovest Telekanal
-S 4175000 V 6510000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4175000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6510000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/ExpressAM22-53.0E b/dvb-s/ExpressAM22-53.0E
index 3749e7f..513244c 100644
--- a/dvb-s/ExpressAM22-53.0E
+++ b/dvb-s/ExpressAM22-53.0E
@@ -1,9 +1,51 @@
# Express AM 22 @ 53E
# freq pol sr fec
-S 11044000 V 44950000 3/4
-S 10974000 H 8150000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11044000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 44950000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10974000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8150000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
#S 10974000 V 32223000 7/8
-S 11031000 H 3750000 3/4
-S 11096000 V 6400000 3/4
-S 11124000 V 7593000 3/4
-S 11161000 V 5785000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11031000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3750000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11096000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6400000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11124000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7593000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11161000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5785000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy10R-123w b/dvb-s/Galaxy10R-123w
index bd915f7..6212f56 100644
--- a/dvb-s/Galaxy10R-123w
+++ b/dvb-s/Galaxy10R-123w
@@ -1,10 +1,59 @@
# Galaxy 10R @ 123W
# freq pol sr fec
-S 11720000 V 27692000 AUTO
-S 11732000 H 13240000 AUTO
-S 11800000 V 26657000 AUTO
-S 11805000 H 04580000 AUTO
-S 11966000 V 13021000 AUTO
-S 12104000 V 02222000 AUTO
-S 12114000 V 04444000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11720000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27692000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11732000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13240000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11800000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26657000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11805000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4580000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11966000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12104000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12114000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy17-91.0W b/dvb-s/Galaxy17-91.0W
index 365e541..ff7599a 100644
--- a/dvb-s/Galaxy17-91.0W
+++ b/dvb-s/Galaxy17-91.0W
@@ -1,48 +1,370 @@
# Galaxy 17 @ 91W
# freq pol sr fec
-S 10964000 V 19850000 AUTO
-S 10994000 V 20000000 AUTO
-S 11024000 V 20000000 AUTO
-S 11806000 V 03979000 AUTO
-S 11815000 V 03979000 AUTO
-S 11825000 V 06111000 AUTO
-S 11925000 V 03979000 AUTO
-S 11930000 V 03979000 AUTO
-S 11935000 V 03979000 AUTO
-S 11940000 V 03979000 AUTO
-S 11945000 V 03979000 AUTO
-S 11950000 H 03979000 AUTO
-S 11950000 V 03979000 AUTO
-S 11955000 H 03979000 AUTO
-S 11955000 V 03979000 AUTO
-S 11960000 H 03979000 AUTO
-S 11965000 V 03979000 AUTO
-S 11965000 H 03979000 AUTO
-S 11970000 V 03979000 AUTO
-S 11970000 H 03979000 AUTO
-S 11975000 V 03979000 AUTO
-S 11975000 H 03979000 AUTO
-S 11980000 V 03979000 AUTO
-S 11985000 H 03979000 AUTO
-S 11985000 V 03979000 AUTO
-S 11990000 H 03979000 AUTO
-S 11990000 V 03979000 AUTO
-S 11995000 H 03979000 AUTO
-S 11995000 V 03979000 AUTO
-S 12000000 H 03979000 AUTO
-S 12005000 V 03979000 AUTO
-S 12010000 H 03979000 AUTO
-S 12010000 V 03979000 AUTO
-S 12015000 H 03979000 AUTO
-S 12015000 V 03979000 AUTO
-S 12020000 V 03979000 AUTO
-S 12025000 V 03979000 AUTO
-S 12030000 V 03979000 AUTO
-S 12035000 V 03979000 AUTO
-S 12066000 H 05632000 AUTO
-S 12075000 H 03979000 AUTO
-S 12083000 H 05632000 AUTO
-S 12086000 V 06144000 AUTO
-S 12096000 V 06144000 AUTO
-S 12104000 V 06144000 AUTO
-S 12114000 V 06144000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10964000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 19850000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10994000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11024000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11806000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11815000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11825000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11925000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11930000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11935000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11940000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11945000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11950000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11950000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11955000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11955000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11960000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11965000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11965000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11970000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11970000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11975000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11975000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11980000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11985000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11985000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11990000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11990000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11995000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11995000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12000000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12005000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12010000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12010000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12015000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12020000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12025000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12030000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12035000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12066000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12075000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12083000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12086000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6144000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12096000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6144000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12104000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6144000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12114000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6144000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy19-97.0W b/dvb-s/Galaxy19-97.0W
index 3422b69..3c1cdf2 100644
--- a/dvb-s/Galaxy19-97.0W
+++ b/dvb-s/Galaxy19-97.0W
@@ -1,18 +1,130 @@
# Galaxy 19 @ 97W
# freq pol sr fec
-S 11789000 V 28125000 AUTO
-S 11836000 V 20765000 AUTO
-S 11867000 V 22000000 AUTO
-S 11874000 H 22000000 AUTO
-S 11898000 V 22000000 AUTO
-S 11936000 H 20000000 AUTO
-S 11966000 H 22000000 AUTO
-S 11991000 V 22000000 AUTO
-S 12053000 V 22000000 AUTO
-S 12084000 V 22000000 AUTO
-S 12090000 H 20000000 AUTO
-S 12115000 V 22425000 AUTO
-S 12122000 H 22000000 AUTO
-S 12146000 V 22000000 AUTO
-S 12152000 H 20000000 AUTO
-S 12177000 V 23000000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11789000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28125000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11836000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20765000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11867000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11874000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11898000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11936000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11966000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11991000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12053000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12084000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12090000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12115000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22425000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12122000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12146000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12152000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12177000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 23000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy25-93.0W b/dvb-s/Galaxy25-93.0W
index 37f1a4a..3f349e3 100644
--- a/dvb-s/Galaxy25-93.0W
+++ b/dvb-s/Galaxy25-93.0W
@@ -1,61 +1,474 @@
# Galaxy 25 @ 93W
# freq pol sr fec
-S 11711000 V 14312000 AUTO
-S 11721000 V 03979000 AUTO
-S 11727000 V 03979000 AUTO
-S 11732000 V 03979000 AUTO
-S 11737000 H 03979000 AUTO
-S 11737000 V 03979000 AUTO
-S 11742000 V 03979000 AUTO
-S 11748000 V 03979000 AUTO
-S 11753000 V 03979000 AUTO
-S 11767000 V 03979000 AUTO
-S 11772000 H 03979000 AUTO
-S 11772000 V 03979000 AUTO
-S 11777000 V 03979000 AUTO
-S 11782000 V 03979000 AUTO
-S 11788000 V 03979000 AUTO
-S 11793000 V 03979000 AUTO
-S 11809000 V 03979000 AUTO
-S 11814000 V 03979000 AUTO
-S 11827000 V 08429000 AUTO
-S 11836000 H 07179000 AUTO
-S 11841000 H 04000000 AUTO
-S 11865000 V 03516000 AUTO
-S 11887000 V 03979000 AUTO
-S 11893000 V 03979000 AUTO
-S 11904000 H 03010000 AUTO
-S 11904000 V 05000000 AUTO
-S 11919000 V 03979000 AUTO
-S 11924000 V 03979000 AUTO
-S 11926000 H 08848000 AUTO
-S 11929000 V 03979000 AUTO
-S 11935000 V 03979000 AUTO
-S 11936000 H 08848000 AUTO
-S 11944000 H 08848000 AUTO
-S 11949000 V 03979000 AUTO
-S 11954000 V 03979000 AUTO
-S 11956000 H 03979000 AUTO
-S 11960000 V 03979000 AUTO
-S 11961000 H 03979000 AUTO
-S 11965000 V 03979000 AUTO
-S 11967000 H 03979000 AUTO
-S 11970000 V 03979000 AUTO
-S 11972000 H 03979000 AUTO
-S 11977000 H 03979000 AUTO
-S 12047000 V 03979000 AUTO
-S 12048000 H 03979000 AUTO
-S 12054000 H 03979000 AUTO
-S 12058000 V 03979000 AUTO
-S 12059000 H 03979000 AUTO
-S 12063000 V 03979000 AUTO
-S 12064000 H 03979000 AUTO
-S 12069000 H 03979000 AUTO
-S 12076000 V 08679000 AUTO
-S 12089000 V 06511000 AUTO
-S 12110000 H 04104000 AUTO
-S 12116000 H 03979000 AUTO
-S 12121000 H 03979000 AUTO
-S 12126000 H 03979000 AUTO
-S 12132000 H 03979000 AUTO
-S 12175000 V 05147000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11711000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 14312000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11721000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11727000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11732000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11737000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11737000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11742000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11748000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11753000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11767000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11772000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11772000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11777000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11782000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11788000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11793000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11809000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11814000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11827000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8429000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11836000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7179000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11841000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11865000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3516000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11887000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11893000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11904000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3010000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11904000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11919000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11924000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11926000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8848000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11929000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11935000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11936000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8848000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11944000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8848000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11949000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11954000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11956000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11960000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11961000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11965000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11967000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11970000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11972000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11977000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12047000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12048000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12054000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12058000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12059000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12063000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12064000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12069000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12076000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8679000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12089000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6511000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12110000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4104000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12116000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12121000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12126000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12132000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12175000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5147000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy27-129w b/dvb-s/Galaxy27-129w
index 9f8eb78..3fb402e 100644
--- a/dvb-s/Galaxy27-129w
+++ b/dvb-s/Galaxy27-129w
@@ -1,4 +1,11 @@
# Galaxy 27 @ 129W
# freq pol sr fec
-S 11964000 H 02920000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11964000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2920000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy28-89.0W b/dvb-s/Galaxy28-89.0W
index 79592bd..cefb320 100644
--- a/dvb-s/Galaxy28-89.0W
+++ b/dvb-s/Galaxy28-89.0W
@@ -1,42 +1,315 @@
# Galaxy 28 @ 89W
# Intelsat Americas 8 @ 89W
# freq pol sr fec
-S 11717000 H 04411000 AUTO
-S 11747000 H 06620000 AUTO
-S 11756000 H 06620000 AUTO
-S 11780000 H 29000000 AUTO
-S 11800000 H 27500000 AUTO
-S 11825000 H 04552000 AUTO
-S 11865000 H 03700000 AUTO
-S 11882000 H 04883000 AUTO
-S 11925000 H 03979000 AUTO
-S 11930000 H 03979000 AUTO
-S 11935000 H 03979000 AUTO
-S 11936000 H 06000000 AUTO
-S 11940000 H 03979000 AUTO
-S 11945000 H 03979000 AUTO
-S 11950000 H 03979000 AUTO
-S 11955000 H 03979000 AUTO
-S 11960000 H 28800000 AUTO
-S 11965000 H 03979000 AUTO
-S 11970000 H 03979000 AUTO
-S 11970000 V 03979000 AUTO
-S 11975000 H 03979000 AUTO
-S 11980000 H 03979000 AUTO
-S 11985000 H 03979000 AUTO
-S 11989000 V 06111000 AUTO
-S 11990000 H 03979000 AUTO
-S 11995000 H 03979000 AUTO
-S 12000000 H 28800000 AUTO
-S 12009000 V 06111000 AUTO
-S 12032000 H 06666000 AUTO
-S 12092000 H 02314000 AUTO
-S 12114000 H 14398000 AUTO
-S 12134000 H 04000000 AUTO
-S 12164000 H 03979000 AUTO
-S 12170000 H 03979000 AUTO
-S 12175000 H 03979000 AUTO
-S 12180000 H 03979000 AUTO
-S 12185000 H 03979000 AUTO
-S 12191000 H 03979000 AUTO
-S 12196000 H 03979000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11717000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4411000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11747000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11756000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11780000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11800000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11825000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4552000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11865000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11882000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4883000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11925000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11930000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11935000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11936000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11940000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11945000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11950000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11955000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11960000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11965000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11970000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11970000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11975000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11980000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11985000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11989000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11990000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11995000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12000000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12009000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12032000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12092000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2314000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12114000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 14398000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12134000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12164000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12170000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12175000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12180000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12185000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12191000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12196000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3979000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy3C-95.0W b/dvb-s/Galaxy3C-95.0W
index c62fff4..d9e62cf 100644
--- a/dvb-s/Galaxy3C-95.0W
+++ b/dvb-s/Galaxy3C-95.0W
@@ -1,3 +1,10 @@
# Galaxy 3C @ 95W
# freq pol sr fec
-S 11780000 H 20760000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11780000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 20760000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Hispasat-30.0W b/dvb-s/Hispasat-30.0W
index a21592b..c84145c 100644
--- a/dvb-s/Hispasat-30.0W
+++ b/dvb-s/Hispasat-30.0W
@@ -1,43 +1,323 @@
# Hispasat 30.0W
# freq pol sr fec
-S 11539000 V 24500000 5/6
-S 11749000 V 03520000 AUTO
-S 11760000 V 03260000 AUTO
-S 11766000 V 04500000 AUTO
-S 11776000 V 02387000 AUTO
-S 11783000 V 01200000 AUTO
-S 11787000 V 02500000 AUTO
-S 11807000 V 06510000 AUTO
-S 11823000 V 02387000 AUTO
-S 11884000 V 27500000 AUTO
-S 11907000 V 02592000 AUTO
-S 11917000 V 05681000 AUTO
-S 11931000 H 27500000 3/4
-S 11931000 V 02220000 AUTO
-S 11936000 V 05185000 AUTO
-S 11940000 V 01481000 AUTO
-S 11972000 H 27500000 AUTO
-S 11997000 H 04422000 AUTO
-S 12003000 H 05632000 AUTO
-S 12008000 H 06111000 AUTO
-S 12015000 H 03492000 AUTO
-S 12015000 V 27500000 3/4
-S 12040000 H 05632000 AUTO
-S 12052000 V 27500000 AUTO
-S 12085000 H 05632000 AUTO
-S 12131000 H 27500000 AUTO
-S 12135000 V 04444000 AUTO
-S 12137000 V 03030000 AUTO
-S 12141000 V 03255000 AUTO
-S 12146000 V 04200000 AUTO
-S 12156000 V 02222000 AUTO
-S 12158000 V 02348000 AUTO
-S 12163000 V 03030000 AUTO
-S 12168000 V 05240000 AUTO
-S 12172000 H 27500000 AUTO
-S 12175000 V 04500000 AUTO
-S 12182000 V 03340000 AUTO
-S 12188000 V 02583000 AUTO
-S 12192000 V 02593000 AUTO
-S 12567000 H 19850000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11539000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11749000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3520000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11760000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3260000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11766000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11776000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2387000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11783000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11787000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11807000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6510000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11823000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2387000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11884000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11907000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2592000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11917000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5681000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11931000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11931000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2220000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11936000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5185000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11940000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1481000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11972000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11997000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4422000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12003000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12008000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3492000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12015000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12040000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12052000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12085000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12131000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12135000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12137000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3030000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12141000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12146000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12156000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12158000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2348000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12163000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3030000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12168000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5240000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12172000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12175000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12182000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12188000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2583000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12192000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2593000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12567000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19850000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Hotbird-13.0E b/dvb-s/Hotbird-13.0E
index 9bf01bf..c1759e0 100644
--- a/dvb-s/Hotbird-13.0E
+++ b/dvb-s/Hotbird-13.0E
@@ -1,99 +1,787 @@
# EUTELSAT SkyPlex, Hotbird 13E
# std freq pol sr fec rolloff mod is_id pls_code pls_mode
-S 10719000 V 27500000 3/4
-S 10723000 H 29900000 3/4
-S 10757000 V 27500000 3/4
-S 10775000 H 28000000 3/4
-S 10795000 V 27500000 3/4
-S 10834000 V 27500000 3/4
-S 10853000 H 27500000 3/4
-S 10872000 V 27500000 3/4
-S 10892000 H 27500000 3/4
-S 10910000 V 27500000 3/4
-S 10930000 H 27500000 3/4
-S 10949000 V 27500000 3/4
-S 10971000 H 27500000 3/4
-S 10992000 V 27500000 2/3
-S 11013000 H 27500000 3/4
-S 11034000 V 27500000 3/4
-S 11054000 H 27500000 5/6
-S 11075000 V 27500000 3/4
-S 11095000 H 28000000 3/4
-S 11117000 V 27500000 3/4
-S 11137000 H 27500000 3/4
-S 11158000 V 27500000 3/4
-S 11178000 H 27500000 3/4
-S 11200000 V 27500000 5/6
-S 11219000 H 27500000 3/4
-S 11242000 V 27500000 3/4
-S 11278000 V 27500000 3/4
-S 11295000 H 27500000 3/4
-S 11334000 H 27500000 2/3
-S 11355000 V 27500000 3/4
-S 11373000 H 27500000 2/3
-S 11393000 V 27500000 3/4
-S 11411000 H 27500000 5/6
-S2 11432000 V 27500000 2/3 AUTO 8PSK 1 8
-S2 11432000 V 27500000 2/3 AUTO 8PSK 2 8
-S 11470000 V 27500000 5/6
-S 11488000 H 27500000 3/4
-S 11526000 H 27500000 3/4
-S 11541000 V 22000000 5/6
-S 11565000 H 27500000 3/4
-S 11585000 V 27500000 3/4
-S 11604000 H 27500000 5/6
-S 11623000 V 27500000 3/4
-S 11645000 H 27500000 3/4
-S 11662000 V 27500000 3/4
-S 11677000 H 27500000 3/4
-S 11727000 V 27500000 3/4
-S 11747000 H 27500000 3/4
-S 11765000 V 27500000 2/3
-S 11785000 H 27500000 3/4
-S 11804000 V 27500000 2/3
-S 11823000 H 27500000 3/4
-S 11842000 V 27500000 3/4
-S 11861000 H 27500000 3/4
-S 11880000 V 27500000 3/4
-S 11900000 H 27500000 3/4
-S 11919000 V 27500000 2/3
-S 11938000 H 27500000 3/4
-S 11958000 V 27500000 3/4
-S 11976000 H 27500000 3/4
-S 12015000 H 27500000 3/4
-S 12034000 V 27500000 3/4
-S 12054000 H 27500000 3/4
-S 12072000 V 27500000 3/4
-S 12092000 H 27500000 3/4
-S 12111000 V 27500000 3/4
-S 12149000 V 27500000 3/4
-S 12169000 H 27500000 3/4
-S 12188000 V 27500000 3/4
-S 12207000 H 27500000 3/4
-S 12226000 V 27500000 3/4
-S 12245000 H 27500000 3/4
-S 12264000 V 27500000 3/4
-S 12284000 H 27500000 3/4
-S 12302000 V 27500000 3/4
-S 12322000 H 27500000 3/4
-S 12341000 V 27500000 3/4
-S 12360000 H 27500000 3/4
-S 12379000 V 27500000 3/4
-S 12398000 H 27500000 3/4
-S 12418000 V 27500000 3/4
-S 12437000 H 27500000 3/4
-S 12475000 H 27500000 3/4
-S 12519000 V 27500000 3/4
-S2 12539000 H 27500000 2/3 AUTO 8PSK 1 8
-S2 12539000 H 27500000 2/3 AUTO 8PSK 2 8
-S 12558000 V 27500000 3/4
-S 12577000 H 27500000 3/4
-S 12596000 V 27500000 3/4
-S 12616000 H 27500000 3/4
-S 12635000 V 27500000 3/4
-S 12654000 H 27500000 3/4
-S 12673000 V 27500000 3/4
-S 12692000 H 27500000 3/4
-S 12713000 V 27500000 3/4
-S 12731000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10719000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10723000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29900000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10757000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10775000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10795000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10834000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10853000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10872000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10892000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10910000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10930000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10949000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10971000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10992000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11013000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11034000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11054000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11075000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11095000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11117000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11137000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11158000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11178000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11200000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11219000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11242000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11278000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11295000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11334000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11355000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11373000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11393000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11411000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11432000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 1
+ PLS CODE = 8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11432000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 2
+ PLS CODE = 8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11470000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11488000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11526000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11541000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11565000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11585000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11604000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11623000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11645000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11662000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11677000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11727000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11747000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11765000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11785000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11804000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11823000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11842000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11861000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11880000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11900000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11919000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11938000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11958000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11976000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12034000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12054000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12072000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12092000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12111000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12149000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12169000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12188000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12207000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12226000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12245000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12264000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12284000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12302000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12322000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12341000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12360000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12379000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12398000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12418000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12437000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12475000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12519000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12539000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 1
+ PLS CODE = 8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 12539000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 2
+ PLS CODE = 8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12558000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12577000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12596000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12616000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12635000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12654000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12673000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12692000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12713000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12731000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/IA7-129w b/dvb-s/IA7-129w
index 0be1d6e..612504a 100644
--- a/dvb-s/IA7-129w
+++ b/dvb-s/IA7-129w
@@ -1,4 +1,11 @@
# Intelsat Americas 7 @ 129W
# freq pol sr fec
-S 11989000 H 02821000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11989000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2821000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Insat2E_C-83.0E b/dvb-s/Insat2E_C-83.0E
index 8e76b8e..f6bdccc 100644
--- a/dvb-s/Insat2E_C-83.0E
+++ b/dvb-s/Insat2E_C-83.0E
@@ -6,88 +6,291 @@
# freq pol sr fec
# NE TV Multiplex
-S 3521000 V 8640000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3521000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8640000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# NE TV Multiplex
-S 3537000 V 10800000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3537000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV 9 Telugu
-S 3550000 V 3255000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3550000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# S1 Channel
-S 3559000 V 3366000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3559000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3366000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV 9 Kannada
-S 3581000 V 3255000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3581000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Jaya TV
-S 3593000 V 8680000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3593000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8680000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Tata Communications Multiplex
-S 3593000 V 9629000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3593000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 9629000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Asianet Multiplex
-S 3643000 V 19531000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3643000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 19531000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Amrita TV Middle East
-S 3678000 V 5926000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3678000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5926000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Mahaa TV
-S 3689000 V 2893000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3689000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2893000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Tata Communications Multiplex
-S 3696000 V 6111000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3696000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# CNBC India
-S 3760000 V 6500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3760000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Raj TV Network Multiplex
-S 3774000 V 13021000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3774000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# UTVi TV
-S 3794000 V 3500000 3/5
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3794000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3500000
+ INNER_FEC = 3/5
+ INVERSION = AUTO
+
# PTC Multiplex (MPEG-4 S/2)
-S 3815000 V 6000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3815000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Tata Communications Multiplex
-S 3845000 V 26043000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3845000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26043000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Indiavision
-S 3914000 V 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3914000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Yes Indiavision
-S 3919000 V 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3919000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Manorama News International
-S 3923000 V 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3923000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Tata Communications Multiplex
-S 3934000 V 13021000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3934000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Raj Musix kanada
-S 3961000 V 6656000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3961000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6656000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV 9 Multiplex
-S 3974000 V 13333000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3974000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Asianet Multiplex
-S 4010000 V 19531000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4010000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 19531000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Tata Communications Multiplex
-S 4031000 V 7440000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4031000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7440000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# RRSat Multiplex
-S 4042000 V 7420000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4042000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7420000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Tata Communications Multiplex
-S 4050000 V 5084000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4050000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5084000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# DD national
-S 4070000 V 5000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4070000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Indiasign Mulitplex
-S 4091000 V 9230000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4091000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 9230000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# News Live (MPEG-4 S/2)
-S 4100000 V 4700000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4100000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4700000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Insat3A_C-93.5E b/dvb-s/Insat3A_C-93.5E
index b4430df..b12d36b 100644
--- a/dvb-s/Insat3A_C-93.5E
+++ b/dvb-s/Insat3A_C-93.5E
@@ -6,61 +6,201 @@
# freq pol sr fec
# DD Bangla
-S 3732000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3732000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Punjab
-S 3740000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3740000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Gujarati
-S 3750000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3750000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Chandana
-S 3759000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3759000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Oriya
-S 3772000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3772000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD kashir
-S 3782000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3782000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Sahyadri
-S 3791000 V 8600000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3791000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8600000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Malayalam
-S 3812000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3812000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Saptagiri
-S 3820000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3820000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD podhigai
-S 3831000 V 8600000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3831000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8600000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Himachal Pradesh
-S 3932000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3932000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Jaipur
-S 3940000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3940000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Madhya Pradesh
-S 3950000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3950000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Uttar Pradesh
-S 3958000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3958000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD North East
-S 4092000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4092000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Mizoram
-S 4101000 V 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4101000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Tripura
-S 4109000 V 4250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4109000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RTA Afghanistan
-S 4132000 V 4000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4132000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RTA Afghanistan Nangarhar
-S 4136000 V 2000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4136000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Ariana TV Network Multiplex
-S 4141000 V 5150000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4141000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5150000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Insat4A_C-83.0E b/dvb-s/Insat4A_C-83.0E
index fa27210..8e1e903 100644
--- a/dvb-s/Insat4A_C-83.0E
+++ b/dvb-s/Insat4A_C-83.0E
@@ -6,88 +6,291 @@
# freq pol sr fec
# NSTPL Multiplex
-S 3725000 H 26665000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3725000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26665000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Indiasign multiplex
-S 3756000 H 13333000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3756000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Star TV Multiplex
-S 3777000 H 10900000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3777000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 10900000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Essel Shyam Multiplex
-S 3805000 H 28500000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3805000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Tarang TV Multiplex (MPEG-4 S/2)
-S 3841000 H 6920000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3841000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6920000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# CTVN AKD Plus
-S 3853000 H 3265000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3853000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3265000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Kasthuri TV
-S 3857000 H 3462000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3857000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3462000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Kamyab TV
-S 3874000 H 3403000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3874000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3403000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Vanitha TV
-S 3892000 H 3300000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3892000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3300000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Essel Shayam Multiplex
-S 3898000 H 6800000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3898000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Channel 10 India
-S 3910000 H 3600000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3910000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3600000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Essel Shyam
-S 3923000 H 13000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3923000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DY 365
-S 3949000 H 3225000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3949000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3225000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Multiplex
-S 3958000 H 9500000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3958000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 9500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Zee News Uttar Pradesh
-S 3976000 H 3200000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3976000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3200000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# ETV Network Multiplex
-S 4004000 H 22220000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4004000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22220000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Essel Shyam
-S 4040000 H 7500000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4040000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Lamhas Multiplex
-S 4054000 H 13230000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4054000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13230000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Network 18 Multiplex
-S 4072000 H 6500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4072000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# IBN Lokmat
-S 4078000 H 3250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4078000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Live India
-S 4087000 H 3300000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4087000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3300000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Mi Marathi
-S 4091000 H 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4091000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# BBS TV
-S 4100000 H 4750000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4100000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4750000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Manorama News
-S 4115000 H 5555000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4115000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5555000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# BAG Films
-S 4134000 H 10600000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4134000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 10600000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Zee Network Multiplex
-S 4151000 H 6500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4151000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Zee Network Multiplex
-S 4161000 H 6500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4161000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Lok Sabha TV
-S 4170000 H 6500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4170000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Kolkata TV
-S 4180000 H 3233000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4180000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3233000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Insat4B_C-93.5E b/dvb-s/Insat4B_C-93.5E
index 5431ae0..6e93997 100644
--- a/dvb-s/Insat4B_C-93.5E
+++ b/dvb-s/Insat4B_C-93.5E
@@ -6,46 +6,151 @@
# freq pol sr fec
# Doordarshan Multiplex
-S 3725000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3725000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Dehradun
-S 3750000 H 4250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3750000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Raipur
-S 3762000 H 4250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3762000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Ranchi
-S 3768000 H 4250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3768000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Jammu
-S 3774000 H 4250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3774000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Hissar
-S 3802000 H 4250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3802000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Chandigarh
-S 3808000 H 4250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3808000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Port Blair
-S 3822000 H 4250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3822000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD Bihar
-S 3832000 H 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3832000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# DD North East
-S 3841000 H 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3841000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Sun network
-S 3885000 H 28000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3885000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Doordarshan Multiplex
-S 3925000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3925000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Sakshi TV
-S 3950000 H 4440000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3950000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4440000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Tata Communications Multiplex
-S 4005000 H 25422000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4005000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 25422000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Sun Network
-S 4045000 H 28000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4045000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intel4-72.0E b/dvb-s/Intel4-72.0E
index 3a7b640..feba65e 100644
--- a/dvb-s/Intel4-72.0E
+++ b/dvb-s/Intel4-72.0E
@@ -1,6 +1,34 @@
# Intel4 @ 72E
# freq pol sr fec
-S 11533000 V 4220000 AUTO
-S 11638000 H 5632000 AUTO
-S 12518000 V 8232000 AUTO
-S 12526000 V 3266000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11533000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4220000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11638000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12518000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12526000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3266000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intel904-60.0E b/dvb-s/Intel904-60.0E
index d39362c..11bcce4 100644
--- a/dvb-s/Intel904-60.0E
+++ b/dvb-s/Intel904-60.0E
@@ -1,13 +1,90 @@
# Intel904 @ 60E
# freq pol sr fec
-S 11003000 H 2975000 AUTO
-S 11011000 H 2975000 AUTO
-S 11015000 H 2975000 AUTO
-S 11093000 V 3980000 AUTO
-S 11101000 V 4105000 AUTO
-S 11142000 H 2963000 AUTO
-S 11152000 H 2963000 AUTO
-S 11157000 H 2963000 AUTO
-S 11515000 V 7300000 AUTO
-S 11635000 V 29700000 AUTO
-S 11675000 V 29700000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11003000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2975000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11011000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2975000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2975000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11093000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3980000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11101000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4105000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11142000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11152000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11157000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11515000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7300000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11635000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11675000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-1002-1.0W b/dvb-s/Intelsat-1002-1.0W
index 0142ded..57b2b60 100644
--- a/dvb-s/Intelsat-1002-1.0W
+++ b/dvb-s/Intelsat-1002-1.0W
@@ -1,20 +1,146 @@
# Intelsat 1002 @ 1.0W
# freq pol sr fec
-S 4175000 V 28000000 AUTO
-S 4180000 H 21050000 AUTO
-S 11093000 H 19191000 7/8
-S 11166000 V 1450000 7/8
-S 11182000 V 3100000 7/8
-S 11606000 H 13356000 7/8
-S 12527000 H 27500000 3/4
-S 12563000 H 27500000 3/4
-S 12563000 V 27500000 3/4
-S 12607000 H 27500000 3/4
-S 12607000 V 27500000 3/4
-S 12643000 H 27500000 3/4
-S 12643000 V 27500000 3/4
-S 12687000 H 27500000 3/4
-S 12687000 V 27500000 3/4
-S 12718000 V 18400000 3/4
-S 12723000 H 27500000 3/4
-S 12735000 V 8800000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4175000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4180000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 21050000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11093000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19191000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11166000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1450000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11182000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3100000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11606000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13356000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12527000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12563000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12563000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12607000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12607000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12643000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12643000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12687000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12687000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12718000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 18400000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12723000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12735000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8800000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-11-43.0W b/dvb-s/Intelsat-11-43.0W
index 424f78a..3ae9107 100644
--- a/dvb-s/Intelsat-11-43.0W
+++ b/dvb-s/Intelsat-11-43.0W
@@ -1,4 +1,11 @@
# Intelsat 11 @ 43.0W
# freq pol sr fec
-S 3944000 H 05945000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3944000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5945000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-12-45.0E b/dvb-s/Intelsat-12-45.0E
index 23b15c6..d98b9dd 100644
--- a/dvb-s/Intelsat-12-45.0E
+++ b/dvb-s/Intelsat-12-45.0E
@@ -1,13 +1,107 @@
# Intelsat 12 @ 45.0E
# std freq pol sr fec rolloff mod is_id pls_code pls_mode
-S2 11468000 V 30000000 AUTO AUTO 8PSK
-S2 11495000 V 7299000 AUTO AUTO 8PSK
-S 11517000 V 2959000 AUTO
-S 11523000 V 5787000 AUTO
-S2 11550000 V 30000000 AUTO AUTO 8PSK
-S2 11591000 V 30000000 AUTO AUTO 8PSK 2
-S2 11591000 V 30000000 AUTO AUTO 8PSK 3
-S2 11591000 V 30000000 AUTO AUTO 8PSK 4
-S2 11632000 V 30000000 AUTO AUTO 8PSK
-S2 11673000 V 30000000 AUTO AUTO 8PSK
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11468000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11495000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7299000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11517000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2959000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11523000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5787000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11550000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11591000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 2
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11591000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11591000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11632000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS2
+ FREQUENCY = 11673000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ ROLLOFF = AUTO
+ MODULATION = PSK/8
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-1R-45.0W b/dvb-s/Intelsat-1R-45.0W
index 15f6574..d512c54 100644
--- a/dvb-s/Intelsat-1R-45.0W
+++ b/dvb-s/Intelsat-1R-45.0W
@@ -1,44 +1,331 @@
# Intelsat 1R @ 45.0W
# freq pol sr fec
-S 4104000 V 14450000 AUTO
-S 3854000 H 02370000 AUTO
-S 11893000 H 06620000 AUTO
-S 3869000 H 03515000 AUTO
-S 4186000 V 02000000 AUTO
-S 4040000 V 04347000 AUTO
-S 4071000 V 02615000 AUTO
-S 3991000 V 04044000 AUTO
-S 3882000 V 04410000 AUTO
-S 11788000 V 10000000 AUTO
-S 11728000 V 05057000 AUTO
-S 11737000 V 05057000 AUTO
-S 11722000 V 03000000 AUTO
-S 11718000 H 24667000 AUTO
-S 11833000 H 17360000 AUTO
-S 11930000 V 11790000 AUTO
-S 11808000 H 04779000 AUTO
-S 4132000 H 05749000 AUTO
-S 3780000 V 02941000 AUTO
-S 11705000 V 04440000 AUTO
-S 3759000 V 02941000 AUTO
-S 4171000 V 04410000 AUTO
-S 3899000 V 06611000 AUTO
-S 4192000 H 02075000 AUTO
-S 4096000 H 08102000 AUTO
-S 11873000 H 06000000 AUTO
-S 11856000 V 03000000 AUTO
-S 11746000 V 06900000 AUTO
-S 11715000 V 05500000 AUTO
-S 3985000 V 03310000 AUTO
-S 3892000 V 06110000 AUTO
-S 4135000 H 26600000 AUTO
-S 4121000 H 03510000 AUTO
-S 3742000 V 04444000 AUTO
-S 3910000 V 04292000 AUTO
-S 3975000 V 03310000 AUTO
-S 4133000 V 03255000 AUTO
-S 3785000 V 04409000 AUTO
-S 3868000 V 10075000 AUTO
-S 3774000 V 08820000 AUTO
-S 4128000 V 03310000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4104000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 14450000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3854000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2370000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11893000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3869000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3515000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4186000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4040000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4347000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4071000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2615000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3991000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4044000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3882000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4410000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11788000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11728000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5057000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11737000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5057000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11722000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11718000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11833000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 17360000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11930000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11790000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11808000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4779000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4132000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5749000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3780000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2941000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11705000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4440000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3759000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2941000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4171000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4410000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3899000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6611000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4192000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2075000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4096000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8102000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11873000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11856000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11746000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11715000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3985000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3310000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3892000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6110000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4135000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4121000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3510000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3742000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3910000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4292000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3975000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3310000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4133000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3785000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4409000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3868000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10075000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3774000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8820000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4128000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3310000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-3R-43.0W b/dvb-s/Intelsat-3R-43.0W
index d64bc5b..9ffcec5 100644
--- a/dvb-s/Intelsat-3R-43.0W
+++ b/dvb-s/Intelsat-3R-43.0W
@@ -1,35 +1,259 @@
# Intelsat 3R @ 43.0W
# freq pol sr fec
-S 3936000 H 03310000 AUTO
-S 3901000 V 06620000 AUTO
-S 3891000 V 06111000 AUTO
-S 3935000 V 17360000 AUTO
-S 3872000 H 06620000 AUTO
-S 3736000 H 29270000 AUTO
-S 4106000 V 26470000 AUTO
-S 3910000 V 05632000 AUTO
-S 3919000 V 06620000 AUTO
-S 4083000 V 06599000 AUTO
-S 4106000 H 29270000 AUTO
-S 3994000 H 21090000 AUTO
-S 3867000 V 06429000 AUTO
-S 3958000 V 06500000 AUTO
-S 3980000 V 03500000 AUTO
-S 3828000 V 04350000 AUTO
-S 3888000 H 07813000 AUTO
-S 3785000 H 30800000 AUTO
-S 3942000 V 01200000 AUTO
-S 3946000 V 02592000 AUTO
-S 3988000 V 04070000 AUTO
-S 3845000 H 30800000 AUTO
-S 4040000 H 30800000 AUTO
-S 3865000 V 06900000 AUTO
-S 3850000 V 28800000 AUTO
-S 11705000 H 03700000 AUTO
-S 11745000 H 03111000 AUTO
-S 11711000 H 04687000 AUTO
-S 11754000 H 03109000 AUTO
-S 3746000 V 21261000 AUTO
-S 4150000 H 24570000 AUTO
-S 3930000 H 02812000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3936000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3310000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3901000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3891000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3935000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 17360000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3872000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3736000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29270000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4106000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26470000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3910000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3919000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4083000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6599000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4106000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29270000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3994000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 21090000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3867000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6429000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3958000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3980000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3828000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4350000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3888000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7813000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3785000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3942000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3946000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2592000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3988000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4070000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3845000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4040000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3865000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6900000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3850000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11705000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11745000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11711000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4687000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11754000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3109000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3746000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 21261000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4150000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24570000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3930000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2812000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-6B-43.0W b/dvb-s/Intelsat-6B-43.0W
index a8b4d7a..169e6eb 100644
--- a/dvb-s/Intelsat-6B-43.0W
+++ b/dvb-s/Intelsat-6B-43.0W
@@ -1,17 +1,115 @@
# Intelsat 6B @ 43.0W
# freq pol sr fec
-S 10882000 H 30000000 AUTO
-S 10882000 V 30000000 AUTO
-S 10970000 H 30000000 AUTO
-S 10970000 V 30000000 AUTO
-S 11050000 H 30000000 AUTO
-S 11130000 H 30000000 AUTO
-S 11382000 V 30000000 AUTO
-S 11130000 V 30000000 AUTO
-S 10720000 H 30000000 AUTO
-S 10720000 V 30000000 AUTO
-S 11050000 V 30000000 AUTO
-S 11382000 H 30000000 AUTO
-S 10800000 H 30000000 AUTO
-S 10800000 V 30000000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10882000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10882000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10970000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10970000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11050000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11130000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11382000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11130000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10720000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10720000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11050000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11382000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10800000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10800000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-705-50.0W b/dvb-s/Intelsat-705-50.0W
index 48aeec0..461b68a 100644
--- a/dvb-s/Intelsat-705-50.0W
+++ b/dvb-s/Intelsat-705-50.0W
@@ -1,7 +1,35 @@
# Intelsat 705 @ 50.0W
# freq pol sr fec
-S 3911000 V 03617000 AUTO
-S 3917000 V 04087000 AUTO
-S 3838000 H 07053000 AUTO
-S 4126000 H 06111000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3911000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3617000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3917000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4087000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3838000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7053000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4126000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-707-53.0W b/dvb-s/Intelsat-707-53.0W
index 56dd65f..228866c 100644
--- a/dvb-s/Intelsat-707-53.0W
+++ b/dvb-s/Intelsat-707-53.0W
@@ -1,5 +1,19 @@
# Intelsat 707 @ 53.0W
# freq pol sr fec
-S 3820000 V 03255000 AUTO
-S 11483000 V 05333000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3820000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11483000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5333000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-805-55.5W b/dvb-s/Intelsat-805-55.5W
index 3d4cff5..8bfbdb6 100644
--- a/dvb-s/Intelsat-805-55.5W
+++ b/dvb-s/Intelsat-805-55.5W
@@ -1,67 +1,515 @@
# Intelsat 805 @ 55.5W
# freq pol sr fec
-S 4171000 H 06111000 AUTO
-S 4147000 H 06111000 AUTO
-S 3914000 V 01809000 AUTO
-S 3572000 V 11800000 AUTO
-S 4135000 H 06111000 AUTO
-S 3737000 H 01809000 AUTO
-S 3932000 V 03255000 AUTO
-S 3759000 V 04167000 AUTO
-S 3750000 V 05632000 AUTO
-S 3850000 H 20000000 AUTO
-S 4010000 V 06111000 AUTO
-S 3715000 H 08890000 AUTO
-S 3670000 H 01374000 AUTO
-S 4158000 H 01447000 AUTO
-S 3549000 V 06510000 AUTO
-S 3451000 H 04444000 AUTO
-S 3667000 H 03300000 AUTO
-S 3522000 H 30000000 AUTO
-S 4055000 V 21703000 AUTO
-S 3698000 V 03600000 AUTO
-S 4119000 V 01631000 AUTO
-S 3446000 H 03200000 AUTO
-S 3675000 V 02660000 AUTO
-S 3717000 V 11574000 AUTO
-S 4030000 V 06111000 AUTO
-S 3767000 H 04427000 AUTO
-S 4027000 V 02000000 AUTO
-S 4089000 V 05540000 AUTO
-S 3685000 V 05632000 AUTO
-S 3751000 H 05632000 AUTO
-S 4127000 V 02000000 AUTO
-S 3980000 V 19510000 AUTO
-S 3590000 V 10127000 AUTO
-S 4000000 V 05200000 AUTO
-S 3762000 H 03662000 AUTO
-S 3936000 H 03255000 AUTO
-S 3727000 H 03000000 AUTO
-S 4104000 H 05062000 AUTO
-S 3777000 H 07400000 AUTO
-S 3431000 H 03500000 AUTO
-S 3478000 V 05632000 AUTO
-S 4093000 H 02540000 AUTO
-S 3929000 H 02941000 AUTO
-S 4195000 H 04444000 AUTO
-S 4140000 V 04700000 AUTO
-S 4096000 H 05247000 AUTO
-S 3467000 V 04340000 AUTO
-S 3442000 H 03000000 AUTO
-S 4080000 V 04340000 AUTO
-S 4084000 H 10317000 AUTO
-S 3723000 H 03000000 AUTO
-S 3815000 H 26667000 AUTO
-S 4006000 V 03690000 AUTO
-S 3918000 V 04400000 AUTO
-S 3735000 V 08680000 AUTO
-S 3727000 V 03000000 AUTO
-S 3940000 H 02575000 AUTO
-S 3792000 H 02244000 AUTO
-S 3900000 H 03612000 AUTO
-S 3677000 H 04232000 AUTO
-S 4127000 H 02532000 AUTO
-S 4152000 V 03600000 AUTO
-S 4177000 V 27690000 AUTO
-S 4111000 H 03333000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4171000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4147000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3914000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1809000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3572000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4135000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3737000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1809000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3932000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3759000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4167000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3750000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3850000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4010000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3715000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8890000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3670000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1374000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4158000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1447000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3549000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6510000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3451000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3667000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3300000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3522000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4055000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 21703000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3698000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4119000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1631000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3446000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3675000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2660000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3717000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11574000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4030000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3767000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4427000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4027000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4089000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3685000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3751000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4127000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3980000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 19510000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3590000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10127000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4000000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3762000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3662000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3936000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3727000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4104000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5062000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3777000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3431000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3478000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4093000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3929000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2941000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4195000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4140000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4096000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5247000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3467000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3442000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4080000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4084000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 10317000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3723000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3815000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4006000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3690000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3918000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3735000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8680000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3727000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3940000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2575000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3792000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2244000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3900000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3612000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3677000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4127000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2532000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4152000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4177000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27690000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4111000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-9-58.0W b/dvb-s/Intelsat-9-58.0W
index e8605a9..b076971 100644
--- a/dvb-s/Intelsat-9-58.0W
+++ b/dvb-s/Intelsat-9-58.0W
@@ -1,58 +1,443 @@
# Intelsat 9 @ 58.0W
# freq pol sr fec
-S 4122000 H 02222000 AUTO
-S 4146000 H 06620000 AUTO
-S 4157000 H 06620000 AUTO
-S 4160000 V 03000000 AUTO
-S 3960000 V 29270000 AUTO
-S 3960000 H 29270000 AUTO
-S 4080000 H 27684000 AUTO
-S 3720000 H 19510000 AUTO
-S 4131000 H 04444000 AUTO
-S 4155000 H 06111000 AUTO
-S 4173000 H 06620000 AUTO
-S 3995000 H 05632000 AUTO
-S 3986000 H 06111000 AUTO
-S 4175000 H 04410000 AUTO
-S 4107000 H 08850000 AUTO
-S 3925000 H 06666000 AUTO
-S 3905000 H 06620000 AUTO
-S 3915000 H 06620000 AUTO
-S 3925000 H 06620000 AUTO
-S 4005000 H 06620000 AUTO
-S 4015000 H 06620000 AUTO
-S 3720000 V 27700000 AUTO
-S 4166000 H 06200000 AUTO
-S 3794000 H 03332000 AUTO
-S 3807000 H 03428000 AUTO
-S 3880000 V 27690000 AUTO
-S 3800000 V 26470000 AUTO
-S 3760000 V 27690000 AUTO
-S 3996000 H 03330000 AUTO
-S 3935000 H 05632000 AUTO
-S 11852000 V 30000000 AUTO
-S 11895000 V 20000000 AUTO
-S 11913000 V 10000000 AUTO
-S 4155000 V 03310000 AUTO
-S 3934000 V 07000000 AUTO
-S 3787000 H 07407000 AUTO
-S 3924000 V 06620000 AUTO
-S 3800000 H 04444000 AUTO
-S 3911000 V 13330000 AUTO
-S 4040000 H 16180000 AUTO
-S 4080000 V 27690000 AUTO
-S 4144000 V 02205000 AUTO
-S 4151000 V 02890000 AUTO
-S 4147000 V 02941000 AUTO
-S 4170000 V 02941000 AUTO
-S 3760000 H 28500000 AUTO
-S 4120000 V 27500000 AUTO
-S 11670000 V 16470000 AUTO
-S 4125000 H 02941000 AUTO
-S 4137000 H 02941000 AUTO
-S 3880000 H 27690000 AUTO
-S 4174000 V 02941000 AUTO
-S 3840000 V 27690000 AUTO
-S 3840000 H 27690000 AUTO
-S 3815000 H 06250000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4122000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4146000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4157000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4160000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3960000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29270000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3960000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29270000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4080000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27684000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3720000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19510000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4131000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4155000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4173000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3995000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3986000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4175000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4410000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4107000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8850000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3925000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3905000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3915000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3925000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4005000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3720000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4166000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3794000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3332000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3807000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3428000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3880000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27690000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3800000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26470000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3760000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27690000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3996000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3330000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3935000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11852000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11895000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11913000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4155000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3310000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3934000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3787000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7407000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3924000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3800000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3911000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13330000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4040000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 16180000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4080000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27690000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4144000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2205000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4151000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2890000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4147000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2941000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4170000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2941000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3760000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4120000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11670000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 16470000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4125000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2941000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4137000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2941000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3880000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27690000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4174000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2941000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3840000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27690000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3840000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27690000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3815000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-903-34.5W b/dvb-s/Intelsat-903-34.5W
index 141c42c..f6be6ea 100644
--- a/dvb-s/Intelsat-903-34.5W
+++ b/dvb-s/Intelsat-903-34.5W
@@ -1,7 +1,35 @@
# Intelsat 903 @ 34.5W
# freq pol sr fec
-S 4178000 V 32555000 AUTO
-S 4045000 H 04960000 AUTO
-S 3895000 H 13021000 AUTO
-S 4004000 V 02170000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4178000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 32555000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4045000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4960000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3895000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13021000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4004000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-905-24.5W b/dvb-s/Intelsat-905-24.5W
index c5b1c21..730d2c9 100644
--- a/dvb-s/Intelsat-905-24.5W
+++ b/dvb-s/Intelsat-905-24.5W
@@ -1,9 +1,51 @@
# Intelsat 905 @ 24.5W
# freq pol sr fec
-S 4171000 V 06111000 AUTO
-S 4181000 V 06111000 AUTO
-S 4194000 V 05193000 AUTO
-S 4162000 V 06111000 AUTO
-S 4060000 V 06111000 AUTO
-S 4070000 V 06111000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4171000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4181000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4194000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5193000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4162000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4060000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4070000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-907-27.5W b/dvb-s/Intelsat-907-27.5W
index c12f549..9e6d553 100644
--- a/dvb-s/Intelsat-907-27.5W
+++ b/dvb-s/Intelsat-907-27.5W
@@ -1,9 +1,51 @@
# Intelsat 907 @ 27.5W
# freq pol sr fec
-S 3873000 H 04687000 AUTO
-S 3935000 H 04687000 AUTO
-S 3743000 V 02900000 AUTO
-S 3732000 V 14000000 AUTO
-S 3943000 H 01808000 AUTO
-S 3938000 H 03544000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3873000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4687000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3935000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4687000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3743000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2900000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3732000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 14000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3943000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1808000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3938000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3544000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat8_C-166.0E b/dvb-s/Intelsat8_C-166.0E
index 6c671cc..be61e6b 100644
--- a/dvb-s/Intelsat8_C-166.0E
+++ b/dvb-s/Intelsat8_C-166.0E
@@ -6,34 +6,111 @@
# freq pol sr fec
# Viacom Multiplex
-S 3740000 H 27500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3740000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# South Korean Multiplex
-S 3790000 V 6510000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3790000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6510000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Arirang World
-S 3815000 V 4400000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3815000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Australian network Multiplex
-S 3829000 H 13238000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3829000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13238000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TVBS multiplex
-S 3833000 V 17500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3833000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 17500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# NBC Universal
-S 3900000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3900000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Intelsat multiplex
-S 3940000 H 27690000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3940000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27690000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# China Radio multiplex
-S 3959000 V 3428000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3959000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3428000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# NHK World network Multiplex
-S 4060000 H 16180000 1/2
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4060000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 16180000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
# Philippines Network TV Multiplex
-S 4122000 V 5554000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4122000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5554000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TAS Multiplex
-S 4130000 V 5800000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4130000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/JCSat3A_C-128.0E b/dvb-s/JCSat3A_C-128.0E
index 71f68d1..211c636 100644
--- a/dvb-s/JCSat3A_C-128.0E
+++ b/dvb-s/JCSat3A_C-128.0E
@@ -6,13 +6,41 @@
# freq pol sr fec
# TAS Multiplex
-S 3960000 V 30000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3960000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# TAS Multiplex
-S 4000000 V 30000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4000000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Miraclenet
-S 4055000 V 3332000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4055000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3332000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TAS Multiplex
-S 4120000 V 30000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4120000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
diff --git a/dvb-s/Measat3_C-91.5E b/dvb-s/Measat3_C-91.5E
index 2753ac0..4ecce5e 100644
--- a/dvb-s/Measat3_C-91.5E
+++ b/dvb-s/Measat3_C-91.5E
@@ -6,49 +6,161 @@
# freq pol sr fec
# Shop TV
-S 3629000 V 2200000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3629000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2200000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Aora TV Mulitplex
-S 3644000 H 22320000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3644000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22320000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Solar Entertainment
-S 3645000 V 19510000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3645000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 19510000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# National Geographic music
-S 3718000 V 1700000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3718000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1700000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# DZRH TV Multiplex
-S 3721000 V 2170000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3721000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Ascent Media (MPEG-4 S/2)
-S 3751000 V 13330000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3751000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13330000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Globecast Multiplex (MPEG-4 S/2)
-S 3769000 V 14000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3769000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 14000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# HTV Multiplex
-S 3796000 V 7030000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3796000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7030000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Sky International
-S 3814000 V 6666000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3814000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Un-named Mulitplex
-S 3865000 V 3835000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3865000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3835000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RTM Multiplex
-S 3877000 V 12525000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3877000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 12525000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# RTM Sarawak Feeds
-S 3887000 V 3984000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3887000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3984000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Globecast Multiplex
-S 3920000 V 28000000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3920000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# Ginx TV
-S 4113000 V 2960000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4113000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2960000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# YR Asia TV
-S 4117000 V 2963000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4117000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# All Sports Network (MPEG-4 S/2)
-S 4134000 V 7200000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4134000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7200000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/NSS-10-37.5W b/dvb-s/NSS-10-37.5W
index 3ebaa71..4f892aa 100644
--- a/dvb-s/NSS-10-37.5W
+++ b/dvb-s/NSS-10-37.5W
@@ -1,12 +1,75 @@
# NSS 10 @ 37.5W
# freq pol sr fec
-S 4055000 V 02700000 AUTO
-S 3824000 H 01808000 AUTO
-S 4059000 V 03214000 AUTO
-S 3828000 H 02532000 AUTO
-S 3844000 H 04340000 AUTO
-S 4071000 V 03150000 AUTO
-S 4051000 V 04440000 AUTO
-S 4044000 V 03250000 AUTO
-S 4077000 V 03200000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4055000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3824000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1808000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4059000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3214000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3828000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2532000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3844000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4071000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3150000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4051000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4440000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4044000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3250000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4077000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/NSS-7-22.0W b/dvb-s/NSS-7-22.0W
index e1eefaf..a085d0f 100644
--- a/dvb-s/NSS-7-22.0W
+++ b/dvb-s/NSS-7-22.0W
@@ -1,25 +1,179 @@
# NSS 7 @ 22.0W
# freq pol sr fec
-S 3926000 H 03715000 AUTO
-S 3920000 H 03715000 AUTO
-S 3954000 V 05632000 AUTO
-S 3929000 V 05632000 AUTO
-S 3915000 H 03715000 AUTO
-S 3761000 V 22650000 AUTO
-S 11825000 H 05904000 AUTO
-S 12162000 H 06510000 AUTO
-S 11777000 H 04000000 AUTO
-S 11860000 H 35000000 AUTO
-S 12049000 H 06500000 AUTO
-S 11921000 H 35000000 AUTO
-S 4003000 H 06667000 AUTO
-S 4011000 H 06667000 AUTO
-S 4126000 H 03680000 AUTO
-S 3969000 H 01808000 AUTO
-S 3976000 H 01842000 AUTO
-S 11814000 H 05630000 AUTO
-S 4038000 V 03690000 AUTO
-S 3674000 V 02222000 AUTO
-S 4033000 V 03689000 AUTO
-S 4016000 H 03663000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3926000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3715000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3920000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3715000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3954000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3929000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3915000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3715000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3761000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22650000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11825000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5904000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12162000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6510000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11777000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11860000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 35000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12049000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11921000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 35000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4003000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4011000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4126000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3680000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3969000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1808000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3976000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1842000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11814000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5630000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4038000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3690000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3674000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4033000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3689000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4016000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3663000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/NSS-806-40.5W b/dvb-s/NSS-806-40.5W
index 8bea0a8..fb5d054 100644
--- a/dvb-s/NSS-806-40.5W
+++ b/dvb-s/NSS-806-40.5W
@@ -1,108 +1,843 @@
# NSS 806 @ 40.5W
# freq pol sr fec
-S 11921000 H 35000000 AUTO
-S 3660000 H 04350000 AUTO
-S 3986000 H 03179000 AUTO
-S 3859000 H 02600000 AUTO
-S 4120000 V 02960000 AUTO
-S 4016000 V 05712000 AUTO
-S 3978000 H 03978000 AUTO
-S 4100000 V 06111000 AUTO
-S 3965000 V 02540000 AUTO
-S 3774000 H 06670000 AUTO
-S 3725000 V 26667000 AUTO
-S 3600000 V 25185000 AUTO
-S 3758000 V 26667000 AUTO
-S 3982000 V 17800000 AUTO
-S 4090000 V 02515000 AUTO
-S 4042000 H 08680000 AUTO
-S 4009000 V 06666000 AUTO
-S 4003000 H 06666000 AUTO
-S 3648000 H 02000000 AUTO
-S 3664000 V 02170000 AUTO
-S 3644000 H 02534000 AUTO
-S 3695000 H 02963000 AUTO
-S 4082000 H 06666000 AUTO
-S 4143000 V 04800000 AUTO
-S 3641000 V 02666000 AUTO
-S 3991000 H 03578000 AUTO
-S 4000000 H 02450000 AUTO
-S 4009000 H 02450000 AUTO
-S 3960000 V 03170000 AUTO
-S 3755000 H 20000000 AUTO
-S 4135000 V 02000000 AUTO
-S 4005000 H 02450000 AUTO
-S 4003000 H 02450000 AUTO
-S 3600000 H 29185000 AUTO
-S 3868000 V 02100000 AUTO
-S 3685000 H 06500000 AUTO
-S 3688000 V 06666000 AUTO
-S 3679000 V 02220000 AUTO
-S 3961000 H 01481000 AUTO
-S 4130000 V 02000000 AUTO
-S 3923000 H 27500000 AUTO
-S 4052000 V 02459000 AUTO
-S 4071000 V 03333000 AUTO
-S 4146000 H 02571000 AUTO
-S 3646000 V 03978000 AUTO
-S 3837000 H 19510000 AUTO
-S 4132000 H 02480000 AUTO
-S 3653000 V 05924000 AUTO
-S 4055000 H 07233000 AUTO
-S 3938000 V 04785000 AUTO
-S 4152000 V 03280000 AUTO
-S 3832000 V 13310000 AUTO
-S 4090000 H 06620000 AUTO
-S 4082000 V 06510000 AUTO
-S 4107000 V 02100000 AUTO
-S 3500000 H 06666000 AUTO
-S 4126000 V 02531000 AUTO
-S 3860000 V 02713000 AUTO
-S 3983000 H 02222000 AUTO
-S 4065000 H 08400000 AUTO
-S 4063000 V 08500000 AUTO
-S 3972000 H 03330000 AUTO
-S 4024000 H 16030000 AUTO
-S 3803000 V 26860000 AUTO
-S 3920000 V 20000000 AUTO
-S 4053000 V 06666000 AUTO
-S 3676000 V 03000000 AUTO
-S 3637000 H 02963000 AUTO
-S 3516000 V 05632000 AUTO
-S 3516000 H 05632000 AUTO
-S 4093000 V 02887000 AUTO
-S 4177000 H 04391000 AUTO
-S 4124000 H 03480000 AUTO
-S 4139000 V 02220000 AUTO
-S 3693000 V 04441000 AUTO
-S 4194000 H 06660000 AUTO
-S 3803000 H 27500000 AUTO
-S 4112000 V 02000000 AUTO
-S 3676000 H 05900000 AUTO
-S 3652000 H 04000000 AUTO
-S 3725000 H 26669000 AUTO
-S 3898000 V 04195000 AUTO
-S 4162000 H 07200000 AUTO
-S 4168000 H 02400000 AUTO
-S 3965000 H 03332000 AUTO
-S 4100000 H 06654000 AUTO
-S 4127000 H 03000000 AUTO
-S 4109000 H 06654000 AUTO
-S 3670000 H 02960000 AUTO
-S 3853000 H 05900000 AUTO
-S 3660000 V 02540000 AUTO
-S 4170000 H 02222000 AUTO
-S 3630000 H 05632000 AUTO
-S 3695000 V 02220000 AUTO
-S 4184000 H 06142000 AUTO
-S 4122000 V 01860000 AUTO
-S 4022000 V 03800000 AUTO
-S 4137000 H 04400000 AUTO
-S 3878000 V 22117000 AUTO
-S 4132000 V 02800000 AUTO
-S 4043000 V 07440000 AUTO
-S 4142000 H 02222000 AUTO
-S 3990000 V 04195000 AUTO
-S 3667000 V 03340000 AUTO
-S 3673000 V 03000000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11921000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 35000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3660000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4350000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3986000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3179000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3859000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4120000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2960000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4016000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5712000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3978000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3978000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4100000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3965000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3774000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6670000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3725000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3600000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 25185000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3758000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3982000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 17800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4090000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2515000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4042000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8680000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4009000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4003000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3648000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3664000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3644000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2534000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3695000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4082000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4143000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3641000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3991000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3578000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4000000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2450000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4009000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2450000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3960000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3755000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4135000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4005000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2450000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4003000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2450000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3600000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29185000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3868000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2100000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3685000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3688000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3679000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2220000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3961000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1481000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4130000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3923000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4052000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2459000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4071000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4146000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2571000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3646000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3978000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3837000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19510000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4132000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2480000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3653000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5924000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4055000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7233000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3938000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4785000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4152000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3280000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3832000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13310000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4090000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4082000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6510000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4107000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2100000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3500000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4126000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2531000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3860000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2713000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3983000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4065000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4063000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3972000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3330000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4024000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 16030000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3803000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26860000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3920000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4053000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3676000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3637000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3516000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3516000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4093000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2887000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4177000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4391000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4124000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3480000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4139000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2220000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3693000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4441000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4194000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6660000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3803000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4112000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3676000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5900000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3652000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3725000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26669000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3898000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4195000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4162000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4168000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3965000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3332000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4100000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6654000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4127000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4109000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6654000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3670000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2960000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3853000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5900000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3660000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2540000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4170000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3630000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3695000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2220000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4184000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6142000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4122000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1860000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4022000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4137000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3878000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22117000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4132000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2800000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4043000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7440000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4142000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3990000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4195000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3667000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3673000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Nahuel-1-71.8W b/dvb-s/Nahuel-1-71.8W
index 82845bb..66c3702 100644
--- a/dvb-s/Nahuel-1-71.8W
+++ b/dvb-s/Nahuel-1-71.8W
@@ -1,11 +1,67 @@
# Nahuel 1 @ 71.8W
# freq pol sr fec
-S 11673000 V 04000000 AUTO
-S 11680000 V 03335000 AUTO
-S 11654000 V 04170000 AUTO
-S 11874000 V 04000000 AUTO
-S 12136000 V 02960000 AUTO
-S 11873000 H 08000000 AUTO
-S 12116000 H 14396000 AUTO
-S 11997000 V 08500000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11673000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11680000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3335000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11654000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11874000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12136000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2960000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11873000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12116000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 14396000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11997000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Nilesat101+102-7.0W b/dvb-s/Nilesat101+102-7.0W
index 8ef176f..4a6bb30 100644
--- a/dvb-s/Nilesat101+102-7.0W
+++ b/dvb-s/Nilesat101+102-7.0W
@@ -1,41 +1,314 @@
# Nilesat 101/102 & Atlantic Bird @ 7W
# freq pol sr fec
-S 10719000 V 27500000 3/4
-S 10723000 H 27500000 3/4
-S 10758000 V 27500000 3/4
-S 10775000 H 27500000 3/4
-S 10796000 V 27500000 3/4
-S 10892000 H 27500000 3/4
-S 10911000 V 27500000 3/4
-S 10930000 H 27500000 3/4
-S 11317000 V 27500000 3/4
-S 11747000 V 27500000 3/4
-S 11766000 H 27500000 3/4
-S 11785000 V 27500000 3/4
-S 11804000 H 27500000 3/4
-S 11823000 V 27500000 3/4
-S 11843000 H 27500000 3/4
-S 11862000 V 27500000 3/4
-S 11881000 H 27500000 3/4
-S 11900000 V 27500000 3/4
-S 11919000 H 27500000 3/4
-S 11938000 V 27500000 3/4
-S 11958000 H 27500000 3/4
-S 11977000 V 27600000 5/6
-S 11996000 H 27500000 3/4
-S 12015000 V 27500000 3/4
-S 12034000 H 27500000 3/4
-S 12054000 V 27500000 3/4
-S 12073000 H 27500000 3/4
-S 12130000 V 27500000 3/4
-S 12149000 H 27500000 3/4
-S 12207000 V 27500000 3/4
-S 12226000 H 27500000 3/4
-S 12284000 V 27500000 3/4
-S 12303000 H 27500000 3/4
-S 12341000 V 27500000 3/4
-S 12360000 H 27500000 3/4
-S 12380000 V 27500000 3/4
-S 12399000 H 27500000 3/4
-S 12418000 V 27500000 3/4
-S 12476000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10719000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10723000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10758000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10775000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10796000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10892000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10911000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10930000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11317000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11747000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11766000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11785000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11804000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11823000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11843000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11862000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11881000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11900000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11919000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11938000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11958000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11977000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27600000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11996000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12015000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12034000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12054000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12073000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12130000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12149000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12207000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12226000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12284000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12303000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12341000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12360000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12380000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12399000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12418000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12476000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/OptusC1-156E b/dvb-s/OptusC1-156E
index 0e3e73b..c3eddb3 100644
--- a/dvb-s/OptusC1-156E
+++ b/dvb-s/OptusC1-156E
@@ -1,20 +1,146 @@
# Optus C1 satellite 156E
# freq pol sr fec
-S 12278000 H 30000000 2/3
-S 12305000 H 30000000 2/3
-S 12358000 H 27000000 2/3
-S 12398000 H 27800000 3/4
-S 12407000 V 30000000 2/3
-S 12438000 H 27800000 3/4
-S 12487000 V 27800000 3/4
-S 12501000 H 29473000 3/4
-S 12518000 H 27800000 3/4
-S 12527000 V 30000000 3/4
-S 12558000 H 27800000 3/4
-S 12564000 H 29473000 3/4
-S 12567000 V 27800000 2/3
-S 12598000 H 27800000 3/4
-S 12607000 V 29473000 3/4
-S 12638000 H 27800000 3/4
-S 12689000 H 27800000 3/4
-S 12720000 V 30000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12278000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12305000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12358000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27000000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12398000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12407000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12438000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12487000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12501000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29473000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12518000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12527000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12558000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12564000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 29473000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12567000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27800000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12598000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12607000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29473000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12638000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12689000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12720000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/OptusD1-160.0E b/dvb-s/OptusD1-160.0E
index b13437d..fef901a 100644
--- a/dvb-s/OptusD1-160.0E
+++ b/dvb-s/OptusD1-160.0E
@@ -1,4 +1,18 @@
# Optus D1 satellite 160.0E
# freq pol sr fec
-S 12456000 H 22500000 3/4
-S 12483000 H 22500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12456000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12483000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/PAS-43.0W b/dvb-s/PAS-43.0W
index fab84c5..db5bf93 100644
--- a/dvb-s/PAS-43.0W
+++ b/dvb-s/PAS-43.0W
@@ -1,6 +1,34 @@
# PAS 6/6B/3R at 43.0W
# freq pol sr fec
-S 12578000 H 19850000 3/4
-S 12584000 V 27500000 3/4
-S 12606000 H 6616000 3/4
-S 12665000 H 19850000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12578000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19850000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12584000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12606000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6616000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12665000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19850000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
diff --git a/dvb-s/PalapaC2_C-113.0E b/dvb-s/PalapaC2_C-113.0E
index d9b0fc8..f00e4c9 100644
--- a/dvb-s/PalapaC2_C-113.0E
+++ b/dvb-s/PalapaC2_C-113.0E
@@ -6,34 +6,111 @@
# freq pol sr fec
# SCTV Jawa Timur
-S 3745000 H 3125000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3745000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3125000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# SCTV
-S 3758000 H 4470000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3758000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4470000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TVRI Nasional
-S 3765000 H 5555000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3765000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5555000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RCTI
-S 3774000 H 6520000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3774000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6520000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# KBS World Indonesia
-S 3836000 V 2097000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3836000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2097000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Bali TV
-S 3926000 H 4208000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3926000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4208000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV One Indonesia
-S 4054000 H 5632000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4054000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# ANTV Indonesia
-S 4055000 V 6510000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4055000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6510000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Indosiar
-S 4074000 V 6500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4074000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Satelindo Multiplex
-S 4080000 H 28125000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4080000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28125000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TPI Indonesia
-S 4184000 V 6700000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4184000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6700000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/SBS6-74w b/dvb-s/SBS6-74w
index f99e311..f6ca6c7 100644
--- a/dvb-s/SBS6-74w
+++ b/dvb-s/SBS6-74w
@@ -1,4 +1,11 @@
# SBS 6 @ 74W
# freq pol sr fec
-S 11744000 H 06616000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11744000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6616000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/SES2-87.0W b/dvb-s/SES2-87.0W
index a081c57..9fa21ab 100644
--- a/dvb-s/SES2-87.0W
+++ b/dvb-s/SES2-87.0W
@@ -1,10 +1,59 @@
# AMC 3 @ 87.0W
# freq pol sr fec
-S 11716000 H 04859000 AUTO
-S 12142000 V 30000000 AUTO
-S 12147000 H 04340000 AUTO
-S 12159000 H 04444000 AUTO
-S 12165000 H 04444000 AUTO
-S 12172000 H 04444000 AUTO
-S 12182000 V 30000000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11716000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4859000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12142000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12147000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12159000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12165000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12172000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12182000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/ST1_C-80.0E b/dvb-s/ST1_C-80.0E
index 92d5b80..d60a39e 100644
--- a/dvb-s/ST1_C-80.0E
+++ b/dvb-s/ST1_C-80.0E
@@ -6,22 +6,71 @@
# freq pol sr fec
# GTV Multiplex
-S 3469000 V 30000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3469000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# ABTV Multiplex
-S 3521000 H 8332000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3521000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8332000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# Videoland Multiplex
-S 3550000 V 30000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3550000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# GTV Multiplex
-S 3595000 H 30000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3595000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Videoland multiplex
-S 3632000 V 30000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3632000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Chungwa Telecom
-S 3671000 H 9256000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3671000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 9256000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# NTD TV Asia-Pacific
-S 3689000 H 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3689000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Satmex-5-116.8W b/dvb-s/Satmex-5-116.8W
index f0522bf..96c804d 100644
--- a/dvb-s/Satmex-5-116.8W
+++ b/dvb-s/Satmex-5-116.8W
@@ -1,72 +1,555 @@
# Satmex 5 @ 116.8W
# freq pol sr fec
-S 12034000 H 02532000 AUTO
-S 12175000 H 04232000 AUTO
-S 4060000 H 19510000 AUTO
-S 3905000 V 02963000 AUTO
-S 4084000 H 03162000 AUTO
-S 3767000 H 01620000 AUTO
-S 11975000 H 05000000 AUTO
-S 11960000 H 02000000 AUTO
-S 4180000 H 19510000 AUTO
-S 4115000 H 03253000 AUTO
-S 3840000 V 29270000 AUTO
-S 4160000 V 29270000 AUTO
-S 3940000 H 28125000 AUTO
-S 4052000 V 04307000 AUTO
-S 12024000 H 03000000 AUTO
-S 4134000 H 03617000 AUTO
-S 12028000 H 03255000 AUTO
-S 12060000 V 03078000 AUTO
-S 4012000 V 03131000 AUTO
-S 3949000 V 03255000 AUTO
-S 4076000 H 02962000 AUTO
-S 3749000 H 04070000 AUTO
-S 3744000 H 04480000 AUTO
-S 3755000 H 04000000 AUTO
-S 3869000 H 03000000 AUTO
-S 3876000 H 02170000 AUTO
-S 3879000 H 01984000 AUTO
-S 3957000 V 02600000 AUTO
-S 3975000 V 03131000 AUTO
-S 3982000 H 02531000 AUTO
-S 3832000 H 02500000 AUTO
-S 3953000 V 02597000 AUTO
-S 3987000 V 08860000 AUTO
-S 3996000 V 02170000 AUTO
-S 3748000 V 02100000 AUTO
-S 3932000 V 02500000 AUTO
-S 3914000 V 03223000 AUTO
-S 3888000 H 05351000 AUTO
-S 3805000 V 04679000 AUTO
-S 4001000 V 04100000 AUTO
-S 4023000 H 06400000 AUTO
-S 12176000 H 03985000 AUTO
-S 4108000 H 02666000 AUTO
-S 4038000 V 07675000 AUTO
-S 3809000 V 03100000 AUTO
-S 4080000 V 29270000 AUTO
-S 3910000 H 02500000 AUTO
-S 4164000 H 01733000 AUTO
-S 12193000 V 07885000 AUTO
-S 12164000 V 02000000 AUTO
-S 12044000 V 04340000 AUTO
-S 3720000 V 27000000 AUTO
-S 3922000 V 09760000 AUTO
-S 3797000 V 03200000 AUTO
-S 3968000 V 07500000 AUTO
-S 4037000 H 02222000 AUTO
-S 4046000 H 02441000 AUTO
-S 4080000 H 02441000 AUTO
-S 3773000 V 02892000 AUTO
-S 3767000 V 02893000 AUTO
-S 3935000 V 04440000 AUTO
-S 3972000 H 03364000 AUTO
-S 3905000 H 02400000 AUTO
-S 4007000 V 05582000 AUTO
-S 3885000 H 03000000 AUTO
-S 3826000 H 02712000 AUTO
-S 3944000 V 03410000 AUTO
-S 3915000 H 01520000 AUTO
-S 3876000 V 02920000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12034000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2532000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12175000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4232000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4060000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19510000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3905000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4084000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3162000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3767000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1620000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11975000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11960000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4180000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19510000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4115000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3253000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3840000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29270000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4160000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29270000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3940000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28125000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4052000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4307000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12024000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4134000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3617000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12028000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12060000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3078000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4012000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3131000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3949000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4076000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2962000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3749000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4070000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3744000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4480000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3755000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3869000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3876000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3879000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1984000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3957000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2600000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3975000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3131000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3982000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2531000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3832000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3953000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2597000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3987000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8860000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3996000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3748000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2100000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3932000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3914000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3223000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3888000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5351000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3805000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4679000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4001000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4100000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4023000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12176000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3985000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4108000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2666000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4038000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7675000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3809000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3100000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4080000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 29270000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3910000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4164000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1733000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12193000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7885000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12164000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12044000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3720000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3922000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 9760000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3797000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3968000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4037000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4046000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2441000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4080000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2441000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3773000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2892000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3767000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2893000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3935000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4440000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3972000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3364000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3905000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2400000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4007000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5582000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3885000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3826000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2712000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3944000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3410000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3915000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1520000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3876000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2920000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Satmex-6-113.0W b/dvb-s/Satmex-6-113.0W
index 8ff01b8..19a8f30 100644
--- a/dvb-s/Satmex-6-113.0W
+++ b/dvb-s/Satmex-6-113.0W
@@ -1,19 +1,131 @@
# Satmex 6 @ 113.0W
# freq pol sr fec
-S 4078000 H 03609000 AUTO
-S 4080000 V 03255000 AUTO
-S 12145000 V 03255000 AUTO
-S 4085000 V 02821000 AUTO
-S 12126000 V 06022000 AUTO
-S 12166000 H 17500000 AUTO
-S 4075000 V 03782000 AUTO
-S 4091000 V 03720000 AUTO
-S 3985000 V 02300000 AUTO
-S 12126000 H 02170000 AUTO
-S 12157000 V 03038000 AUTO
-S 12091000 V 03337000 AUTO
-S 3947000 V 03700000 AUTO
-S 3761000 V 02120000 AUTO
-S 12107000 V 02222000 AUTO
-S 12080000 H 25635000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4078000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3609000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4080000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12145000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4085000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2821000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12126000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6022000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12166000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 17500000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4075000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3782000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4091000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3720000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3985000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2300000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12126000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12157000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3038000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12091000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3337000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3947000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3700000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3761000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2120000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12107000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12080000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 25635000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-s/Sirius-5.0E b/dvb-s/Sirius-5.0E
index 949d0e2..e5d47b7 100644
--- a/dvb-s/Sirius-5.0E
+++ b/dvb-s/Sirius-5.0E
@@ -1,62 +1,482 @@
# Sirius 5.0E
# freq pol sr fec
-S 11215000 V 6666000 1/2
-S 11227000 H 23145000 3/4
-S 11247000 V 23145000 3/4
-S 11420000 H 23145000 3/4
-S 11727000 H 27500000 5/6
-S 11747000 V 27500000 3/4
-S 11766000 H 27500000 3/4
-S 11785000 V 27500000 3/4
-S 11804000 H 27500000 3/4
-S 11823000 V 27500000 3/4
-S 11843000 H 27500000 3/4
-S 11862000 V 27500000 3/4
-S 11881000 H 27500000 3/4
-S 11900000 V 27500000 3/4
-S 11919000 H 27500000 3/4
-S 11938000 V 27500000 3/4
-S 11958000 H 27500000 3/4
-S 11977000 V 27500000 3/4
-S 11996000 H 27500000 3/4
-S 12015000 V 27500000 5/6
-S 12034000 H 27500000 3/4
-S 12054000 V 27500000 3/4
-S 12073000 H 27500000 3/4
-S 12092000 V 27500000 3/4
-S 12111000 H 27500000 5/6
-S 12130000 V 27500000 3/4
-S 12149000 H 27500000 3/4
-S 12169000 V 27500000 3/4
-S 12188000 H 27500000 7/8
-S 12207000 V 27500000 3/4
-S 12226000 H 25540000 7/8
-S 12245000 V 27500000 3/4
-S 12265000 H 27500000 3/4
-S 12284000 V 27500000 3/4
-S 12303000 H 25547000 7/8
-S 12322000 V 27500000 3/4
-S 12341000 H 27500000 3/4
-S 12360000 V 27500000 7/8
-S 12379000 H 27500000 3/4
-S 12399000 V 27500000 2/3
-S 12418000 H 27500000 3/4
-S 12437000 V 27500000 2/3
-S 12456000 H 27500000 3/4
-S 12476000 V 27500000 3/4
-S 12608000 H 27500000 3/4
-S 12637000 H 14465000 3/4
-S 12668000 V 6666000 1/2
-S 12672000 H 3300000 3/4
-S 12674000 V 10000000 3/4
-S 12678000 V 13333000 5/6
-S 12680000 H 9404000 3/4
-S 12685000 V 4444000 3/4
-S 12690000 H 3330000 3/4
-S 12693000 V 3333000 5/6
-S 12701000 H 6111000 3/4
-S 12715000 H 3330000 3/4
-S 12718000 V 23500000 3/4
-S 12724000 H 1772000 3/4
-S 12728000 V 19720000 3/4
-S 12737000 V 6150000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11215000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11227000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 23145000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11247000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 23145000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11420000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 23145000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11727000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11747000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11766000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11785000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11804000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11823000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11843000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11862000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11881000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11900000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11919000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11938000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11958000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11977000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11996000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12015000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12034000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12054000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12073000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12092000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12111000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12130000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12149000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12169000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12188000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12207000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12226000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 25540000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12245000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12265000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12284000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12303000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 25547000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12322000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12341000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12360000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12379000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12399000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12418000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12437000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12456000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12476000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12608000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12637000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 14465000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12668000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12672000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3300000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12674000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 10000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12678000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 13333000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12680000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 9404000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12685000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12690000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3330000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12693000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12701000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6111000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12715000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3330000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12718000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 23500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12724000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1772000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12728000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 19720000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12737000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6150000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Telecom2-8.0W b/dvb-s/Telecom2-8.0W
index 5f48631..637871d 100644
--- a/dvb-s/Telecom2-8.0W
+++ b/dvb-s/Telecom2-8.0W
@@ -1,17 +1,122 @@
# Telecom2 8.0W
# freq pol sr fec
-S 10972000 V 27500000 3/4
-S 10974000 H 27500000 3/4
-S 11010000 H 27500000 3/4
-S 11011000 V 27500000 3/4
-S 11042000 H 7860000 3/4
-S 11053000 H 2850000 3/4
-S 11064000 H 12667000 3/4
-S 11387000 H 24740000 5/6
-S 11428000 H 27500000 3/4
-S 11500000 H 3460000 AUTO
-S 11554000 V 27500000 3/4
-S 11595000 V 27500000 3/4
-S 12545000 H 3038000 3/4
-S 12566000 V 27500000 3/4
-S 12649000 V 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10972000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10974000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11010000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11011000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11042000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7860000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11053000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2850000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11064000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 12667000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11387000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24740000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11428000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11500000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3460000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11554000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11595000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12545000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3038000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12566000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12649000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Telkom1_C-108.0E b/dvb-s/Telkom1_C-108.0E
index f60c246..194b5e5 100644
--- a/dvb-s/Telkom1_C-108.0E
+++ b/dvb-s/Telkom1_C-108.0E
@@ -6,43 +6,141 @@
# freq pol sr fec
# Telkom Vision Multiplex
-S 3580000 H 28000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3580000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Telkom Vision Multiplex
-S 3620000 H 28000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3620000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Telkom Vision Multiplex
-S 3640000 V 28000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3640000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV Timor Leste
-S 3776000 H 4285000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3776000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV Edukasi 1
-S 3785000 H 4000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3785000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TVRI Kalbar
-S 3793000 H 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3793000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TVRI Papua
-S 3797000 H 3900000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3797000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3900000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV Edukasi 2
-S 3807000 H 4000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3807000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Trans 7
-S 3990000 H 6000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3990000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TVRI Aceh
-S 4015000 H 6000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RCTI Jawa Timur
-S 4025000 H 3000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4025000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Trans TV
-S 4084000 H 6000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4084000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Papua TV
-S 4092000 H 3570000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4092000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3570000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# JTV
-S 4097000 H 3125000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4097000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3125000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Telstar10_C-76.5E b/dvb-s/Telstar10_C-76.5E
index 36b0431..3ea634b 100644
--- a/dvb-s/Telstar10_C-76.5E
+++ b/dvb-s/Telstar10_C-76.5E
@@ -6,58 +6,191 @@
# freq pol sr fec
# Racing International
-S 3646000 H 5064000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3646000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5064000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Image Channel
-S 3655000 H 3214000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3655000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3214000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Globe Cast Asia multiplex
-S 3680000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3680000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# UBI World TV Multiplex
-S 3760000 H 28066000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3760000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28066000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# UBI World TV Multiplex
-S 3780000 V 28066000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3780000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28066000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Ekushey TV
-S 3787000 H 4600000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3787000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4600000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Diganta TV
-S 3793000 H 4340000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3793000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RRSat Global Network Multiplex
-S 3840000 H 27500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3840000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Channel 1
-S 4003000 H 4080000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4003000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4080000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Boishakhi TV
-S 4009000 H 4300000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4009000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4300000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV Maldives
-S 4030000 V 6312000 1/2
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4030000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6312000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
# Channel I
-S 4034000 H 4300000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4034000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4300000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Bangla Vision
-S 4049000 H 3600000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4049000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3600000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Kantipur TV
-S 4056000 H 3214000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4056000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3214000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# BBC World Service Multiplex
-S 4073000 H 13020000 1/2
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4073000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13020000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
# MNC Indonesia
-S 4105000 H 3125000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4105000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3125000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# NDTV Arabia
-S 4137000 H 2893000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4137000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2893000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Islamic TV
-S 4146000 H 3600000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4146000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3600000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Bangladesh Multiplex
-S 4173000 H 7400000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4173000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7400000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Telstar12-15.0W b/dvb-s/Telstar12-15.0W
index db14a6e..9dd367a 100644
--- a/dvb-s/Telstar12-15.0W
+++ b/dvb-s/Telstar12-15.0W
@@ -1,26 +1,194 @@
# Telstar 12 15.0W
# freq pol sr fec
-S 10988000 H 2893000 3/4
-S 10992000 H 2893000 3/4
-S 11060000 H 19279000 3/4
-S 11123000 V 19279000 3/4
-S 11124000 H 18386000 3/4
-S 11150000 H 18386000 3/4
-S 11150000 V 19279000 3/4
-S 11531000 H 3198000 7/8
-S 11566000 H 4284000 3/4
-S 11677000 V 2200000 1/2
-S 11709000 V 3195000 AUTO
-S 11806000 V 7596000 3/4
-S 11963000 H 14714000 3/4
-S 12082000 H 3935000 3/4
-S 12117000 H 4772000 AUTO
-S 12159000 H 7777000 2/3
-S 12166000 H 3503000 3/4
-S 12173000 H 3503000 3/4
-S 12524000 V 26470000 3/4
-S 12547000 H 11900000 2/3
-S 12589000 V 4503000 1/2
-S 12608000 H 19279000 2/3
-S 12615000 V 11939000 2/3
-S 12645000 H 3255000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10988000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2893000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10992000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2893000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11060000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19279000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11123000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 19279000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11124000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 18386000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11150000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 18386000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11150000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 19279000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11531000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3198000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11566000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4284000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11677000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2200000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11709000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3195000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11806000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 7596000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11963000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 14714000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12082000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3935000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12117000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4772000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12159000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7777000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12166000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3503000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12173000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3503000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12524000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26470000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12547000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 11900000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12589000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4503000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12608000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 19279000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12615000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 11939000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12645000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Telstar18_C-138.0E b/dvb-s/Telstar18_C-138.0E
index 6bd70c6..a8ae308 100644
--- a/dvb-s/Telstar18_C-138.0E
+++ b/dvb-s/Telstar18_C-138.0E
@@ -6,13 +6,41 @@
# freq pol sr fec
# I-Sky-Net Multiplex
-S 3599000 V 30000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3599000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# I-Sky-Net Multiplex
-S 3660000 V 30000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3660000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# LNTV Laos
-S 3704000 V 3034000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3704000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3034000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# BBC World Service Multiplex
-S 4124000 V 3255000 1/2
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4124000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
diff --git a/dvb-s/Thaicom1A_C-120.0E b/dvb-s/Thaicom1A_C-120.0E
index 1a9d11f..a9bcb17 100644
--- a/dvb-s/Thaicom1A_C-120.0E
+++ b/dvb-s/Thaicom1A_C-120.0E
@@ -6,19 +6,61 @@
# freq pol sr fec
# TV3 Cambodia
-S 3725000 V 3255000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3725000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3255000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Panyapiwat
-S 3745000 V 2850000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3745000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2850000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# CTN Cambodia Multiplex
-S 3854000 V 9628000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3854000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 9628000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Kasikorn TV
-S 3881000 V 2000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3881000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Bayon TV
-S 3916000 V 3359000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3916000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3359000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Radio Thailand Multiplex
-S 4135000 V 1808000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4135000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1808000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Thaicom2_C-78.5E b/dvb-s/Thaicom2_C-78.5E
index 4e1fbcd..342e70b 100644
--- a/dvb-s/Thaicom2_C-78.5E
+++ b/dvb-s/Thaicom2_C-78.5E
@@ -6,28 +6,91 @@
# freq pol sr fec
# BBTV Channel 7
-S 3764000 H 5900000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3764000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5900000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# SBT TV
-S 3803000 H 1445000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3803000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1445000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# MCOT Multiplex
-S 3888000 H 15625000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3888000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 15625000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Royal Thai Army TV 5
-S 3905000 H 6250000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3905000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6250000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Thai TV Color Channel 3
-S 3967000 H 4551000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3967000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4551000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RU TV 1
-S 4003000 H 1085000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4003000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 1085000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Ten TV & Rich Channel
-S 4016000 H 2305000 7/8
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4016000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2305000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
# NBT TV
-S 4106000 H 4688000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4106000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4688000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Thai PBS
-S 4145000 H 4815000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4145000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4815000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Thaicom5_C-78.5E b/dvb-s/Thaicom5_C-78.5E
index 902ddac..2171a97 100644
--- a/dvb-s/Thaicom5_C-78.5E
+++ b/dvb-s/Thaicom5_C-78.5E
@@ -6,64 +6,211 @@
# freq pol sr fec
# ETC India Multiplex
-S 3421000 V 6667000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3421000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6667000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Europe Media Port Multiplex
-S 3431000 H 13333000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3431000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Nepal TV Multiplex
-S 3432000 V 6667000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3432000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6667000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# CTV9
-S 3448000 V 2222000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3448000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RRSat Global Network (MPEG-4 S/2)
-S 3450000 H 13333000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3450000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Avenues TV
-S 3454000 V 3333000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3454000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# PSI Channel
-S 3460000 V 1538000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3460000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1538000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Sagarmatha TV
-S 3489000 V 3333000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3489000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Dhi TV
-S 3502000 V 4444000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3502000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Korean Central TV
-S 3504000 H 3367000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3504000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3367000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Gang Cartoon Channel
-S 3505000 V 1852000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3505000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 1852000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Lao Star Channel
-S 3521000 V 2917000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3521000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2917000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Thaicom Multiplex
-S 3545000 V 30000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3545000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
# RRSat Global Network
-S 3551000 H 13333000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3551000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 13333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# VTV Maldives
-S 3562000 H 4444000 1/2
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3562000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = 1/2
+ INVERSION = AUTO
+
# MRTV Multiplex
-S 3574000 H 7492000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3574000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7492000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
# Thaicom Multiplex
-S 3585000 V 26667000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3585000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Thaicom Multiplex
-S 3600000 H 26667000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3600000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 26667000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# MRTV Multiplex
-S 3617000 V 12500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3617000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 12500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# RRSat Global Network Multiplex
-S 3640000 H 28066000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3640000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28066000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TVK Cambodia
-S 3664000 H 3704000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3664000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3704000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Thor-1.0W b/dvb-s/Thor-1.0W
index b271e36..0b46265 100644
--- a/dvb-s/Thor-1.0W
+++ b/dvb-s/Thor-1.0W
@@ -1,65 +1,506 @@
# Thor 1.0W
# freq pol sr fec
-S 10747000 H 25000000 3/4
-S 10778000 V 25000000 3/4
-S 10778000 H 24500000 7/8
-S 10809000 V 24500000 7/8
-S 10809000 H 24500000 7/8
-S 10841000 V 24500000 7/8
-S 10841000 H 24500000 7/8
-S 10872000 V 24500000 7/8
-S 10872000 H 24500000 7/8
-S 10903000 V 25000000 3/4
-S 10903000 H 25000000 3/4
-S 10934000 V 24500000 7/8
-S 10934000 H 25000000 3/4
-S 11216000 V 24500000 7/8
-S 11229000 H 24500000 7/8
-S 11247000 V 24500000 7/8
-S 11261000 H 24500000 7/8
-S 11278000 V 24500000 7/8
-S 11293000 H 24500000 7/8
-S 11309000 V 24500000 7/8
-S 11325000 H 24500000 7/8
-S 11325000 V 24500000 7/8
-S 11325000 V 24500000 7/8
-S 11341000 V 24500000 7/8
-S 11357000 H 24500000 7/8
-S 11372000 V 24500000 7/8
-S 11389000 H 24500000 7/8
-S 11403000 V 24500000 7/8
-S 11421000 H 24500000 7/8
-S 11434000 V 24500000 7/8
-S 11727000 V 28000000 7/8
-S 11747000 H 28000000 5/6
-S 11766000 V 28000000 7/8
-S 11785000 H 30000000 3/4
-S 11804000 V 28000000 7/8
-S 11823000 H 28000000 7/8
-S 11843000 V 30000000 3/4
-S 11862000 H 28000000 7/8
-S 11881000 V 28000000 5/6
-S 11900000 H 28000000 5/6
-S 11919000 V 28000000 7/8
-S 11938000 H 25000000 3/4
-S 11958000 V 28000000 7/8
-S 11977000 H 28000000 7/8
-S 11996000 V 28000000 7/8
-S 12015000 H 30000000 3/4
-S 12034000 V 28000000 7/8
-S 12073000 V 28000000 7/8
-S 12092000 H 30000000 3/4
-S 12130000 H 30000000 3/4
-S 12149000 V 28000000 5/6
-S 12169000 H 28000000 7/8
-S 12188000 V 25000000 3/4
-S 12226000 V 28000000 3/4
-S 12245000 H 28000000 5/6
-S 12303000 V 28000000 5/6
-S 12322000 H 27800000 3/4
-S 12341000 V 28000000 7/8
-S 12380000 V 28000000 5/6
-S 12399000 H 28000000 7/8
-S 12418000 V 28000000 7/8
-S 12456000 V 28000000 3/4
-S 12476000 H 28000000 5/6
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10747000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 25000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10778000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 25000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10778000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10809000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10809000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10841000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10841000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10872000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10872000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10903000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 25000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10903000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 25000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10934000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10934000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 25000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11216000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11229000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11247000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11261000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11278000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11293000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11309000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11325000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11325000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11325000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11341000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11357000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11372000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11389000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11403000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11421000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11434000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24500000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11727000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11747000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11766000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11785000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11804000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11823000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11843000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11862000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11881000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11900000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11919000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11938000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 25000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11958000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11977000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11996000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12034000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12073000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12092000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12130000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12149000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12169000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12188000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 25000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12226000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12245000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12303000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12322000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 27800000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12341000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12380000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12399000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12418000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12456000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12476000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
diff --git a/dvb-s/Turksat-42.0E b/dvb-s/Turksat-42.0E
index a30d24f..c363aed 100644
--- a/dvb-s/Turksat-42.0E
+++ b/dvb-s/Turksat-42.0E
@@ -1,104 +1,818 @@
# Turksat 42.0E
# freq pol sr fec
-S 10968000 V 4557000 3/4
-S 10970000 H 30000000 5/6
-S 10999000 V 2222000 3/4
-S 11003000 V 2175000 3/4
-S 11007000 V 2950000 5/6
-S 11011000 V 2125000 5/6
-S 11014000 V 2050000 3/4
-S 11018000 V 2150000 3/4
-S 11028000 V 2400000 3/4
-S 11083000 V 8888000 3/4
-S 11136000 V 2170000 3/4
-S 11143000 V 2200000 3/4
-S 11159000 V 2596000 3/4
-S 11162000 V 2222000 5/6
-S 11166000 V 2960000 3/4
-S 11177000 V 2200000 3/4
-S 11554000 H 2916000 2/3
-S 11576000 H 2400000 5/6
-S 11581000 H 4444000 3/4
-S 11607000 H 3750000 2/3
-S 11712000 V 2963000 3/4
-S 11716000 V 2222000 3/4
-S 11729000 V 15555000 5/6
-S 11734000 H 3291000 3/4
-S 11739000 H 3125000 3/4
-S 11743000 H 2222000 3/4
-S 11743000 V 2222000 3/4
-S 11748000 H 4444000 5/6
-S 11753000 H 3000000 7/8
-S 11754000 V 3900000 5/6
-S 11758000 V 2962000 3/4
-S 11760000 H 5925000 3/4
-S 11762000 V 2155000 3/4
-S 11765000 V 2222000 3/4
-S 11770000 V 2177000 3/4
-S 11773000 V 2420000 5/6
-S 11775000 H 2222000 3/4
-S 11777000 V 3150000 5/6
-S 11781000 V 2815000 5/6
-S 11794000 H 5632000 3/4
-S 11800000 H 2400000 5/6
-S 11804000 V 24444000 5/6
-S 11830000 V 6666000 3/4
-S 11839000 V 4444000 3/4
-S 11846000 V 3333000 5/6
-S 11852000 V 4444000 5/6
-S 11858000 V 2400000 7/8
-S 11867000 V 4444000 5/6
-S 11874000 V 3400000 7/8
-S 11878000 V 3750000 5/6
-S 11882000 V 2965000 5/6
-S 11887000 V 3333000 7/8
-S 11892000 H 12800000 5/6
-S 11892000 V 2960000 5/6
-S 11896000 V 2222000 3/4
-S 11905000 H 6666000 3/4
-S 11912000 H 3333000 5/6
-S 11919000 V 24444000 3/4
-S 11951000 V 8800000 5/6
-S 11959000 V 2960000 3/4
-S 11963000 V 2300000 5/6
-S 11967000 V 4340000 3/4
-S 11970000 H 17900000 5/6
-S 11973000 V 2240000 5/6
-S 11984000 H 4000000 5/6
-S 11996000 V 26000000 5/6
-S 12002000 H 4800000 5/6
-S 12008000 H 4400000 5/6
-S 12015000 H 4800000 5/6
-S 12022000 H 5380000 5/6
-S 12028000 H 4557000 5/6
-S 12126000 V 6666000 5/6
-S 12127000 H 7400000 5/6
-S 12140000 H 2222000 3/4
-S 12140000 V 4444000 3/4
-S 12513000 H 4400000 3/4
-S 12518000 H 3125000 3/4
-S 12524000 H 4250000 5/6
-S 12530000 H 4444000 5/6
-S 12536000 H 2962000 3/4
-S 12540000 H 3125000 3/4
-S 12563000 H 24000000 7/8
-S 12590000 V 3000000 5/6
-S 12595000 V 2500000 5/6
-S 12605000 V 2961000 3/4
-S 12609000 V 3700000 5/6
-S 12614000 V 3333000 5/6
-S 12633000 V 4800000 5/6
-S 12636000 H 4800000 5/6
-S 12638000 V 2400000 5/6
-S 12647000 V 3333000 5/6
-S 12652000 H 22500000 5/6
-S 12652000 V 3900000 5/6
-S 12660000 V 9150000 5/6
-S 12672000 H 2222000 5/6
-S 12680000 H 8888000 3/4
-S 12692000 H 2800000 5/6
-S 12696000 H 2222000 3/4
-S 12699000 H 2400000 3/4
-S 12702000 H 2285000 7/8
-S 12717000 V 5925000 5/6
-S 12731000 V 3333000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10968000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4557000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10970000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 30000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10999000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11003000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2175000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11007000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2950000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11011000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2125000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11014000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2050000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11018000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2150000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11028000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2400000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11083000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8888000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11136000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11143000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2200000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11159000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2596000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11162000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11166000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2960000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11177000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2200000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11554000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2916000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11576000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2400000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11581000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11607000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3750000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11712000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2963000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11716000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11729000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 15555000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11734000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3291000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11739000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3125000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11743000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11743000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11748000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11753000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11754000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3900000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11758000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2962000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11760000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5925000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11762000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2155000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11765000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11770000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2177000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11773000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2420000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11775000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11777000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3150000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11781000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2815000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11794000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5632000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11800000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2400000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11804000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24444000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11830000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11839000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11846000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11852000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11858000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2400000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11867000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11874000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3400000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11878000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3750000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11882000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2965000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11887000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11892000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 12800000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11892000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2960000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11896000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11905000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11912000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11919000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 24444000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11951000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8800000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11959000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2960000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11963000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2300000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11967000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4340000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11970000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 17900000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11973000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2240000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11984000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11996000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12002000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4800000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12008000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12015000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4800000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12022000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 5380000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12028000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4557000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12126000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 6666000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12127000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 7400000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12140000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12140000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12513000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4400000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12518000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3125000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12524000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4250000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12530000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4444000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12536000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2962000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12540000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3125000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12563000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 24000000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12590000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3000000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12595000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12605000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2961000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12609000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3700000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12614000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12633000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4800000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12636000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4800000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12638000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2400000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12647000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12652000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 22500000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12652000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3900000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12660000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 9150000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12672000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12680000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 8888000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12692000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2800000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12696000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2222000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12699000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2400000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12702000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2285000
+ INNER_FEC = 7/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12717000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 5925000
+ INNER_FEC = 5/6
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 12731000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 3333000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
diff --git a/dvb-s/Vinasat1_C-132.0E b/dvb-s/Vinasat1_C-132.0E
index 4d611de..06f9acb 100644
--- a/dvb-s/Vinasat1_C-132.0E
+++ b/dvb-s/Vinasat1_C-132.0E
@@ -6,7 +6,21 @@
# freq pol sr fec
# VTV Multiplex (VTV 1, VTV 2, VTV 3, VTV 4, VTV6)
-S 3413000 V 9766000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3413000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 9766000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# VOV TV (Voice of VietNam)
-S 3529000 V 2500000 2/3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3529000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2500000
+ INNER_FEC = 2/3
+ INVERSION = AUTO
+
diff --git a/dvb-s/Yamal201-90.0E b/dvb-s/Yamal201-90.0E
index d0817c5..fd4b97e 100644
--- a/dvb-s/Yamal201-90.0E
+++ b/dvb-s/Yamal201-90.0E
@@ -1,11 +1,53 @@
# Yamal201 @ 90E
# freq pol sr fec
-S 10990000 V 2170000 AUTO
-S 10995000 V 4285000 AUTO
-S 11057000 V 26470000 AUTO
-S 11092000 V 26470000 AUTO
-S 11145000 V 22222000 AUTO
-S 11671000 V 18200000 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10990000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2170000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 10995000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11057000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26470000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11092000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 26470000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11145000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 22222000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 11671000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 18200000
+ INNER_FEC = AUTO
+ INVERSION = AUTO
+
# Yamal201 @ 90E C-BAND
# Generated by Roman Kashcheev
@@ -13,36 +55,155 @@ S 11671000 V 18200000 AUTO
# freq pol sr fec
# NauTV
-S 3536000 H 2532000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3536000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2532000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Turkmenistan
-S 3553000 H 20000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3553000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 20000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# CNL
-S 3577000 H 2626000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3577000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2626000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Nord TV
-S 3588000 H 4285000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3588000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Telekompanija OTV
-S 3600000 H 4285000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3600000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Oblastnoe Televidenie
-S 3603000 V 4285000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3603000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# CNL
-S 3605000 H 2626000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3605000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 2626000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Gascom
-S 3645000 H 28000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3645000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 28000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Spas
-S 3674000 H 17500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3674000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 17500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# TV Gubernia
-S 3725000 H 3200000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3725000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 3200000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Yuzhniy Region
-S 3900000 H 4285000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3900000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4285000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Rostov TV
-S 3907000 H 4265000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3907000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4265000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# ORTRK 12 Kanal
-S 3912000 H 4295000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3912000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 4295000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# O2
-S 3944000 H 15550000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3944000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 15550000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Klub Puteshestviy
-S 3980000 H 38000000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 3980000
+ POLARIZATION = HORIZONTAL
+ SYMBOL_RATE = 38000000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# Music Box
-S 4042000 V 8681000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4042000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 8681000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+
# NetService
-S 4084000 V 2500000 3/4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBS
+ FREQUENCY = 4084000
+ POLARIZATION = VERTICAL
+ SYMBOL_RATE = 2500000
+ INNER_FEC = 3/4
+ INVERSION = AUTO
+