aboutsummaryrefslogtreecommitdiffstats
path: root/dvb-t
diff options
context:
space:
mode:
Diffstat (limited to 'dvb-t')
-rw-r--r--dvb-t/ad-Andorra53
-rw-r--r--dvb-t/ar-Argentina63
-rw-r--r--dvb-t/at-All131
-rwxr-xr-x[-rw-r--r--]dvb-t/au-Adelaide85
-rw-r--r--dvb-t/au-AdelaideFoothills66
-rw-r--r--dvb-t/au-Ballarat66
-rw-r--r--dvb-t/au-Bendigo341
-rw-r--r--dvb-t/au-Brisbane79
-rw-r--r--dvb-t/au-Cairns66
-rw-r--r--dvb-t/au-Canberra-Black-Mt76
-rw-r--r--dvb-t/au-Coonabarabran55
-rw-r--r--dvb-t/au-Darwin66
-rw-r--r--dvb-t/au-Devonport92
-rw-r--r--dvb-t/au-FraserCoast-Bundaberg66
-rw-r--r--dvb-t/au-GoldCoast105
-rw-r--r--dvb-t/au-Goulburn-Rocky_Hill669
-rw-r--r--dvb-t/au-Hervey_Bay-Ghost_Hill79
-rw-r--r--dvb-t/au-Hobart66
-rw-r--r--dvb-t/au-Mackay66
-rw-r--r--dvb-t/au-Melbourne100
-rw-r--r--dvb-t/au-Melbourne-Selby65
-rw-r--r--dvb-t/au-Melbourne-Upwey66
-rw-r--r--dvb-t/au-MidNorthCoast131
-rw-r--r--dvb-t/au-Newcastle66
-rw-r--r--dvb-t/au-Perth66
-rw-r--r--dvb-t/au-Perth_Roleystone66
-rw-r--r--dvb-t/au-SpencerGulf40
-rw-r--r--dvb-t/au-SunshineCoast76
-rw-r--r--dvb-t/au-Sutherland53
-rw-r--r--dvb-t/au-Sydney82
-rw-r--r--dvb-t/au-Sydney_Kings_Cross66
-rw-r--r--dvb-t/au-Sydney_North_Shore16
-rw-r--r--dvb-t/au-Tamworth198
-rw-r--r--dvb-t/au-Townsville66
-rw-r--r--dvb-t/au-WaggaWagga66
-rw-r--r--dvb-t/au-Wollongong131
-rw-r--r--dvb-t/au-canberra66
-rw-r--r--dvb-t/au-unknown14
-rw-r--r--dvb-t/auto-Australia1301
-rw-r--r--dvb-t/auto-Default742
-rw-r--r--dvb-t/auto-Taiwan170
-rw-r--r--dvb-t/auto-With167kHzOffsets2016
-rw-r--r--dvb-t/ax-Smedsbole27
-rw-r--r--dvb-t/be-All66
-rw-r--r--dvb-t/bg-Sofia54
-rw-r--r--dvb-t/br-Brazil63
-rw-r--r--dvb-t/ca-AB-Calgary19
-rw-r--r--dvb-t/ch-All365
-rw-r--r--dvb-t/ch-Citycable341
-rw-r--r--dvb-t/ch-Geneva157
-rw-r--r--dvb-t/co-All34
-rw-r--r--dvb-t/cz-All521
-rw-r--r--dvb-t/de-Baden-Wuerttemberg209
-rw-r--r--dvb-t/de-Bayern284
-rw-r--r--dvb-t/de-Berlin118
-rw-r--r--dvb-t/de-Brandenburg53
-rw-r--r--dvb-t/de-Bremen79
-rw-r--r--dvb-t/de-Dusseldorf144
-rw-r--r--dvb-t/de-Hamburg105
-rw-r--r--dvb-t/de-Hessen209
-rw-r--r--dvb-t/de-Mecklenburg-Vorpommern118
-rw-r--r--dvb-t/de-Niedersachsen287
-rw-r--r--dvb-t/de-Nordrhein-Westfalen248
-rw-r--r--dvb-t/de-Rheinland-Pfalz105
-rw-r--r--dvb-t/de-Saarland53
-rw-r--r--dvb-t/de-Sachsen144
-rw-r--r--dvb-t/de-Sachsen-Anhalt131
-rw-r--r--dvb-t/de-Schleswig-Holstein196
-rw-r--r--dvb-t/de-Thueringen92
-rw-r--r--dvb-t/dk-All248
-rw-r--r--dvb-t/ee-All393
-rw-r--r--dvb-t/es-Albacete157
-rw-r--r--dvb-t/es-Alfabia157
-rw-r--r--dvb-t/es-Alicante92
-rw-r--r--dvb-t/es-Almeria108
-rw-r--r--dvb-t/es-Alpicat79
-rw-r--r--dvb-t/es-Asturias200
-rw-r--r--dvb-t/es-BaixoMinho79
-rw-r--r--dvb-t/es-Bilbao78
-rw-r--r--dvb-t/es-Cadiz302
-rw-r--r--dvb-t/es-Carceres118
-rw-r--r--dvb-t/es-Collserola131
-rw-r--r--dvb-t/es-Donostia131
-rw-r--r--dvb-t/es-Granada79
-rw-r--r--dvb-t/es-Huesca131
-rw-r--r--dvb-t/es-Las_Palmas157
-rw-r--r--dvb-t/es-Lugo81
-rw-r--r--dvb-t/es-Madrid144
-rw-r--r--dvb-t/es-Malaga80
-rw-r--r--dvb-t/es-Muros-Noia92
-rw-r--r--dvb-t/es-Mussara79
-rw-r--r--dvb-t/es-Pamplona92
-rw-r--r--dvb-t/es-Rocacorba6
-rw-r--r--dvb-t/es-SC_Tenerife157
-rw-r--r--dvb-t/es-Santander53
-rw-r--r--dvb-t/es-Santiago_de_Compostela92
-rw-r--r--dvb-t/es-Sevilla248
-rw-r--r--dvb-t/es-Tenerife157
-rw-r--r--dvb-t/es-Valencia104
-rw-r--r--dvb-t/es-Valladolid66
-rw-r--r--dvb-t/es-Vilamarxant27
-rw-r--r--dvb-t/es-Vitoria-Gasteiz78
-rw-r--r--dvb-t/es-Zaragoza65
-rw-r--r--dvb-t/fi-Aanekoski27
-rw-r--r--dvb-t/fi-Aanekoski_Konginkangas27
-rw-r--r--dvb-t/fi-Ahtari15
-rw-r--r--dvb-t/fi-Alajarvi27
-rw-r--r--dvb-t/fi-Anjalankoski_Ruotila33
-rw-r--r--dvb-t/fi-DNA-Espoo39
-rw-r--r--dvb-t/fi-DNA-Eurajoki39
-rw-r--r--dvb-t/fi-DNA-Hameenlinna39
-rw-r--r--dvb-t/fi-DNA-Hamina39
-rw-r--r--dvb-t/fi-DNA-Hausjarvi39
-rw-r--r--dvb-t/fi-DNA-Helsinki39
-rw-r--r--dvb-t/fi-DNA-Jokioinen39
-rw-r--r--dvb-t/fi-DNA-Jyvaskyla39
-rw-r--r--dvb-t/fi-DNA-Kaarina39
-rw-r--r--dvb-t/fi-DNA-Kajaani39
-rw-r--r--dvb-t/fi-DNA-Kangasala39
-rw-r--r--dvb-t/fi-DNA-Karkkila39
-rw-r--r--dvb-t/fi-DNA-Kiiminki39
-rw-r--r--dvb-t/fi-DNA-Kokkola39
-rw-r--r--dvb-t/fi-DNA-Kontiolahti39
-rw-r--r--dvb-t/fi-DNA-Kouvola39
-rw-r--r--dvb-t/fi-DNA-Kuopio39
-rw-r--r--dvb-t/fi-DNA-Lahti39
-rw-r--r--dvb-t/fi-DNA-Lappeenranta39
-rw-r--r--dvb-t/fi-DNA-Lohja39
-rw-r--r--dvb-t/fi-DNA-Loviisa39
-rw-r--r--dvb-t/fi-DNA-Mikkeli39
-rw-r--r--dvb-t/fi-DNA-Nousiainen39
-rw-r--r--dvb-t/fi-DNA-Nurmijarvi39
-rw-r--r--dvb-t/fi-DNA-Porvoo39
-rw-r--r--dvb-t/fi-DNA-Salo39
-rw-r--r--dvb-t/fi-DNA-Savonlinna39
-rw-r--r--dvb-t/fi-DNA-Seinajoki39
-rw-r--r--dvb-t/fi-DNA-Tyrnava39
-rw-r--r--dvb-t/fi-DNA-Ulvila39
-rw-r--r--dvb-t/fi-DNA-Vaasa39
-rw-r--r--dvb-t/fi-DNA-Valkeakoski39
-rw-r--r--dvb-t/fi-DNA-Vesilahti39
-rw-r--r--dvb-t/fi-DNA-Ylivieska39
-rw-r--r--dvb-t/fi-Enontekio_Ahovaara15
-rw-r--r--dvb-t/fi-Enontekio_Hetta15
-rw-r--r--dvb-t/fi-Enontekio_Kuttanen10
-rw-r--r--dvb-t/fi-Espoo33
-rw-r--r--dvb-t/fi-Eurajoki33
-rw-r--r--dvb-t/fi-Fiskars22
-rw-r--r--dvb-t/fi-Haapavesi27
-rw-r--r--dvb-t/fi-Hameenkyro_Kyroskoski27
-rw-r--r--dvb-t/fi-Hameenlinna_Painokangas21
-rw-r--r--dvb-t/fi-Hanko27
-rw-r--r--dvb-t/fi-Hartola21
-rw-r--r--dvb-t/fi-Heinavesi21
-rw-r--r--dvb-t/fi-Heinola27
-rw-r--r--dvb-t/fi-Hyrynsalmi21
-rw-r--r--dvb-t/fi-Hyrynsalmi_Kyparavaara21
-rw-r--r--dvb-t/fi-Hyrynsalmi_Paljakka21
-rw-r--r--dvb-t/fi-Hyvinkaa22
-rw-r--r--dvb-t/fi-Ii_Raiskio15
-rw-r--r--dvb-t/fi-Iisalmi15
-rw-r--r--dvb-t/fi-Ikaalinen27
-rw-r--r--dvb-t/fi-Ikaalinen_Riitiala27
-rw-r--r--dvb-t/fi-Inari15
-rw-r--r--dvb-t/fi-Inari_Janispaa15
-rw-r--r--dvb-t/fi-Inari_Naatamo15
-rw-r--r--dvb-t/fi-Ivalo_Saarineitamovaara15
-rw-r--r--dvb-t/fi-Jalasjarvi27
-rw-r--r--dvb-t/fi-Jamsa_Halli27
-rw-r--r--dvb-t/fi-Jamsa_Kaipola27
-rw-r--r--dvb-t/fi-Jamsa_Matkosvuori27
-rw-r--r--dvb-t/fi-Jamsa_Ouninpohja21
-rw-r--r--dvb-t/fi-Jamsankoski27
-rw-r--r--dvb-t/fi-Joensuu_Vestinkallio21
-rw-r--r--dvb-t/fi-Joroinen_Puukkola21
-rw-r--r--dvb-t/fi-Joutsa_Lankia27
-rw-r--r--dvb-t/fi-Joutseno33
-rw-r--r--dvb-t/fi-Juupajoki_Kopsamo21
-rw-r--r--dvb-t/fi-Juva27
-rw-r--r--dvb-t/fi-Jyvaskyla33
-rw-r--r--dvb-t/fi-Jyvaskyla_Vaajakoski21
-rw-r--r--dvb-t/fi-Kaavi_Sivakkavaara21
-rw-r--r--dvb-t/fi-Kajaani_Pollyvaara21
-rw-r--r--dvb-t/fi-Kalajoki21
-rw-r--r--dvb-t/fi-Kangaslampi27
-rw-r--r--dvb-t/fi-Kangasniemi_Turkinmaki27
-rw-r--r--dvb-t/fi-Kankaanpaa27
-rw-r--r--dvb-t/fi-Karigasniemi15
-rw-r--r--dvb-t/fi-Karkkila22
-rw-r--r--dvb-t/fi-Karstula21
-rw-r--r--dvb-t/fi-Karvia21
-rw-r--r--dvb-t/fi-Kaunispaa15
-rw-r--r--dvb-t/fi-Kemijarvi_Suomutunturi15
-rw-r--r--dvb-t/fi-Kerimaki27
-rw-r--r--dvb-t/fi-Keuruu27
-rw-r--r--dvb-t/fi-Keuruu_Haapamaki27
-rw-r--r--dvb-t/fi-Kihnio27
-rw-r--r--dvb-t/fi-Kiihtelysvaara15
-rw-r--r--dvb-t/fi-Kilpisjarvi15
-rw-r--r--dvb-t/fi-Kittila_Levitunturi15
-rw-r--r--dvb-t/fi-Kolari_Vuolittaja15
-rw-r--r--dvb-t/fi-Koli27
-rw-r--r--dvb-t/fi-Korpilahti_Vaarunvuori27
-rw-r--r--dvb-t/fi-Korppoo27
-rw-r--r--dvb-t/fi-Kruunupyy33
-rw-r--r--dvb-t/fi-Kuhmo_Haukela21
-rw-r--r--dvb-t/fi-Kuhmo_Lentiira21
-rw-r--r--dvb-t/fi-Kuhmo_Niva21
-rw-r--r--dvb-t/fi-Kuhmoinen27
-rw-r--r--dvb-t/fi-Kuhmoinen_Harjunsalmi27
-rw-r--r--dvb-t/fi-Kuhmoinen_Puukkoinen21
-rw-r--r--dvb-t/fi-Kuopio33
-rw-r--r--dvb-t/fi-Kurikka_Kesti23
-rw-r--r--dvb-t/fi-Kustavi_Viherlahti27
-rw-r--r--dvb-t/fi-Kuusamo_Hamppulampi15
-rw-r--r--dvb-t/fi-Kyyjarvi_Noposenaho21
-rw-r--r--dvb-t/fi-Lahti33
-rw-r--r--dvb-t/fi-Lapua33
-rw-r--r--dvb-t/fi-Laukaa27
-rw-r--r--dvb-t/fi-Laukaa_Vihtavuori27
-rw-r--r--dvb-t/fi-Lavia21
-rw-r--r--dvb-t/fi-Lohja23
-rw-r--r--dvb-t/fi-Loimaa27
-rw-r--r--dvb-t/fi-Luhanka27
-rw-r--r--dvb-t/fi-Luopioinen27
-rw-r--r--dvb-t/fi-Mantta27
-rw-r--r--dvb-t/fi-Mantyharju21
-rw-r--r--dvb-t/fi-Mikkeli27
-rw-r--r--dvb-t/fi-Muonio_Olostunturi15
-rw-r--r--dvb-t/fi-Nilsia27
-rw-r--r--dvb-t/fi-Nilsia_Keski-Siikajarvi21
-rw-r--r--dvb-t/fi-Nilsia_Pisa21
-rw-r--r--dvb-t/fi-Nokia27
-rw-r--r--dvb-t/fi-Nokia_Siuro27
-rw-r--r--dvb-t/fi-Nummi-Pusula_Hyonola27
-rw-r--r--dvb-t/fi-Nuorgam_Njallavaara15
-rw-r--r--dvb-t/fi-Nuorgam_raja15
-rw-r--r--dvb-t/fi-Nurmes_Konnanvaara27
-rw-r--r--dvb-t/fi-Nurmes_Kortevaara21
-rw-r--r--dvb-t/fi-Orivesi_Talviainen21
-rw-r--r--dvb-t/fi-Oulu33
-rw-r--r--dvb-t/fi-Padasjoki27
-rw-r--r--dvb-t/fi-Padasjoki_Arrakoski27
-rw-r--r--dvb-t/fi-Paltamo_Kivesvaara21
-rw-r--r--dvb-t/fi-Parainen_Houtskari27
-rw-r--r--dvb-t/fi-Parikkala27
-rw-r--r--dvb-t/fi-Parkano_Sopukallio27
-rw-r--r--dvb-t/fi-Pello15
-rw-r--r--dvb-t/fi-Pello_Ratasvaara15
-rw-r--r--dvb-t/fi-Perho27
-rw-r--r--dvb-t/fi-Pernaja21
-rw-r--r--dvb-t/fi-Pieksamaki_Halkokumpu21
-rw-r--r--dvb-t/fi-Pihtipudas21
-rw-r--r--dvb-t/fi-Porvoo_Suomenkyla27
-rw-r--r--dvb-t/fi-Posio15
-rw-r--r--dvb-t/fi-Pudasjarvi21
-rw-r--r--dvb-t/fi-Pudasjarvi_Iso-Syote21
-rw-r--r--dvb-t/fi-Pudasjarvi_Kangasvaara15
-rw-r--r--dvb-t/fi-Puolanka27
-rw-r--r--dvb-t/fi-Pyhatunturi15
-rw-r--r--dvb-t/fi-Pyhavuori21
-rw-r--r--dvb-t/fi-Pylkonmaki_Karankajarvi21
-rw-r--r--dvb-t/fi-Raahe_Mestauskallio27
-rw-r--r--dvb-t/fi-Raahe_Piehinki21
-rw-r--r--dvb-t/fi-Ranua_Haasionmaa15
-rw-r--r--dvb-t/fi-Ranua_Leppiaho15
-rw-r--r--dvb-t/fi-Rautavaara_Angervikko27
-rw-r--r--dvb-t/fi-Rautjarvi_Simpele21
-rw-r--r--dvb-t/fi-Ristijarvi21
-rw-r--r--dvb-t/fi-Rovaniemi21
-rw-r--r--dvb-t/fi-Rovaniemi_Kaihuanvaara15
-rw-r--r--dvb-t/fi-Rovaniemi_Karhuvaara15
-rw-r--r--dvb-t/fi-Rovaniemi_Marasenkallio15
-rw-r--r--dvb-t/fi-Rovaniemi_Rantalaki15
-rw-r--r--dvb-t/fi-Rovaniemi_Sonka15
-rw-r--r--dvb-t/fi-Rovaniemi_Sorviselka15
-rw-r--r--dvb-t/fi-Ruka21
-rw-r--r--dvb-t/fi-Ruovesi_Storminiemi27
-rw-r--r--dvb-t/fi-Saarijarvi27
-rw-r--r--dvb-t/fi-Saarijarvi_Kalmari21
-rw-r--r--dvb-t/fi-Saarijarvi_Mahlu21
-rw-r--r--dvb-t/fi-Salla_Hirvasvaara15
-rw-r--r--dvb-t/fi-Salla_Ihistysjanka15
-rw-r--r--dvb-t/fi-Salla_Naruska15
-rw-r--r--dvb-t/fi-Salla_Sallatunturi15
-rw-r--r--dvb-t/fi-Salla_Sarivaara15
-rw-r--r--dvb-t/fi-Salo_Isokyla27
-rw-r--r--dvb-t/fi-Savukoski_Martti15
-rw-r--r--dvb-t/fi-Savukoski_Tanhua15
-rw-r--r--dvb-t/fi-Siilinjarvi27
-rw-r--r--dvb-t/fi-Simo_Viantie18
-rw-r--r--dvb-t/fi-Sipoo_Norrkulla27
-rw-r--r--dvb-t/fi-Sodankyla_Pittiovaara15
-rw-r--r--dvb-t/fi-Sodankyla_Vuotso15
-rw-r--r--dvb-t/fi-Sulkava_Vaatalanmaki21
-rw-r--r--dvb-t/fi-Suomussalmi_Ala-Vuokki15
-rw-r--r--dvb-t/fi-Suomussalmi_Ammansaari15
-rw-r--r--dvb-t/fi-Suomussalmi_Juntusranta15
-rw-r--r--dvb-t/fi-Suomussalmi_Myllylahti15
-rw-r--r--dvb-t/fi-Sysma_Liikola27
-rw-r--r--dvb-t/fi-Taivalkoski15
-rw-r--r--dvb-t/fi-Taivalkoski_Taivalvaara15
-rw-r--r--dvb-t/fi-Tammela34
-rw-r--r--dvb-t/fi-Tammisaari27
-rw-r--r--dvb-t/fi-Tampere34
-rw-r--r--dvb-t/fi-Tampere_Pyynikki33
-rw-r--r--dvb-t/fi-Tervola21
-rw-r--r--dvb-t/fi-Turku33
-rw-r--r--dvb-t/fi-Utsjoki15
-rw-r--r--dvb-t/fi-Utsjoki_Nuvvus15
-rw-r--r--dvb-t/fi-Utsjoki_Outakoski15
-rw-r--r--dvb-t/fi-Utsjoki_Polvarniemi15
-rw-r--r--dvb-t/fi-Utsjoki_Rovisuvanto15
-rw-r--r--dvb-t/fi-Utsjoki_Tenola15
-rw-r--r--dvb-t/fi-Uusikaupunki_Orivo27
-rw-r--r--dvb-t/fi-Vaala21
-rw-r--r--dvb-t/fi-Vaasa21
-rw-r--r--dvb-t/fi-Valtimo21
-rw-r--r--dvb-t/fi-Vammala_Jyranvuori27
-rw-r--r--dvb-t/fi-Vammala_Roismala21
-rw-r--r--dvb-t/fi-Vammala_Savi21
-rw-r--r--dvb-t/fi-Vantaa_Hakunila22
-rw-r--r--dvb-t/fi-Varpaisjarvi_Honkamaki27
-rw-r--r--dvb-t/fi-Virrat_Lappavuori27
-rw-r--r--dvb-t/fi-Vuokatti27
-rw-r--r--dvb-t/fi-Ylitornio_Ainiovaara21
-rw-r--r--dvb-t/fi-Ylitornio_Raanujarvi15
-rw-r--r--dvb-t/fi-Yllas15
-rw-r--r--dvb-t/fi-Yllasjarvi15
-rw-r--r--dvb-t/fr-All521
-rw-r--r--dvb-t/fr-Paris103
-rw-r--r--dvb-t/gr-Athens100
-rw-r--r--dvb-t/hk-HongKong92
-rw-r--r--dvb-t/hr-All339
-rw-r--r--dvb-t/hu-Bekescsaba40
-rw-r--r--dvb-t/hu-Budapest40
-rw-r--r--dvb-t/hu-Csavoly-Kiskoros27
-rw-r--r--dvb-t/hu-Debrecen-Komadi40
-rw-r--r--dvb-t/hu-Fehergyarmat27
-rw-r--r--dvb-t/hu-Gerecse-Dorog-Tatabanya40
-rw-r--r--dvb-t/hu-Gyor40
-rw-r--r--dvb-t/hu-Kabhegy-Kaposvar-Tamasi27
-rw-r--r--dvb-t/hu-Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac40
-rw-r--r--dvb-t/hu-Karcag40
-rw-r--r--dvb-t/hu-Kecskemet40
-rw-r--r--dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd40
-rw-r--r--dvb-t/hu-Miskolc-Aggtelek-Fony40
-rw-r--r--dvb-t/hu-Mor-Siofok-Veszprem-Zirc40
-rw-r--r--dvb-t/hu-Nagykanizsa-Barcs-Keszthely40
-rw-r--r--dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely40
-rw-r--r--dvb-t/hu-Pecs-Siklos27
-rw-r--r--dvb-t/hu-Sopron-Koszeg40
-rw-r--r--dvb-t/hu-Szeged40
-rw-r--r--dvb-t/hu-Szekesfehervar40
-rw-r--r--dvb-t/hu-Szentes-Battonya27
-rw-r--r--dvb-t/hu-Szolnok40
-rw-r--r--dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg40
-rw-r--r--dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar40
-rw-r--r--dvb-t/ie-CairnHill27
-rw-r--r--dvb-t/ie-ClermontCarn27
-rw-r--r--dvb-t/ie-Dungarvan27
-rw-r--r--dvb-t/ie-HolywellHill27
-rw-r--r--dvb-t/ie-Kippure27
-rw-r--r--dvb-t/ie-Maghera27
-rw-r--r--dvb-t/ie-MountLeinster27
-rw-r--r--dvb-t/ie-Mullaghanish27
-rw-r--r--dvb-t/ie-SpurHill27
-rw-r--r--dvb-t/ie-ThreeRock27
-rw-r--r--dvb-t/ie-Truskmore27
-rw-r--r--dvb-t/ie-WoodcockHill27
-rw-r--r--dvb-t/il-All27
-rw-r--r--dvb-t/ir-Tehran27
-rw-r--r--dvb-t/is-Reykjavik235
-rw-r--r--dvb-t/it-All742
-rw-r--r--dvb-t/ke-Nairobi226
-rw-r--r--dvb-t/lt-All313
-rw-r--r--dvb-t/lu-All53
-rw-r--r--dvb-t/lv-Riga95
-rw-r--r--dvb-t/nl-All523
-rw-r--r--dvb-t/no-Trondelag_Stjordal40
-rw-r--r--dvb-t/nz-AucklandInfill40
-rw-r--r--dvb-t/nz-AucklandWaiatarua40
-rw-r--r--dvb-t/nz-Christchurch40
-rw-r--r--dvb-t/nz-Dunedin40
-rw-r--r--dvb-t/nz-Hamilton40
-rw-r--r--dvb-t/nz-HawkesBayMtErin40
-rw-r--r--dvb-t/nz-HawkesBayNapier40
-rw-r--r--dvb-t/nz-Manawatu40
-rw-r--r--dvb-t/nz-Tauranga40
-rw-r--r--dvb-t/nz-Waikato40
-rw-r--r--dvb-t/nz-WellingtonInfill40
-rw-r--r--dvb-t/nz-WellingtonKaukau40
-rw-r--r--dvb-t/nz-WellingtonNgarara40
-rw-r--r--dvb-t/pl-Czestochowa40
-rw-r--r--dvb-t/pl-Gdansk27
-rw-r--r--dvb-t/pl-Krakow79
-rw-r--r--dvb-t/pl-Krosno_Sucha_Gora35
-rw-r--r--dvb-t/pl-Rzeszow14
-rw-r--r--dvb-t/pl-Szczecin46
-rw-r--r--dvb-t/pl-Warszawa72
-rw-r--r--dvb-t/pl-Wroclaw14
-rw-r--r--dvb-t/pt-All92
-rw-r--r--dvb-t/ro-Bucharest40
-rw-r--r--dvb-t/ru-Krasnodar30
-rw-r--r--dvb-t/ru-Novosibirsk30
-rw-r--r--dvb-t/ru-Vladivostok54
-rw-r--r--dvb-t/ru-Volgodonsk30
-rw-r--r--dvb-t/ru-all730
-rw-r--r--dvb-t/se-Aareavaara5
-rw-r--r--dvb-t/se-Adolfstrom5
-rw-r--r--dvb-t/se-Agnas5
-rw-r--r--dvb-t/se-Akersjon5
-rw-r--r--dvb-t/se-Alafors35
-rw-r--r--dvb-t/se-Albacken5
-rw-r--r--dvb-t/se-Algsjo5
-rw-r--r--dvb-t/se-Alingsas_Mariedal35
-rw-r--r--dvb-t/se-Alvangen35
-rw-r--r--dvb-t/se-Alvdalen_Brunnsberg14
-rw-r--r--dvb-t/se-Alvdalsasen14
-rw-r--r--dvb-t/se-Alvsbacka5
-rw-r--r--dvb-t/se-Alvsbyn75
-rw-r--r--dvb-t/se-Ammarnas_Ribovardo5
-rw-r--r--dvb-t/se-Ammarnas_Tjultrask5
-rw-r--r--dvb-t/se-Amot14
-rw-r--r--dvb-t/se-Amotfors_Kroppstad5
-rw-r--r--dvb-t/se-An5
-rw-r--r--dvb-t/se-Andersvattnet_Ersmyrberget5
-rw-r--r--dvb-t/se-Ange_Snoberg67
-rw-r--r--dvb-t/se-Angebo7
-rw-r--r--dvb-t/se-Angelholm_Vegeholm40
-rw-r--r--dvb-t/se-Angersjo5
-rw-r--r--dvb-t/se-Are35
-rw-r--r--dvb-t/se-Arjang35
-rw-r--r--dvb-t/se-Arjeplog_Galtispouda35
-rw-r--r--dvb-t/se-Arosjokk5
-rw-r--r--dvb-t/se-Arvidsjaur_Jultrask39
-rw-r--r--dvb-t/se-Arvika_Orshultaberget5
-rw-r--r--dvb-t/se-As5
-rw-r--r--dvb-t/se-Asele_Aslia5
-rw-r--r--dvb-t/se-Asmon_Sormoflo5
-rw-r--r--dvb-t/se-Aspeboda14
-rw-r--r--dvb-t/se-Atvidaberg37
-rw-r--r--dvb-t/se-Avesta_Krylbo37
-rw-r--r--dvb-t/se-Backe5
-rw-r--r--dvb-t/se-Backefors40
-rw-r--r--dvb-t/se-Bankeryd37
-rw-r--r--dvb-t/se-Bengtsfors5
-rw-r--r--dvb-t/se-Berghamn5
-rw-r--r--dvb-t/se-Bergshamra_Vaxtuna35
-rw-r--r--dvb-t/se-Bergsjo_Balleberget14
-rw-r--r--dvb-t/se-Bergvik14
-rw-r--r--dvb-t/se-Billsjo5
-rw-r--r--dvb-t/se-Bispfors35
-rw-r--r--dvb-t/se-Bjorkliden_Tornehamn5
-rw-r--r--dvb-t/se-Bjorksele5
-rw-r--r--dvb-t/se-Bjorkvattnet5
-rw-r--r--dvb-t/se-Bjorna5
-rw-r--r--dvb-t/se-Bjurberget_Hemtjarn5
-rw-r--r--dvb-t/se-Bjurtrask5
-rw-r--r--dvb-t/se-Boberg5
-rw-r--r--dvb-t/se-Boda_Fagerum35
-rw-r--r--dvb-t/se-Boden_Skogsa5
-rw-r--r--dvb-t/se-Bograngen5
-rw-r--r--dvb-t/se-Bollebygd38
-rw-r--r--dvb-t/se-Bollnas67
-rw-r--r--dvb-t/se-Bonhamn5
-rw-r--r--dvb-t/se-Boras_Dalsjofors40
-rw-r--r--dvb-t/se-Boras_Sjobo37
-rw-r--r--dvb-t/se-Borgafjall5
-rw-r--r--dvb-t/se-Borgholm_Ramsattra31
-rw-r--r--dvb-t/se-Borgsjobyn5
-rw-r--r--dvb-t/se-Borkan5
-rw-r--r--dvb-t/se-Borlange_Idkerberget67
-rw-r--r--dvb-t/se-Borlange_Nygardarna51
-rw-r--r--dvb-t/se-Bortansbyn_Bortan5
-rw-r--r--dvb-t/se-Bosebyn5
-rw-r--r--dvb-t/se-Botsmark5
-rw-r--r--dvb-t/se-Bottnaryd_Ryd14
-rw-r--r--dvb-t/se-Bredaker5
-rw-r--r--dvb-t/se-Bredbyn_Kubbe5
-rw-r--r--dvb-t/se-Bredbyn_Vasterfannbyn5
-rw-r--r--dvb-t/se-Bredsjon5
-rw-r--r--dvb-t/se-Bromsebro37
-rw-r--r--dvb-t/se-Bruzaholm14
-rw-r--r--dvb-t/se-Bydalen_Hovdehogen5
-rw-r--r--dvb-t/se-Bygdetrask5
-rw-r--r--dvb-t/se-Bygdsiljum5
-rw-r--r--dvb-t/se-Byxelkrok27
-rw-r--r--dvb-t/se-Dadran6
-rw-r--r--dvb-t/se-Dal5
-rw-r--r--dvb-t/se-Dalfors14
-rw-r--r--dvb-t/se-Dals_Langed5
-rw-r--r--dvb-t/se-Dalstuga14
-rw-r--r--dvb-t/se-Degeberga5
-rw-r--r--dvb-t/se-Degerfors39
-rw-r--r--dvb-t/se-Delary14
-rw-r--r--dvb-t/se-Delary_Kolaboda5
-rw-r--r--dvb-t/se-Djura14
-rw-r--r--dvb-t/se-Dorotea5
-rw-r--r--dvb-t/se-Drevdagen14
-rw-r--r--dvb-t/se-Duved5
-rw-r--r--dvb-t/se-Duvnas14
-rw-r--r--dvb-t/se-Duvnas_Basna14
-rw-r--r--dvb-t/se-Edane5
-rw-r--r--dvb-t/se-Edsbyn14
-rw-r--r--dvb-t/se-Edsele5
-rw-r--r--dvb-t/se-Edsleskog_Hogheden5
-rw-r--r--dvb-t/se-Eksharad_Ekesberget5
-rw-r--r--dvb-t/se-Ellos5
-rw-r--r--dvb-t/se-Emmaboda_Balshult40
-rw-r--r--dvb-t/se-Enafors5
-rw-r--r--dvb-t/se-Enviken38
-rw-r--r--dvb-t/se-Erikslund_Bergasen5
-rw-r--r--dvb-t/se-Fagersta27
-rw-r--r--dvb-t/se-Fagersta_Jattasen35
-rw-r--r--dvb-t/se-Falerum_Centrum14
-rw-r--r--dvb-t/se-Falkenberg_Ringsegard5
-rw-r--r--dvb-t/se-Faltrask5
-rw-r--r--dvb-t/se-Falun_Lovberget40
-rw-r--r--dvb-t/se-Farila14
-rw-r--r--dvb-t/se-Farjestaden_Algutsrum35
-rw-r--r--dvb-t/se-Faro_Ajkerstrask27
-rw-r--r--dvb-t/se-Faro_Ajkestrask30
-rw-r--r--dvb-t/se-Farosund_Bunge36
-rw-r--r--dvb-t/se-Fengersfors5
-rw-r--r--dvb-t/se-Filipstad_Klockarhojden40
-rw-r--r--dvb-t/se-Finnveden40
-rw-r--r--dvb-t/se-Fjal5
-rw-r--r--dvb-t/se-Fjallsta5
-rw-r--r--dvb-t/se-Flarke5
-rw-r--r--dvb-t/se-Floda5
-rw-r--r--dvb-t/se-Flurkmark5
-rw-r--r--dvb-t/se-Flyggsjo5
-rw-r--r--dvb-t/se-Flyn5
-rw-r--r--dvb-t/se-Folsbyn5
-rw-r--r--dvb-t/se-Forsed5
-rw-r--r--dvb-t/se-Forsmo5
-rw-r--r--dvb-t/se-Forsmo_Yttersel5
-rw-r--r--dvb-t/se-Forsnaset5
-rw-r--r--dvb-t/se-Frankrikegarden_Frankrike5
-rw-r--r--dvb-t/se-Fransta5
-rw-r--r--dvb-t/se-Fredrika5
-rw-r--r--dvb-t/se-Fredriksberg14
-rw-r--r--dvb-t/se-Fredros5
-rw-r--r--dvb-t/se-Fritsla14
-rw-r--r--dvb-t/se-Fullsjon5
-rw-r--r--dvb-t/se-Funasdalen_Funasdalsberge35
-rw-r--r--dvb-t/se-Funasdalen_Telestation5
-rw-r--r--dvb-t/se-Furudal14
-rw-r--r--dvb-t/se-Gaddede5
-rw-r--r--dvb-t/se-Gallivare40
-rw-r--r--dvb-t/se-Gallsatter5
-rw-r--r--dvb-t/se-Gardikfors5
-rw-r--r--dvb-t/se-Gargnas5
-rw-r--r--dvb-t/se-Garpenberg_Kuppgarden14
-rw-r--r--dvb-t/se-Gavle_Skogmur40
-rw-r--r--dvb-t/se-Gillhov5
-rw-r--r--dvb-t/se-Glimakra5
-rw-r--r--dvb-t/se-Gnarp14
-rw-r--r--dvb-t/se-Gnesta27
-rw-r--r--dvb-t/se-Gnosjo_Marieholm14
-rw-r--r--dvb-t/se-Gordalen5
-rw-r--r--dvb-t/se-Goteborg_Brudaremossen41
-rw-r--r--dvb-t/se-Goteborg_Slattadamm36
-rw-r--r--dvb-t/se-Graninge5
-rw-r--r--dvb-t/se-Grasmark5
-rw-r--r--dvb-t/se-Grasmyr5
-rw-r--r--dvb-t/se-Grebbestad35
-rw-r--r--dvb-t/se-Grevie5
-rw-r--r--dvb-t/se-Grovelsjon5
-rw-r--r--dvb-t/se-Grums5
-rw-r--r--dvb-t/se-Guliksberg5
-rw-r--r--dvb-t/se-Guliksberg_Rodvattnet5
-rw-r--r--dvb-t/se-Gullbrandstorp14
-rw-r--r--dvb-t/se-Gumhojden5
-rw-r--r--dvb-t/se-Gunnarn_Sorsjoliden35
-rw-r--r--dvb-t/se-Gunnarsbo14
-rw-r--r--dvb-t/se-Gunnarsbyn5
-rw-r--r--dvb-t/se-Gunnarskog5
-rw-r--r--dvb-t/se-Gusum14
-rw-r--r--dvb-t/se-Hadanberg5
-rw-r--r--dvb-t/se-Hagfors_Varmullsasen40
-rw-r--r--dvb-t/se-Hakafot5
-rw-r--r--dvb-t/se-Halaforsen5
-rw-r--r--dvb-t/se-Haljeboda5
-rw-r--r--dvb-t/se-Hallan5
-rw-r--r--dvb-t/se-Hallaryd14
-rw-r--r--dvb-t/se-Hallastrom5
-rw-r--r--dvb-t/se-Hallbo14
-rw-r--r--dvb-t/se-Halle5
-rw-r--r--dvb-t/se-Halleviksstrand5
-rw-r--r--dvb-t/se-Hallsjo5
-rw-r--r--dvb-t/se-Halmstad_Hamnen33
-rw-r--r--dvb-t/se-Halmstad_Oskarstrom40
-rw-r--r--dvb-t/se-Hamburgsund5
-rw-r--r--dvb-t/se-Harads5
-rw-r--r--dvb-t/se-Harnosand_Harnon40
-rw-r--r--dvb-t/se-Harrsjon5
-rw-r--r--dvb-t/se-Hassela14
-rw-r--r--dvb-t/se-Havdhem66
-rw-r--r--dvb-t/se-Hede35
-rw-r--r--dvb-t/se-Hedemora7
-rw-r--r--dvb-t/se-Hedenaset5
-rw-r--r--dvb-t/se-Helgum5
-rw-r--r--dvb-t/se-Helsingborg_Olympia41
-rw-r--r--dvb-t/se-Hemavan35
-rw-r--r--dvb-t/se-Hemson5
-rw-r--r--dvb-t/se-Henan5
-rw-r--r--dvb-t/se-Hennan14
-rw-r--r--dvb-t/se-Hestra_Aspas14
-rw-r--r--dvb-t/se-Hjo_Grevback14
-rw-r--r--dvb-t/se-Hofors40
-rw-r--r--dvb-t/se-Hogfors14
-rw-r--r--dvb-t/se-Hoglunda5
-rw-r--r--dvb-t/se-Hogsby_Virstad38
-rw-r--r--dvb-t/se-Hogvalen5
-rw-r--r--dvb-t/se-Holjes5
-rw-r--r--dvb-t/se-Hollviken_Stora_Hammar30
-rw-r--r--dvb-t/se-Holsbybrunn_Holsbyholm14
-rw-r--r--dvb-t/se-Horby_Sallerup43
-rw-r--r--dvb-t/se-Horken14
-rw-r--r--dvb-t/se-Hornon5
-rw-r--r--dvb-t/se-Hotagen5
-rw-r--r--dvb-t/se-Hoting5
-rw-r--r--dvb-t/se-Hovfjallet5
-rw-r--r--dvb-t/se-Hudiksvall_Forsa40
-rw-r--r--dvb-t/se-Hudiksvall_Galgberget38
-rw-r--r--dvb-t/se-Hummelholm5
-rw-r--r--dvb-t/se-Hunnebostrand5
-rw-r--r--dvb-t/se-Huskvarna14
-rw-r--r--dvb-t/se-Husum5
-rw-r--r--dvb-t/se-Idivuoma5
-rw-r--r--dvb-t/se-Idre37
-rw-r--r--dvb-t/se-Ingatorp14
-rw-r--r--dvb-t/se-Ingvallsbenning7
-rw-r--r--dvb-t/se-Irevik27
-rw-r--r--dvb-t/se-Irevik_319530
-rw-r--r--dvb-t/se-Ivarsbyn5
-rw-r--r--dvb-t/se-Jakkvik_Frakenmyren5
-rw-r--r--dvb-t/se-Jamjo27
-rw-r--r--dvb-t/se-Jarkvissle5
-rw-r--r--dvb-t/se-Jarnforsen14
-rw-r--r--dvb-t/se-Jarpen_Mellangardsberget5
-rw-r--r--dvb-t/se-Jarvso14
-rw-r--r--dvb-t/se-Jarvtrask5
-rw-r--r--dvb-t/se-Joestrom5
-rw-r--r--dvb-t/se-Jokkmokk_Nyborg35
-rw-r--r--dvb-t/se-Jokkmokk_Tjalmejaure40
-rw-r--r--dvb-t/se-Jonkoping_Bondberget40
-rw-r--r--dvb-t/se-Jormvattnet5
-rw-r--r--dvb-t/se-Jude5
-rw-r--r--dvb-t/se-Junsele_Hamptjarnsberget5
-rw-r--r--dvb-t/se-Junsele_Vallen5
-rw-r--r--dvb-t/se-Kagerod_Mollarp5
-rw-r--r--dvb-t/se-Kalarne5
-rw-r--r--dvb-t/se-Kalen5
-rw-r--r--dvb-t/se-Kalix40
-rw-r--r--dvb-t/se-Kallered5
-rw-r--r--dvb-t/se-Kallinge_Kalleberga35
-rw-r--r--dvb-t/se-Kallror5
-rw-r--r--dvb-t/se-Kampersvik_Ekeberget5
-rw-r--r--dvb-t/se-Karbole14
-rw-r--r--dvb-t/se-Karesuando5
-rw-r--r--dvb-t/se-Karlanda5
-rw-r--r--dvb-t/se-Karlsborg_Vaberget14
-rw-r--r--dvb-t/se-Karlshamn40
-rw-r--r--dvb-t/se-Karlskrona_Jamjo35
-rw-r--r--dvb-t/se-Karlskrona_Vamo40
-rw-r--r--dvb-t/se-Karlstad_Sormon45
-rw-r--r--dvb-t/se-Kasta_Ringkallen5
-rw-r--r--dvb-t/se-Kaxas5
-rw-r--r--dvb-t/se-Kaxholmen_Vistakulle14
-rw-r--r--dvb-t/se-Kinnastrom14
-rw-r--r--dvb-t/se-Kiruna_Kirunavaara67
-rw-r--r--dvb-t/se-Kisa75
-rw-r--r--dvb-t/se-Klingsta5
-rw-r--r--dvb-t/se-Klovsjo5
-rw-r--r--dvb-t/se-Knared14
-rw-r--r--dvb-t/se-Knavland5
-rw-r--r--dvb-t/se-Kopmanholmen67
-rw-r--r--dvb-t/se-Kopparberg37
-rw-r--r--dvb-t/se-Koppom35
-rw-r--r--dvb-t/se-Korstrask5
-rw-r--r--dvb-t/se-Kottsjon5
-rw-r--r--dvb-t/se-Kovland5
-rw-r--r--dvb-t/se-Kramfors_Lugnvik40
-rw-r--r--dvb-t/se-Kramfors_Ostby5
-rw-r--r--dvb-t/se-Krangede5
-rw-r--r--dvb-t/se-Kristineberg5
-rw-r--r--dvb-t/se-Kristinehamn_Utsiktsberget40
-rw-r--r--dvb-t/se-Krokstrand5
-rw-r--r--dvb-t/se-Kultsjon5
-rw-r--r--dvb-t/se-Kungalv35
-rw-r--r--dvb-t/se-Kungsater14
-rw-r--r--dvb-t/se-Kungsbacka_Ojersbo5
-rw-r--r--dvb-t/se-Kungsberget_GI14
-rw-r--r--dvb-t/se-Kungsberget_Gl5
-rw-r--r--dvb-t/se-Kungshamn35
-rw-r--r--dvb-t/se-Kurravaara5
-rw-r--r--dvb-t/se-Kvarnsvedjan5
-rw-r--r--dvb-t/se-Kvikkjokk_Arrevare5
-rw-r--r--dvb-t/se-Kvikkjokk_Tavvevare5
-rw-r--r--dvb-t/se-Kyrkesund5
-rw-r--r--dvb-t/se-Lagfors5
-rw-r--r--dvb-t/se-Laggarberg5
-rw-r--r--dvb-t/se-Laisvall5
-rw-r--r--dvb-t/se-Langa5
-rw-r--r--dvb-t/se-Langsele5
-rw-r--r--dvb-t/se-Langshyttan14
-rw-r--r--dvb-t/se-Langshyttan_Engelsfors7
-rw-r--r--dvb-t/se-Laxsjo5
-rw-r--r--dvb-t/se-Laxviken5
-rw-r--r--dvb-t/se-Leksand_Asledsberget35
-rw-r--r--dvb-t/se-Leksand_Karingberget14
-rw-r--r--dvb-t/se-Lekvattnet5
-rw-r--r--dvb-t/se-Lerdala14
-rw-r--r--dvb-t/se-Lesjofors35
-rw-r--r--dvb-t/se-Liden5
-rw-r--r--dvb-t/se-Liden_Osterstrom5
-rw-r--r--dvb-t/se-Lilla_Edet35
-rw-r--r--dvb-t/se-Lillogda5
-rw-r--r--dvb-t/se-Lillpite_Bastaberget5
-rw-r--r--dvb-t/se-Lilltjara_Digerberget14
-rw-r--r--dvb-t/se-Limedsforsen14
-rw-r--r--dvb-t/se-Lindshammar_Ramkvilla14
-rw-r--r--dvb-t/se-Linkoping_Vattentornet41
-rw-r--r--dvb-t/se-Linsell5
-rw-r--r--dvb-t/se-Lit5
-rw-r--r--dvb-t/se-Ljugarn27
-rw-r--r--dvb-t/se-Ljugarn_319330
-rw-r--r--dvb-t/se-Ljungaverk5
-rw-r--r--dvb-t/se-Ljungdalen35
-rw-r--r--dvb-t/se-Ljustorp5
-rw-r--r--dvb-t/se-Ljusvattnet5
-rw-r--r--dvb-t/se-Loderups_Strandbad5
-rw-r--r--dvb-t/se-Loffstrand40
-rw-r--r--dvb-t/se-Lofsdalen5
-rw-r--r--dvb-t/se-Logdealv5
-rw-r--r--dvb-t/se-Lonneberga37
-rw-r--r--dvb-t/se-Lorstrand14
-rw-r--r--dvb-t/se-Lovanger5
-rw-r--r--dvb-t/se-Ludvika_Bjorkasen38
-rw-r--r--dvb-t/se-Lumsheden_Trekanten14
-rw-r--r--dvb-t/se-Lycksele_Knaften40
-rw-r--r--dvb-t/se-Mahult14
-rw-r--r--dvb-t/se-Mala5
-rw-r--r--dvb-t/se-Malmo_Jagersro41
-rw-r--r--dvb-t/se-Malung38
-rw-r--r--dvb-t/se-Manserud5
-rw-r--r--dvb-t/se-Mardsjo5
-rw-r--r--dvb-t/se-Mariannelund7
-rw-r--r--dvb-t/se-Markaryd_Hualtet51
-rw-r--r--dvb-t/se-Matfors39
-rw-r--r--dvb-t/se-Matsdal5
-rw-r--r--dvb-t/se-Medstugan5
-rw-r--r--dvb-t/se-Mittadalen5
-rw-r--r--dvb-t/se-Mjallom35
-rw-r--r--dvb-t/se-Mjosjo5
-rw-r--r--dvb-t/se-Moliden5
-rw-r--r--dvb-t/se-Molnbo_Tallstugan35
-rw-r--r--dvb-t/se-Molndal_Vasterberget35
-rw-r--r--dvb-t/se-Mora_Eldris67
-rw-r--r--dvb-t/se-Morkret5
-rw-r--r--dvb-t/se-Moskosel5
-rw-r--r--dvb-t/se-Motala_Ervasteby75
-rw-r--r--dvb-t/se-Mullsjo_Torestorp37
-rw-r--r--dvb-t/se-Munkedal35
-rw-r--r--dvb-t/se-Munkfors35
-rw-r--r--dvb-t/se-Muodoslompolo5
-rw-r--r--dvb-t/se-Nalden5
-rw-r--r--dvb-t/se-Nasaker5
-rw-r--r--dvb-t/se-Nasanget5
-rw-r--r--dvb-t/se-Nassjo67
-rw-r--r--dvb-t/se-Nasteln5
-rw-r--r--dvb-t/se-Navekvarn7
-rw-r--r--dvb-t/se-Naverede_Oberget5
-rw-r--r--dvb-t/se-Niemisel5
-rw-r--r--dvb-t/se-Nordanede5
-rw-r--r--dvb-t/se-Nordmaling5
-rw-r--r--dvb-t/se-Norra_Rorum5
-rw-r--r--dvb-t/se-Norrahammar14
-rw-r--r--dvb-t/se-Norraker5
-rw-r--r--dvb-t/se-Norrfors5
-rw-r--r--dvb-t/se-Norrhassel5
-rw-r--r--dvb-t/se-Norrkoping_Krokek41
-rw-r--r--dvb-t/se-Norrtalje_Sodra30
-rw-r--r--dvb-t/se-Norrtalje_Sodra_Bergen66
-rw-r--r--dvb-t/se-Norsjovallen5
-rw-r--r--dvb-t/se-Nyhem5
-rw-r--r--dvb-t/se-Nykoping14
-rw-r--r--dvb-t/se-Nyliden5
-rw-r--r--dvb-t/se-Nynashamn_Vattentornet35
-rw-r--r--dvb-t/se-Odsmal5
-rw-r--r--dvb-t/se-Olden_Telestation5
-rw-r--r--dvb-t/se-Olkamangi5
-rw-r--r--dvb-t/se-Olofstrom5
-rw-r--r--dvb-t/se-Orebro_Lockhyttan75
-rw-r--r--dvb-t/se-Orkelljunga35
-rw-r--r--dvb-t/se-Ornskoldsvik_As75
-rw-r--r--dvb-t/se-Oskarshamn39
-rw-r--r--dvb-t/se-Osmo_Bjorsta10
-rw-r--r--dvb-t/se-Osterforse5
-rw-r--r--dvb-t/se-Ostergraninge5
-rw-r--r--dvb-t/se-Ostersund_Brattasen41
-rw-r--r--dvb-t/se-Osthammar_Valo41
-rw-r--r--dvb-t/se-Ostmark5
-rw-r--r--dvb-t/se-Overammer5
-rw-r--r--dvb-t/se-Overhogdal5
-rw-r--r--dvb-t/se-Overkalix40
-rw-r--r--dvb-t/se-Overklinten5
-rw-r--r--dvb-t/se-Overrissjo5
-rw-r--r--dvb-t/se-Overtornea_Sarkivaara35
-rw-r--r--dvb-t/se-Overturingen5
-rw-r--r--dvb-t/se-Oxberg14
-rw-r--r--dvb-t/se-Pajala39
-rw-r--r--dvb-t/se-Paulistom14
-rw-r--r--dvb-t/se-Paulistrom5
-rw-r--r--dvb-t/se-Pilgrimstad5
-rw-r--r--dvb-t/se-Porjus35
-rw-r--r--dvb-t/se-Puoltsa5
-rw-r--r--dvb-t/se-Ragunda35
-rw-r--r--dvb-t/se-Ramsele_Skavasen35
-rw-r--r--dvb-t/se-Ramsjo5
-rw-r--r--dvb-t/se-Ramundberget5
-rw-r--r--dvb-t/se-Randalen5
-rw-r--r--dvb-t/se-Randijaure5
-rw-r--r--dvb-t/se-Ransater5
-rw-r--r--dvb-t/se-Rattvik7
-rw-r--r--dvb-t/se-Rengsjo14
-rw-r--r--dvb-t/se-Renstrom5
-rw-r--r--dvb-t/se-Resele5
-rw-r--r--dvb-t/se-Risback5
-rw-r--r--dvb-t/se-Rissna5
-rw-r--r--dvb-t/se-Ritsem5
-rw-r--r--dvb-t/se-Robertsfors5
-rw-r--r--dvb-t/se-Rojdafors5
-rw-r--r--dvb-t/se-Ronnang5
-rw-r--r--dvb-t/se-Rorbacksnas14
-rw-r--r--dvb-t/se-Rosson5
-rw-r--r--dvb-t/se-Rusksele5
-rw-r--r--dvb-t/se-Sadvaluspen5
-rw-r--r--dvb-t/se-Sagmyra14
-rw-r--r--dvb-t/se-Saivomuotka5
-rw-r--r--dvb-t/se-Salen14
-rw-r--r--dvb-t/se-Salfjallet14
-rw-r--r--dvb-t/se-Sarna_Mickeltemplet14
-rw-r--r--dvb-t/se-Satila14
-rw-r--r--dvb-t/se-Savar_Sorbyn5
-rw-r--r--dvb-t/se-Savast5
-rw-r--r--dvb-t/se-Saxdalen14
-rw-r--r--dvb-t/se-Seitevaare5
-rw-r--r--dvb-t/se-Selanger5
-rw-r--r--dvb-t/se-Seltjarn5
-rw-r--r--dvb-t/se-Sidensjo_Aberget5
-rw-r--r--dvb-t/se-Siljansnas_Uvberget14
-rw-r--r--dvb-t/se-Simrishamn_Fabriksgatan35
-rw-r--r--dvb-t/se-Skalan5
-rw-r--r--dvb-t/se-Skalmsjo5
-rw-r--r--dvb-t/se-Skarstad14
-rw-r--r--dvb-t/se-Skarvangen5
-rw-r--r--dvb-t/se-Skattungbyn14
-rw-r--r--dvb-t/se-Skaulo_Pyhakielinen5
-rw-r--r--dvb-t/se-Skelleftea41
-rw-r--r--dvb-t/se-Skene_Nycklarberget14
-rw-r--r--dvb-t/se-Skillingsfors5
-rw-r--r--dvb-t/se-Skorped5
-rw-r--r--dvb-t/se-Skottsund5
-rw-r--r--dvb-t/se-Skovde75
-rw-r--r--dvb-t/se-Skroven5
-rw-r--r--dvb-t/se-Skymnas5
-rw-r--r--dvb-t/se-Slussfors5
-rw-r--r--dvb-t/se-Smedjebacken_Uvberget40
-rw-r--r--dvb-t/se-Soderhamn38
-rw-r--r--dvb-t/se-Soderkoping38
-rw-r--r--dvb-t/se-Sodertalje_Ragnhildsborg42
-rw-r--r--dvb-t/se-Solleftea_Hallsta67
-rw-r--r--dvb-t/se-Solleftea_Multra67
-rw-r--r--dvb-t/se-Soraker5
-rw-r--r--dvb-t/se-Sorbygden5
-rw-r--r--dvb-t/se-Sorflarke5
-rw-r--r--dvb-t/se-Sorsele_Nalovardo5
-rw-r--r--dvb-t/se-Sorsele_Vattentornet5
-rw-r--r--dvb-t/se-Sorsjon14
-rw-r--r--dvb-t/se-Soukolojarvi5
-rw-r--r--dvb-t/se-Stalon5
-rw-r--r--dvb-t/se-Stigsjo5
-rw-r--r--dvb-t/se-Stockholm_Marieberg41
-rw-r--r--dvb-t/se-Stockholm_Nacka77
-rw-r--r--dvb-t/se-Stode_Hullsjon5
-rw-r--r--dvb-t/se-Stode_Intaget35
-rw-r--r--dvb-t/se-Stomne_Skasas5
-rw-r--r--dvb-t/se-Stora_Skedvi14
-rw-r--r--dvb-t/se-Stordalen5
-rw-r--r--dvb-t/se-Storfjaten14
-rw-r--r--dvb-t/se-Storlien5
-rw-r--r--dvb-t/se-Storuman40
-rw-r--r--dvb-t/se-Stromstad41
-rw-r--r--dvb-t/se-Stromsund_Grelsgard35
-rw-r--r--dvb-t/se-Stugun5
-rw-r--r--dvb-t/se-Styrsjobo14
-rw-r--r--dvb-t/se-Suddesjaur5
-rw-r--r--dvb-t/se-Suijavaara5
-rw-r--r--dvb-t/se-Sulvik5
-rw-r--r--dvb-t/se-Sundborn14
-rw-r--r--dvb-t/se-Sundsbruk40
-rw-r--r--dvb-t/se-Sundsvall_S_Stadsberget41
-rw-r--r--dvb-t/se-Sunne_As5
-rw-r--r--dvb-t/se-Sunne_Blabarskullen40
-rw-r--r--dvb-t/se-Sunnemo5
-rw-r--r--dvb-t/se-Svaneholm5
-rw-r--r--dvb-t/se-Svanstein5
-rw-r--r--dvb-t/se-Svardsosund_Svardso5
-rw-r--r--dvb-t/se-Svartnas14
-rw-r--r--dvb-t/se-Sveg_Brickan40
-rw-r--r--dvb-t/se-Sveg_Ransjo5
-rw-r--r--dvb-t/se-Svenstavik5
-rw-r--r--dvb-t/se-Svinesund5
-rw-r--r--dvb-t/se-Syssleback35
-rw-r--r--dvb-t/se-Taberg14
-rw-r--r--dvb-t/se-Tandadalen7
-rw-r--r--dvb-t/se-Tannas_Vastra5
-rw-r--r--dvb-t/se-Tanndalen5
-rw-r--r--dvb-t/se-Tarnaby_Ryfjallet35
-rw-r--r--dvb-t/se-Tarnamo5
-rw-r--r--dvb-t/se-Tasjo40
-rw-r--r--dvb-t/se-Tavelsjo5
-rw-r--r--dvb-t/se-Tocksfors35
-rw-r--r--dvb-t/se-Tollsjo14
-rw-r--r--dvb-t/se-Tormestorp5
-rw-r--r--dvb-t/se-Tornetrask5
-rw-r--r--dvb-t/se-Torpshammar35
-rw-r--r--dvb-t/se-Torsby_Bada40
-rw-r--r--dvb-t/se-Tranas_Bredkarr37
-rw-r--r--dvb-t/se-Tranemo14
-rw-r--r--dvb-t/se-Transtrand_Bolheden38
-rw-r--r--dvb-t/se-Traryd_Betas38
-rw-r--r--dvb-t/se-Trehorningsjo5
-rw-r--r--dvb-t/se-Trelleborg_Gylle35
-rw-r--r--dvb-t/se-Trollhattan41
-rw-r--r--dvb-t/se-Trosa27
-rw-r--r--dvb-t/se-Tullinge_Hamra35
-rw-r--r--dvb-t/se-Tyringe5
-rw-r--r--dvb-t/se-Tystberga7
-rw-r--r--dvb-t/se-Uddevalla_Herrestad41
-rw-r--r--dvb-t/se-Uddevalla_Kapelle5
-rw-r--r--dvb-t/se-Uggleheden5
-rw-r--r--dvb-t/se-Ullanger_Skidsta5
-rw-r--r--dvb-t/se-Ullared14
-rw-r--r--dvb-t/se-Ulricehamn38
-rw-r--r--dvb-t/se-Ulvohamn5
-rw-r--r--dvb-t/se-Ulvshyttan_Porjus14
-rw-r--r--dvb-t/se-Umea_Mariehem5
-rw-r--r--dvb-t/se-Umfors5
-rw-r--r--dvb-t/se-Umgransele_Granselelund5
-rw-r--r--dvb-t/se-Undersaker5
-rw-r--r--dvb-t/se-Uppsala_Rickomberga14
-rw-r--r--dvb-t/se-Uppsala_Vedyxa41
-rw-r--r--dvb-t/se-Utansjo5
-rw-r--r--dvb-t/se-Utanskog5
-rw-r--r--dvb-t/se-Vaddo_Elmsta38
-rw-r--r--dvb-t/se-Valadalen5
-rw-r--r--dvb-t/se-Valanger5
-rw-r--r--dvb-t/se-Valdemarsvik38
-rw-r--r--dvb-t/se-Valsjobyn5
-rw-r--r--dvb-t/se-Vannas_Granlundsberget40
-rw-r--r--dvb-t/se-Vansbro_Hummelberget14
-rw-r--r--dvb-t/se-Varberg_Grimeton67
-rw-r--r--dvb-t/se-Varmvattnet5
-rw-r--r--dvb-t/se-Varnamo_Alandsryd5
-rw-r--r--dvb-t/se-Vassbotten5
-rw-r--r--dvb-t/se-Vassijaure5
-rw-r--r--dvb-t/se-Vastansjo5
-rw-r--r--dvb-t/se-Vasteras_Lillharad87
-rw-r--r--dvb-t/se-Vastervik_Farhult40
-rw-r--r--dvb-t/se-Vato5
-rw-r--r--dvb-t/se-Vaxbo14
-rw-r--r--dvb-t/se-Vemdalsskalet5
-rw-r--r--dvb-t/se-Vessigebro14
-rw-r--r--dvb-t/se-Vetlanda_Nye14
-rw-r--r--dvb-t/se-Vidsel5
-rw-r--r--dvb-t/se-Vietas5
-rw-r--r--dvb-t/se-Vikmanshyttan14
-rw-r--r--dvb-t/se-Viksjo5
-rw-r--r--dvb-t/se-Vilhelmina35
-rw-r--r--dvb-t/se-Villands_Vanga5
-rw-r--r--dvb-t/se-Vindelgransele5
-rw-r--r--dvb-t/se-Vindeln_Renfors35
-rw-r--r--dvb-t/se-Virserum67
-rw-r--r--dvb-t/se-Visby_Follingbo41
-rw-r--r--dvb-t/se-Visby_Hamnen70
-rw-r--r--dvb-t/se-Visby_Havdhem35
-rw-r--r--dvb-t/se-Visingso14
-rw-r--r--dvb-t/se-Vislanda_Nydala40
-rw-r--r--dvb-t/se-Vitberget5
-rw-r--r--dvb-t/se-Vitsand5
-rw-r--r--dvb-t/se-Vitsand_Vagsjofors5
-rw-r--r--dvb-t/se-Voxna14
-rw-r--r--dvb-t/se-Vuollerim35
-rw-r--r--dvb-t/se-Ystad_Metallgatan41
-rw-r--r--dvb-t/se-Yttermalung14
-rw-r--r--dvb-t/si-Ljubljana26
-rw-r--r--dvb-t/sk-BanskaBystrica27
-rw-r--r--dvb-t/sk-BanskaStiavnica27
-rw-r--r--dvb-t/sk-Bardejov27
-rw-r--r--dvb-t/sk-Bratislava40
-rw-r--r--dvb-t/sk-Cadca27
-rw-r--r--dvb-t/sk-Detva27
-rw-r--r--dvb-t/sk-Hnusta27
-rw-r--r--dvb-t/sk-Kosice27
-rw-r--r--dvb-t/sk-KralovskyChlmec27
-rw-r--r--dvb-t/sk-Krompachy27
-rw-r--r--dvb-t/sk-Lucenec27
-rw-r--r--dvb-t/sk-Medzev27
-rw-r--r--dvb-t/sk-Namestovo27
-rw-r--r--dvb-t/sk-Nitra27
-rw-r--r--dvb-t/sk-Poprad40
-rw-r--r--dvb-t/sk-PovazskaBystrica27
-rw-r--r--dvb-t/sk-Presov27
-rw-r--r--dvb-t/sk-Prievidza27
-rw-r--r--dvb-t/sk-Revuca27
-rw-r--r--dvb-t/sk-Roznava27
-rw-r--r--dvb-t/sk-Ruzomberok27
-rw-r--r--dvb-t/sk-Snina27
-rw-r--r--dvb-t/sk-StaraLubovna27
-rw-r--r--dvb-t/sk-Sturovo27
-rw-r--r--dvb-t/sk-Trencin27
-rw-r--r--dvb-t/sk-Zilina27
-rw-r--r--dvb-t/tw-All143
-rw-r--r--dvb-t/ua-Kharkov53
-rw-r--r--dvb-t/ua-Kiev6
-rw-r--r--dvb-t/ua-Kyiv62
-rw-r--r--dvb-t/ua-Lozovaya53
-rw-r--r--dvb-t/ua-Odessa53
-rw-r--r--dvb-t/ua-Shostka55
-rw-r--r--dvb-t/ug-All61
-rw-r--r--dvb-t/uk-Aberdare80
-rw-r--r--dvb-t/uk-Angus95
-rw-r--r--dvb-t/uk-BeaconHill95
-rw-r--r--dvb-t/uk-Belmont94
-rw-r--r--dvb-t/uk-Bilsdale94
-rw-r--r--dvb-t/uk-BlackHill107
-rw-r--r--dvb-t/uk-Blaenplwyf80
-rw-r--r--dvb-t/uk-BluebellHill95
-rw-r--r--dvb-t/uk-Bressay80
-rw-r--r--dvb-t/uk-BrierleyHill93
-rw-r--r--dvb-t/uk-BristolIlchesterCrescent93
-rw-r--r--dvb-t/uk-BristolKingsWeston93
-rw-r--r--dvb-t/uk-Bromsgrove80
-rw-r--r--dvb-t/uk-BrougherMountain94
-rw-r--r--dvb-t/uk-Caldbeck95
-rw-r--r--dvb-t/uk-CaradonHill95
-rw-r--r--dvb-t/uk-Carmel80
-rw-r--r--dvb-t/uk-Chatton80
-rw-r--r--dvb-t/uk-Chesterfield80
-rw-r--r--dvb-t/uk-Craigkelly107
-rw-r--r--dvb-t/uk-CrystalPalace94
-rw-r--r--dvb-t/uk-Darvel95
-rw-r--r--dvb-t/uk-Divis94
-rw-r--r--dvb-t/uk-Dover80
-rw-r--r--dvb-t/uk-Durris95
-rw-r--r--dvb-t/uk-Eitshal80
-rw-r--r--dvb-t/uk-EmleyMoor107
-rw-r--r--dvb-t/uk-Fenham95
-rw-r--r--dvb-t/uk-Fenton95
-rw-r--r--dvb-t/uk-Ferryside54
-rw-r--r--dvb-t/uk-Guildford80
-rw-r--r--dvb-t/uk-Hannington94
-rw-r--r--dvb-t/uk-Hastings80
-rw-r--r--dvb-t/uk-Heathfield80
-rw-r--r--dvb-t/uk-HemelHempstead80
-rw-r--r--dvb-t/uk-HuntshawCross80
-rw-r--r--dvb-t/uk-Idle80
-rw-r--r--dvb-t/uk-KeelylangHill80
-rw-r--r--dvb-t/uk-Keighley80
-rw-r--r--dvb-t/uk-KilveyHill80
-rw-r--r--dvb-t/uk-KnockMore80
-rw-r--r--dvb-t/uk-Lancaster80
-rw-r--r--dvb-t/uk-LarkStoke80
-rw-r--r--dvb-t/uk-Limavady80
-rw-r--r--dvb-t/uk-Llanddona80
-rw-r--r--dvb-t/uk-Malvern80
-rw-r--r--dvb-t/uk-Mendip95
-rw-r--r--dvb-t/uk-Midhurst80
-rw-r--r--dvb-t/uk-MoelyParc95
-rw-r--r--dvb-t/uk-Nottingham93
-rw-r--r--dvb-t/uk-OliversMount80
-rw-r--r--dvb-t/uk-Oxford107
-rw-r--r--dvb-t/uk-PendleForest80
-rw-r--r--dvb-t/uk-Plympton80
-rw-r--r--dvb-t/uk-PontopPike107
-rw-r--r--dvb-t/uk-Pontypool80
-rw-r--r--dvb-t/uk-Preseli80
-rw-r--r--dvb-t/uk-Redruth80
-rw-r--r--dvb-t/uk-Reigate80
-rw-r--r--dvb-t/uk-RidgeHill95
-rw-r--r--dvb-t/uk-Rosemarkie80
-rw-r--r--dvb-t/uk-Rosneath84
-rw-r--r--dvb-t/uk-Rowridge107
-rw-r--r--dvb-t/uk-RumsterForest80
-rw-r--r--dvb-t/uk-Saddleworth80
-rw-r--r--dvb-t/uk-Salisbury80
-rw-r--r--dvb-t/uk-SandyHeath94
-rw-r--r--dvb-t/uk-Selkirk80
-rw-r--r--dvb-t/uk-Sheffield107
-rw-r--r--dvb-t/uk-StocklandHill80
-rw-r--r--dvb-t/uk-Storeton93
-rw-r--r--dvb-t/uk-Sudbury80
-rw-r--r--dvb-t/uk-SuttonColdfield107
-rw-r--r--dvb-t/uk-Tacolneston95
-rw-r--r--dvb-t/uk-TheWrekin80
-rw-r--r--dvb-t/uk-Torosay80
-rw-r--r--dvb-t/uk-TunbridgeWells80
-rw-r--r--dvb-t/uk-Waltham107
-rw-r--r--dvb-t/uk-Wenvoe107
-rw-r--r--dvb-t/uk-WhitehawkHill80
-rw-r--r--dvb-t/uk-WinterHill94
-rw-r--r--dvb-t/vn-Hanoi27
-rw-r--r--dvb-t/vn-Thaibinh27
1118 files changed, 42641 insertions, 4319 deletions
diff --git a/dvb-t/ad-Andorra b/dvb-t/ad-Andorra
index 7c63c82..e43251d 100644
--- a/dvb-t/ad-Andorra
+++ b/dvb-t/ad-Andorra
@@ -1,6 +1,49 @@
# DVB-T Andorra
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ar-Argentina b/dvb-t/ar-Argentina
deleted file mode 100644
index fb2e3d0..0000000
--- a/dvb-t/ar-Argentina
+++ /dev/null
@@ -1,63 +0,0 @@
-# ISDB-T channel frequencies as defined in Brazil
-# By ABNT NBR 15608-1
-# VHF channels 7 to 13 are also specified but not in usage yet
-#
-# UHF channels 14 to 69
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 473142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 14
-T 479142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 15
-T 485142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 16
-T 491142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 17
-T 497142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 18
-T 503142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 19
-T 509142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 20
-T 515142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 21
-T 521142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 22
-T 527142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 23
-T 533142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 24
-T 539142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 25
-T 545142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 26
-T 551142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 27
-T 557142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 28
-T 563142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 29
-T 569142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 30
-T 575142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 31
-T 581142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 32
-T 587142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 33
-T 593142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 34
-T 599142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 35
-T 605142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 36
-# channel 37 not used
-T 617142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 38
-T 623142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 39
-T 629142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 40
-T 635142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 41
-T 641142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 42
-T 647142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 43
-T 653142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 44
-T 659142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 45
-T 665142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 46
-T 671142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 47
-T 677142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 48
-T 683142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 49
-T 689142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 50
-T 695142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 51
-T 701142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 52
-T 707142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 53
-T 713142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 54
-T 719142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 55
-T 725142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 56
-T 731142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 57
-T 737142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 58
-T 743142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 59
-T 749142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 60
-T 755142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 61
-T 761142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 62
-T 767142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 63
-T 773142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 64
-T 779142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 65
-T 785142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 66
-T 791142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 67
-T 797142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 68
-T 803142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 69
-
diff --git a/dvb-t/at-All b/dvb-t/at-All
index 5d179eb..b83363d 100644
--- a/dvb-t/at-All
+++ b/dvb-t/at-All
@@ -1,53 +1,78 @@
-# Austria, all DVB-T transmitters run by ORS
-# Created from
-# http://www.ors.at/fileadmin/user_upload/downloads/DVB-T_Kanalbezeichnungen_und_Mittenfrequenzen.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 482000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 490000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 498000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 514000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 522000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 538000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 546000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 554000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 562000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 570000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE
-T 586000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 594000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 602000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 610000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 618000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 626000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 642000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 650000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 658000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 674000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 682000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 690000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 698000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 706000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 714000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 722000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 730000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 738000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 746000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 762000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 770000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 778000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 786000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 802000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 810000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 826000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 834000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 842000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 850000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 858000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+ STREAM_ID = 1
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+ STREAM_ID = 1
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+ STREAM_ID = 1
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+ STREAM_ID = 1
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+ STREAM_ID = 1
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+ STREAM_ID = 1
+
diff --git a/dvb-t/au-Adelaide b/dvb-t/au-Adelaide
index 923e701..3bcf839 100644..100755
--- a/dvb-t/au-Adelaide
+++ b/dvb-t/au-Adelaide
@@ -1,14 +1,79 @@
# Australia / Adelaide / Mt Lofty
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# Seven
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# SBS
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 564500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# 3D Trial Australia
-T 536625000 7MHz 3/4 NONE QAM16 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# ABC
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# Channel 44
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 564500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-AdelaideFoothills b/dvb-t/au-AdelaideFoothills
index 466a354..73dbe3d 100644
--- a/dvb-t/au-AdelaideFoothills
+++ b/dvb-t/au-AdelaideFoothills
@@ -1,12 +1,66 @@
# Australia / Adelaide / Grenfell Street
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 781625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 781625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 711500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine
-T 795500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 795500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten
-T 732500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 732500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 760500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 760500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Ballarat b/dvb-t/au-Ballarat
index c6c2a54..438ada9 100644
--- a/dvb-t/au-Ballarat
+++ b/dvb-t/au-Ballarat
@@ -1,12 +1,66 @@
# Australia / Ballarat
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 620625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 620625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 655500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# WIN
-T 592625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 592625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SC
-T 613500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 613500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 634625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Bendigo b/dvb-t/au-Bendigo
index a5df229..07f09ca 100644
--- a/dvb-t/au-Bendigo
+++ b/dvb-t/au-Bendigo
@@ -1,41 +1,326 @@
# Australia / Bendigo (Mt Alexandria transmitters)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 669500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 572500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 669500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 620500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 572500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 555250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 655500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 555250000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine
-T 576250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 576250000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 592500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten
-T 618250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618250000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 529500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 534250000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 534250000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# UNK1
-T 676500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 676500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# UNK2
-T 571500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-T 536625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 585625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 543500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 536500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 529500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 205500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 536625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 550500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 571500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 564500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 543500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 564500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 711500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 550500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Brisbane b/dvb-t/au-Brisbane
index 67d9290..a23cb9c 100644
--- a/dvb-t/au-Brisbane
+++ b/dvb-t/au-Brisbane
@@ -1,14 +1,79 @@
# Australia / Brisbane (Mt Coot-tha transmitters)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 585625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 31 Digital
-T 599500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Cairns b/dvb-t/au-Cairns
index 430045d..272c605 100644
--- a/dvb-t/au-Cairns
+++ b/dvb-t/au-Cairns
@@ -1,12 +1,66 @@
# Australia / Cairns (Mt Bellenden-Ker transmitters)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC VHF 8
-T 191500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SEVEN VHF 11
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# WIN VHF 12
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# TEN VHF 6 (Expected Start Date Dec 2006)
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS UHF 29
-T 536500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Canberra-Black-Mt b/dvb-t/au-Canberra-Black-Mt
index bdaa33c..e783e8a 100644
--- a/dvb-t/au-Canberra-Black-Mt
+++ b/dvb-t/au-Canberra-Black-Mt
@@ -1,12 +1,66 @@
# Australia / Canberra / Black Mt
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 205500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# WIN
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 543500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# ABC (ABC8)
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# Seven (CBN12)
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# (Nine (WIN11)
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# Ten (CTC6)
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# SBS (SBS7)
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Coonabarabran b/dvb-t/au-Coonabarabran
index 8596ba5..83a4e6a 100644
--- a/dvb-t/au-Coonabarabran
+++ b/dvb-t/au-Coonabarabran
@@ -1,16 +1,57 @@
# Australia / Coonabarabran
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# ABC VHF12
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# TEN UHF46
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 655500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine UHF45
-T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 648500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven VHF11
#T 618250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# SBS UHF44
-T 641500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# D44 UHF35
-#T 578500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Darwin b/dvb-t/au-Darwin
index 4c24e15..4e77194 100644
--- a/dvb-t/au-Darwin
+++ b/dvb-t/au-Darwin
@@ -1,11 +1,65 @@
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC (UHF 30)
-T 543625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 543625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine (UHF 31)
-T 550500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 550500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS (UHF 29)
-T 536625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Southern Cross (UHF 32)
-T 557625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 557625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Darwin Digital Television (UHF 33)
-T 564625000 7Mhz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 564625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Devonport b/dvb-t/au-Devonport
index 4985f09..da39e0d 100644
--- a/dvb-t/au-Devonport
+++ b/dvb-t/au-Devonport
@@ -1,19 +1,95 @@
# Australia / Tasmania / Devonport
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# Brett S Hallett October 2009 , may not be complete !!
#
# ABC VHF 57
-T 730250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730250000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# ABC Digital 45
-T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 648500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS VHF 54
-T 709250000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 709250000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS Digital 39
-T 606500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 606500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SCTV
-T 613498000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 613498000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# WIN
-T 627498000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 627498000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# TDT
-T 585498000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585498000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-FraserCoast-Bundaberg b/dvb-t/au-FraserCoast-Bundaberg
index 562fc34..ea93d82 100644
--- a/dvb-t/au-FraserCoast-Bundaberg
+++ b/dvb-t/au-FraserCoast-Bundaberg
@@ -1,12 +1,66 @@
# Australia / QLD / Fraser Coast - Bundaberg / Mt Goonaneman
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC VHF9A
-T 205625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS UHF28
-T 529500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven VHF7
-T 184625000 7MHz 2/3 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# WIN Wide Bay VHF10
-T 212500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Southern Cross Ten VHF9
-T 198525000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 198525000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-GoldCoast b/dvb-t/au-GoldCoast
index 64b3969..9f3a74b 100644
--- a/dvb-t/au-GoldCoast
+++ b/dvb-t/au-GoldCoast
@@ -2,20 +2,107 @@
# See http://www.dba.org.au/index.asp?sectionID=22&recLocation=Gold+Coast
# and http://www.dba.org.au/index.asp?sectionID=120
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC (UHF 62)
-T 767500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 767500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS (UHF 36)
-T 585500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven (UHF 53)
-T 704500000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 704500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# NBN (UHF 68)
-T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 809500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime (UHF 65)
-T 788500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 788500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Southern Cross Ten (UHF 43)
-T 634500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine (UHF 59)
-T 746500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten (UHF 56)
-T 725500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 725500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Goulburn-Rocky_Hill b/dvb-t/au-Goulburn-Rocky_Hill
index bff0dbe..259d9ea 100644
--- a/dvb-t/au-Goulburn-Rocky_Hill
+++ b/dvb-t/au-Goulburn-Rocky_Hill
@@ -1,19 +1,664 @@
# Australia / Goulburn / Rocky Hill
#
-# Scanned 17/10/2009 - Alex Ferrara (alex@receptiveit.com.au)
+# Scanned 31/07/2016 - Alex Ferrara (alex@receptiveit.com.au)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC - netid (4112) tid (547) offset (+125Khz)
-T 725625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[Nine Canberra]
+ SERVICE_ID = 2055
+ VIDEO_PID = 353
+ AUDIO_PID = 354
+ PID_0b = 8026
+ PID_06 = 355
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
-# SBS - netid (12802) tid (848) offset (+125Khz)
-T 746625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[9HD Canberra]
+ SERVICE_ID = 2247
+ VIDEO_PID = 1761
+ AUDIO_PID = 1762 1763 8025
+ PID_0b = 8026
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
-# WIN - netid (12915) tid (12922) offset (+125Khz)
-T 767625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[Nine Canberra]
+ SERVICE_ID = 2215
+ VIDEO_PID = 353
+ AUDIO_PID = 354
+ PID_0b = 8026
+ PID_06 = 355
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
-# Prime - netid (12929) tid (2462) offset (+125Khz)
-T 788625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[9Gem]
+ SERVICE_ID = 2087
+ VIDEO_PID = 1711
+ AUDIO_PID = 1712
+ PID_0b = 8026
+ PID_06 = 1713
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[9Go!]
+ SERVICE_ID = 2119
+ VIDEO_PID = 1721
+ AUDIO_PID = 1722
+ PID_0b = 8026
+ PID_06 = 1723
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[9Life]
+ SERVICE_ID = 2279
+ VIDEO_PID = 1771
+ AUDIO_PID = 1772
+ PID_0b = 8026
+ PID_06 = 1773
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[YESSHOP]
+ SERVICE_ID = 2151
+ VIDEO_PID = 1731
+ AUDIO_PID = 1732
+ PID_0b = 8026
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[Aspire]
+ SERVICE_ID = 2183
+ VIDEO_PID = 1741
+ AUDIO_PID = 1742
+ PID_0b = 8026
+ PID_05 = 8025
+ FREQUENCY = 641500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra]
+ SERVICE_ID = 1921
+ VIDEO_PID = 122
+ AUDIO_PID = 522
+ PID_0b = 102
+ PID_06 = 722
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra HD]
+ SERVICE_ID = 1939
+ VIDEO_PID = 125
+ AUDIO_PID = 525 725
+ PID_0b = 102
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ONE Canberra]
+ SERVICE_ID = 1922
+ VIDEO_PID = 123
+ AUDIO_PID = 523
+ PID_0b = 102
+ PID_06 = 723
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ELEVEN Canberra]
+ SERVICE_ID = 1926
+ VIDEO_PID = 124
+ AUDIO_PID = 524
+ PID_0b = 102
+ PID_06 = 724
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[WIN NETWORK]
+ SERVICE_ID = 1936
+ VIDEO_PID = 126
+ AUDIO_PID = 526
+ PID_0b = 102
+ PID_06 = 726
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[TVSN]
+ SERVICE_ID = 1928
+ VIDEO_PID = 116
+ AUDIO_PID = 516
+ PID_0b = 102
+ PID_06 = 716
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[GOLD]
+ SERVICE_ID = 1927
+ VIDEO_PID = 115
+ AUDIO_PID = 515
+ PID_0b = 102
+ PID_06 = 715
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ONE Canberra]
+ SERVICE_ID = 1925
+ VIDEO_PID = 123
+ AUDIO_PID = 523
+ PID_0b = 102
+ PID_06 = 723
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra]
+ SERVICE_ID = 1924
+ VIDEO_PID = 122
+ AUDIO_PID = 522
+ PID_0b = 102
+ PID_06 = 722
+ FREQUENCY = 634500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[PRIME7 Canberra]
+ SERVICE_ID = 2374
+ VIDEO_PID = 2740
+ AUDIO_PID = 2741
+ PID_0b = 2749
+ PID_06 = 2745
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[PRIME7 Canberra]
+ SERVICE_ID = 2400
+ VIDEO_PID = 2740
+ AUDIO_PID = 2741
+ PID_0b = 2749
+ PID_06 = 2745
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[PRIME7 Canberra]
+ SERVICE_ID = 2401
+ VIDEO_PID = 2740
+ AUDIO_PID = 2741
+ PID_0b = 2749
+ PID_06 = 2745
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[7TWO Canberra]
+ SERVICE_ID = 2402
+ VIDEO_PID = 4620
+ AUDIO_PID = 4621
+ PID_0b = 2749
+ PID_06 = 4625
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[7mate Canberra]
+ SERVICE_ID = 2403
+ VIDEO_PID = 4630
+ AUDIO_PID = 4632 4635
+ PID_0b = 2749
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ishoptv]
+ SERVICE_ID = 2405
+ VIDEO_PID = 4650
+ AUDIO_PID = 4651
+ PID_0b = 2749
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[RACING.COM]
+ SERVICE_ID = 2408
+ VIDEO_PID = 4680
+ AUDIO_PID = 4681
+ PID_0b = 2749
+ FREQUENCY = 627500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC News 24]
+ SERVICE_ID = 672
+ VIDEO_PID = 516
+ AUDIO_PID = 654 580 5500
+ PID_0b = 5501 5000
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC]
+ SERVICE_ID = 673
+ VIDEO_PID = 512
+ AUDIO_PID = 650
+ PID_0b = 5501 5000
+ PID_06 = 576
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC2/KIDS]
+ SERVICE_ID = 674
+ VIDEO_PID = 513
+ AUDIO_PID = 651
+ PID_0b = 5501 5000
+ PID_06 = 577
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC]
+ SERVICE_ID = 675
+ VIDEO_PID = 512
+ AUDIO_PID = 650
+ PID_0b = 5501 5000
+ PID_06 = 576
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC3]
+ SERVICE_ID = 676
+ VIDEO_PID = 514
+ AUDIO_PID = 652
+ PID_0b = 5501 5000
+ PID_06 = 578
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[Double J]
+ SERVICE_ID = 678
+ AUDIO_PID = 690
+ PID_0b = 5501
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[ABC Jazz]
+ SERVICE_ID = 679
+ AUDIO_PID = 700
+ PID_0b = 5501
+ PID_05 = 5500
+ FREQUENCY = 620500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS ONE]
+ SERVICE_ID = 849
+ VIDEO_PID = 161
+ AUDIO_PID = 81
+ PID_0b = 7000 5000
+ PID_06 = 41
+ PID_05 = 7849
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS HD]
+ SERVICE_ID = 853
+ VIDEO_PID = 102
+ AUDIO_PID = 103
+ PID_0b = 7000 5000
+ PID_06 = 43
+ PID_05 = 7853
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS TWO]
+ SERVICE_ID = 850
+ VIDEO_PID = 162
+ AUDIO_PID = 83
+ PID_0b = 7000 5000
+ PID_06 = 42
+ PID_05 = 7850
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[Food Network]
+ SERVICE_ID = 851
+ VIDEO_PID = 163
+ AUDIO_PID = 85
+ PID_0b = 7000 5000
+ PID_06 = 44
+ PID_05 = 7849
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[NITV]
+ SERVICE_ID = 852
+ VIDEO_PID = 164
+ AUDIO_PID = 87
+ PID_0b = 7000 5000
+ PID_06 = 45
+ PID_05 = 7852
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS Radio 1]
+ SERVICE_ID = 862
+ AUDIO_PID = 201
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS Radio 2]
+ SERVICE_ID = 863
+ AUDIO_PID = 202
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
+
+[SBS Radio 3]
+ SERVICE_ID = 864
+ AUDIO_PID = 203
+ FREQUENCY = 613500000
+ MODULATION = QAM/256
+ BANDWIDTH_HZ = 0
+ INVERSION = AUTO
+ CODE_RATE_HP = NONE
+ CODE_RATE_LP = AUTO
+ GUARD_INTERVAL = 1/32
+ TRANSMISSION_MODE = 2K
+ HIERARCHY = NONE
+ DELIVERY_SYSTEM = DVBT
-# TEN - netid (12812) tid (2055) offset (0Khz)
-T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-Hervey_Bay-Ghost_Hill b/dvb-t/au-Hervey_Bay-Ghost_Hill
index 04dee51..e35869a 100644
--- a/dvb-t/au-Hervey_Bay-Ghost_Hill
+++ b/dvb-t/au-Hervey_Bay-Ghost_Hill
@@ -1,16 +1,81 @@
# Australia / Hervey Bay / Ghost Hill
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# ABC UHF56
-T 725500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 725500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven UHF59
-T 746500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine UHF62
-T 767625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 767625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten UHF68
-T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 809500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS UHF28
-T 529500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS UHF34
-T 704500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 704500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Hobart b/dvb-t/au-Hobart
index b2b60e8..c94c53f 100644
--- a/dvb-t/au-Hobart
+++ b/dvb-t/au-Hobart
@@ -1,12 +1,66 @@
# Australia / Tasmania / Hobart
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC VHF 8
-T 191500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS VHF 9a
-T 205500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SCT VHF 10
-T 212500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# WIN VHF 7
-T 184625000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# TDT VHF 11
-T 219500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Mackay b/dvb-t/au-Mackay
index e7fbfc0..f894007 100644
--- a/dvb-t/au-Mackay
+++ b/dvb-t/au-Mackay
@@ -1,14 +1,68 @@
# Australia / Mackay (Mt Blackwood transmitters)
# aufreq=((UHF channel number)*8+306)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 212500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven Network
-T 205500000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# WIN Digital
-T 578500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Southern Cross Ten
-T 557500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 557500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 536500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Melbourne b/dvb-t/au-Melbourne
index 6fefbea..cc742ff 100644
--- a/dvb-t/au-Melbourne
+++ b/dvb-t/au-Melbourne
@@ -1,12 +1,88 @@
-# Australia / Melbourne (Mt Dandenong transmitters)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 536625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20130331 1 0 TERRESTRIAL AU </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Australia / Melbourne (Mt Dandenong transmitters)
+# date (yyyy-mm-dd) : 2014-08-17
+# provided by (opt) : <your name or email here>
+#
+#------------------------------------------------------------------------------
+# Seven Network
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# SBS Melbourne
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# Nine Network Australia
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# Network TEN
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# ABC Melbourne
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# C31
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 557625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Melbourne-Selby b/dvb-t/au-Melbourne-Selby
index 36d20e4..2219466 100644
--- a/dvb-t/au-Melbourne-Selby
+++ b/dvb-t/au-Melbourne-Selby
@@ -1,13 +1,66 @@
# Australia / Melbourne (Selby Repeater)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 662500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 662500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 620500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 711500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 683500000 7MHz AUTO NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 683500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
diff --git a/dvb-t/au-Melbourne-Upwey b/dvb-t/au-Melbourne-Upwey
index 2171845..978e2ad 100644
--- a/dvb-t/au-Melbourne-Upwey
+++ b/dvb-t/au-Melbourne-Upwey
@@ -1,12 +1,66 @@
# Australia / Melbourne (Upwey Repeater)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 662500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 662500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 620500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 711500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 683500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 683500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-MidNorthCoast b/dvb-t/au-MidNorthCoast
index baf3ba5..714d8da 100644
--- a/dvb-t/au-MidNorthCoast
+++ b/dvb-t/au-MidNorthCoast
@@ -1,22 +1,131 @@
# Australia ABC Mid North Coast
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC middle brother
-T 184625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime Middle Brother
-T 198500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# NBN Middle Brother
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten Middle Brother
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS middle brother
-T 205500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# ABC Moombil
-T 585500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime Moombil
-T 543500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 543500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# NBN Moombil
-T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 564500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten Moombil
-T 599500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 599500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS Moombil
-T 606500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 606500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Newcastle b/dvb-t/au-Newcastle
index 8fc4552..39fab93 100644
--- a/dvb-t/au-Newcastle
+++ b/dvb-t/au-Newcastle
@@ -1,12 +1,66 @@
# Australia / Newcastle
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# SBS
-T 599500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 599500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# NBN
-T 585500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime
-T 704500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# ABC
-T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 592500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SC10
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 606500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Perth b/dvb-t/au-Perth
index 48c046f..4c6fb09 100644
--- a/dvb-t/au-Perth
+++ b/dvb-t/au-Perth
@@ -1,12 +1,66 @@
# Australia / Perth
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven Network
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine Network
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Network TEN
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 536625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Perth_Roleystone b/dvb-t/au-Perth_Roleystone
index 496a750..f02cc23 100644
--- a/dvb-t/au-Perth_Roleystone
+++ b/dvb-t/au-Perth_Roleystone
@@ -1,12 +1,66 @@
# Australia / Perth (Roleystone transmitter)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# SBS
-T 704500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 704500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# ABC
-T 725500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 725500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven
-T 746500000 7MHz 2/3 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine
-T 767500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 767500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten
-T 788500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 788500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-SpencerGulf b/dvb-t/au-SpencerGulf
index 474d66a..9983110 100644
--- a/dvb-t/au-SpencerGulf
+++ b/dvb-t/au-SpencerGulf
@@ -1,8 +1,40 @@
# Australia / South Australia / Pt Pirie (THE BLUFF)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 599500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 599500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Southern Cross
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 620500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 620500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-SunshineCoast b/dvb-t/au-SunshineCoast
index c376678..ff6f5dd 100644
--- a/dvb-t/au-SunshineCoast
+++ b/dvb-t/au-SunshineCoast
@@ -1,12 +1,66 @@
# Australia / Sunshine Coast
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# SBS36 SBS ***
-T 585625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# TNQ47 10 ***
-T 662625000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
-# ABQ62 ABC ***
-T 767625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# STQ65 7 ***
-T 788625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# STQ68 WIN ***
-T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# SBS40 SBS ***
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 613500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# TNQ44 10 ***
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# ABC41 ABC ***
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 620500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# STQ42 7 ***
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 627500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# RTQ43 WIN ***
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Sutherland b/dvb-t/au-Sutherland
index 6c21a73..403f4be 100644
--- a/dvb-t/au-Sutherland
+++ b/dvb-t/au-Sutherland
@@ -3,18 +3,61 @@
# Australia modulation params:
# - http://www.dba.org.au/index.asp?sectionID=120
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# North (Broadcast Site Escarpment Road BROKERS NOSE)
# - http://www.dba.org.au/index.asp?query=true&sectionID=22&recLocation=Wollongong+%2D+North
#
#Channel 7 stations
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#Channel 9 bundle
# T 191500000 7MHz AUTO AUTO AUTO AUTO AUTO AUTO
#One and Channel 10
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#Aunty
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#SBS
-T 571500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 571500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Sydney b/dvb-t/au-Sydney
new file mode 100644
index 0000000..19e7be3
--- /dev/null
+++ b/dvb-t/au-Sydney
@@ -0,0 +1,82 @@
+# Australia / Sydney (transmitters at Artarmon/Gore Hill/Willoughby)
+#
+# ## Service - Channel - Network owner
+#
+## ABC - CH12 - ABC
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+## ATN - CH6 - Seven Network
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+## TCN - CH8 - Nine Network
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+## TEN - CH11 - Network Ten
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+## SBS - CH7 - SBS
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+## TSN - CH29 - Community Television
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Sydney_Kings_Cross b/dvb-t/au-Sydney_Kings_Cross
index ef77870..f61fb98 100644
--- a/dvb-t/au-Sydney_Kings_Cross
+++ b/dvb-t/au-Sydney_Kings_Cross
@@ -1,14 +1,68 @@
# Australia / Sydney / Kings Cross and North Head
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# ABC UHF30
-T 543500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 543500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven UHF48
-T 669500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 669500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine UHF33
-T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 564500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten UHF45
-T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 648500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS UHF34
-T 571500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 571500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Sydney_North_Shore b/dvb-t/au-Sydney_North_Shore
deleted file mode 100644
index b35cb12..0000000
--- a/dvb-t/au-Sydney_North_Shore
+++ /dev/null
@@ -1,16 +0,0 @@
-# Australia / Sydney / North Shore (aka Artarmon/Gore Hill/Willoughby)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# ABC VHF12
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven VHF6
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine VHF8
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten VHF11
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS VHF7
-T 184500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# TVS UHF29
-T 536625000 7MHz 2/3 NONE QPSK 8k 1/8 NONE
diff --git a/dvb-t/au-Tamworth b/dvb-t/au-Tamworth
index 8d28c42..87c3180 100644
--- a/dvb-t/au-Tamworth
+++ b/dvb-t/au-Tamworth
@@ -1,38 +1,200 @@
# Australia / NSW / New England / Tamworth / Mt.Soma
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# SBS
-T 690500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# NBN
-T 753500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 753500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime
-T 732500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 732500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# ABC
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 711500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SC10
-T 774500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 774500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Australia / NSW / New England / Upper Namoi / Mt.Dowe
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# SBS
-T 585500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# NBN
-T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 592500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime
-T 205625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# ABC
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SC10
-T 613500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 613500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Australia / NSW / Western Districts / Central Western Slopes / Mt. Cenn Cruaich
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# SBS
-T 641500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# WIN
-T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 648500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 620500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# ABC
-T 226625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SC10
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Townsville b/dvb-t/au-Townsville
index e411cd4..d7c8b6c 100644
--- a/dvb-t/au-Townsville
+++ b/dvb-t/au-Townsville
@@ -1,12 +1,66 @@
# Australia / Brisbane (Mt Coot-tha transmitters)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# SBS
-T 592500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 592500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# ABC
-T 550500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 550500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven
-T 599500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 599500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 620500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten
-T 585500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-WaggaWagga b/dvb-t/au-WaggaWagga
index cc38f88..d0762c7 100644
--- a/dvb-t/au-WaggaWagga
+++ b/dvb-t/au-WaggaWagga
@@ -1,12 +1,66 @@
# Australia / Wagga Wagga (Mt Ulundra)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 655500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 669500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 669500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime
-T 662500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 662500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Southern Cross Ten
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# WIN
-T 683500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 683500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-Wollongong b/dvb-t/au-Wollongong
index 6fbf7bf..94fe744 100644
--- a/dvb-t/au-Wollongong
+++ b/dvb-t/au-Wollongong
@@ -3,33 +3,131 @@
# Australia modulation params:
# - http://www.dba.org.au/index.asp?sectionID=120
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# North (Broadcast Site Escarpment Road BROKERS NOSE)
# - http://www.dba.org.au/index.asp?query=true&sectionID=22&recLocation=Wollongong+%2D+North
#
# ABC UHF52
-T 697500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 697500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime UHF46
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 655500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# WIN UHF40
-T 613500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 613500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten UHF43
-T 634500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS UHF54
-T 711625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 711625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# Illawarra (Broadcast Australia Digital Television Tower KNIGHTS HILL)
# - http://www.dba.org.au/index.asp?query=true&sectionID=22&recLocation=Wollongong+%2D+Illawarra
#
# ABC UHF51
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Prime UHF38
-T 599500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 599500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# WIN UHF36
-T 585500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten UHF37
-T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 592500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS - same as North
#
# Stanwell Park (Bald Hill STANWELL TOPS)
@@ -37,4 +135,15 @@ T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
#
# ABC, Prime, WIN, Ten are identical to Wollongong / North
# SBS UHF49
-T 676500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 676500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-canberra b/dvb-t/au-canberra
index 792844d..79a094a 100644
--- a/dvb-t/au-canberra
+++ b/dvb-t/au-canberra
@@ -1,12 +1,66 @@
# Australia / Canberra / Woden
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 205625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Seven
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Nine
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Ten
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# SBS
-T 543500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 543500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/au-unknown b/dvb-t/au-unknown
index 9f96d9e..c8d16b3 100644
--- a/dvb-t/au-unknown
+++ b/dvb-t/au-unknown
@@ -1,3 +1,13 @@
# Australia ABC
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 226500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/auto-Australia b/dvb-t/auto-Australia
index 393ac7f..f58fae3 100644
--- a/dvb-t/auto-Australia
+++ b/dvb-t/auto-Australia
@@ -7,104 +7,1203 @@
# print "T ", $freq + 125000, " 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
# }
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 177625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 184500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 184625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 191500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 191625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 198500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 198625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 205500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 205625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 212625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 219625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 226625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 529500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 529625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 536500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 536625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 543500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 543625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 550500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 550625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 557500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 557625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 564500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 564625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 571500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 571625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 585500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 585625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 592500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 592625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 599500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 599625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 606500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 606625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 613500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 613625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 620500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 620625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 627500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 627625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 641500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 641625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 648500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 648625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 655500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 655625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 662500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 662625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 669500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 669625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 676500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 676625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 683500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 683625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 697500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 697625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 704500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 704625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 711500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 711625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 718500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 718625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 725500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 725625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 732500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 732625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 739500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 739625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 753500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 753625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 760500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 760625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 767500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 767625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 774500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 774625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 781500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 781625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 788500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 788625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 795500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 795625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 809500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 809625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 816500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 816625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 198625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 212625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 543500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 543625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 550500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 550625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 557500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 557625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 564500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 564625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 571500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 571625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 592500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 592625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 599500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 599625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 606500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 606625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 613500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 613625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 620500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 620625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 627500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 627625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 648500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 648625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 655500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 655625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 662500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 662625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 669500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 669625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 676500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 676625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 683500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 683625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 697500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 697625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 704500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 704625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 711500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 711625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 718500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 718625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 725500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 725625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 732500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 732625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 739500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 739625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 753500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 753625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 760500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 760625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 767500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 767625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 774500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 774625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 781500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 781625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 788500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 788625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 795500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 795625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 809500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 809625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 816500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 816625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/auto-Default b/dvb-t/auto-Default
index 5aedde9..add81b9 100644
--- a/dvb-t/auto-Default
+++ b/dvb-t/auto-Default
@@ -5,61 +5,687 @@
# print "T $freq 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
# }
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 184500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 191500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 198500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 205500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 474000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 482000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 490000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 498000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 506000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 514000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 522000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 530000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 538000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 546000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 554000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 562000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 570000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 586000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 594000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 602000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 610000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 618000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 626000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 642000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 650000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 658000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 666000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 674000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 682000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 698000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 706000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 714000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 722000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 730000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 738000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 754000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 762000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 770000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 778000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 786000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 794000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 810000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 818000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 826000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 834000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 842000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 850000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 858000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/auto-Taiwan b/dvb-t/auto-Taiwan
index c32af48..3b2fb9f 100644
--- a/dvb-t/auto-Taiwan
+++ b/dvb-t/auto-Taiwan
@@ -2,17 +2,159 @@
# print "T $freq 6MHz AUTO NONE AUTO AUTO AUTO NONE\n";
# }
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 527000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 533000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 539000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 545000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 551000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 557000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 563000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 569000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 575000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 581000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 587000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 593000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 599000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 527000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 533000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 539000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 545000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 551000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 557000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 563000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 569000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 575000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 581000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 587000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 593000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 599000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/auto-With167kHzOffsets b/dvb-t/auto-With167kHzOffsets
index 5dfbd2e..3542db0 100644
--- a/dvb-t/auto-With167kHzOffsets
+++ b/dvb-t/auto-With167kHzOffsets
@@ -7,159 +7,1863 @@
# print "T ", $freq + 167000, " 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
# }
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 184500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 191500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 198500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 205500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 474000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 473833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 474167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 482000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 481833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 482167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 490000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 489833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 490167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 498000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 497833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 498167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 506000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 505833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 506167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 514000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 513833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 514167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 522000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 521833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 522167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 530000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 529833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 530167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 538000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 537833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 538167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 546000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 545833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 546167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 554000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 553833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 554167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 562000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 561833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 562167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 570000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 569833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 570167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 577833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 586000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 585833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 586167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 594000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 593833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 594167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 602000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 601833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 602167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 610000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 609833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 610167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 618000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 617833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 618167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 626000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 625833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 626167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 633833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 642000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 641833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 642167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 650000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 649833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 650167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 658000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 657833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 658167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 666000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 665833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 666167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 674000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 673833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 674167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 682000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 681833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 682167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 689833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 698000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 697833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 698167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 706000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 705833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 706167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 714000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 713833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 714167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 722000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 721833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 722167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 730000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 729833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 730167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 738000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 737833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 738167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 745833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 754000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 753833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 754167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 762000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 761833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 762167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 770000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 769833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 770167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 778000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 777833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 778167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 786000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 785833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 786167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 794000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 793833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 794167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 801833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 810000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 809833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 810167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 818000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 817833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 818167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 826000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 825833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 826167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 834000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 833833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 834167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 842000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 841833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 842167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 850000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 849833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 850167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 858000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 857833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 858167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 473833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 481833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 489833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 497833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 505833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 513833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 521833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 537833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 553833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 561833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 569833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 577833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 593833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 601833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 609833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 617833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 625833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 633833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 649833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 657833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 665833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 673833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 681833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 689833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 697833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 705833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 713833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 721833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 729833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 737833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 745833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 753833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 761833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 769833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 777833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 793833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 801833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 809833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 817833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 825833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 833833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 841833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 849833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 857833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ax-Smedsbole b/dvb-t/ax-Smedsbole
index fa9bc03..19e206d 100644
--- a/dvb-t/ax-Smedsbole
+++ b/dvb-t/ax-Smedsbole
@@ -7,7 +7,28 @@
# date (yyyy-mm-dd) : 2009-12-23
# provided by (opt) : k.hampf@gmail.com
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
#------------------------------------------------------------------------------
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Ã…land Network
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Ã…land Network
+[Ã…land Network]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Ã…land Network]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/be-All b/dvb-t/be-All
index 3d9f913..c957c06 100644
--- a/dvb-t/be-All
+++ b/dvb-t/be-All
@@ -1,8 +1,62 @@
# Belgium, whole country
# Created from http://nl.wikipedia.org/wiki/DVB-T-frequenties
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 834000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/bg-Sofia b/dvb-t/bg-Sofia
index 82cc037..1d39d1c 100644
--- a/dvb-t/bg-Sofia
+++ b/dvb-t/bg-Sofia
@@ -7,10 +7,52 @@
# date (yyyy-mm-dd) : 2013-05-13
# provided by (opt) : v.lalov@gmail.com
#
-# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
#------------------------------------------------------------------------------
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # NURTS Digital
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # NURTS Digital
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # First Digital
-T 818000000 8MHz 2/3 NONE QAM16 8k 1/16 NONE # NURTS
-
+[NURTS Digital]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[NURTS Digital]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[First Digital]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[NURTS]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/br-Brazil b/dvb-t/br-Brazil
deleted file mode 100644
index fb2e3d0..0000000
--- a/dvb-t/br-Brazil
+++ /dev/null
@@ -1,63 +0,0 @@
-# ISDB-T channel frequencies as defined in Brazil
-# By ABNT NBR 15608-1
-# VHF channels 7 to 13 are also specified but not in usage yet
-#
-# UHF channels 14 to 69
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 473142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 14
-T 479142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 15
-T 485142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 16
-T 491142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 17
-T 497142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 18
-T 503142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 19
-T 509142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 20
-T 515142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 21
-T 521142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 22
-T 527142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 23
-T 533142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 24
-T 539142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 25
-T 545142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 26
-T 551142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 27
-T 557142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 28
-T 563142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 29
-T 569142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 30
-T 575142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 31
-T 581142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 32
-T 587142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 33
-T 593142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 34
-T 599142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 35
-T 605142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 36
-# channel 37 not used
-T 617142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 38
-T 623142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 39
-T 629142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 40
-T 635142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 41
-T 641142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 42
-T 647142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 43
-T 653142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 44
-T 659142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 45
-T 665142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 46
-T 671142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 47
-T 677142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 48
-T 683142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 49
-T 689142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 50
-T 695142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 51
-T 701142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 52
-T 707142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 53
-T 713142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 54
-T 719142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 55
-T 725142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 56
-T 731142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 57
-T 737142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 58
-T 743142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 59
-T 749142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 60
-T 755142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 61
-T 761142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 62
-T 767142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 63
-T 773142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 64
-T 779142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 65
-T 785142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 66
-T 791142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 67
-T 797142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 68
-T 803142857 6MHz AUTO AUTO AUTO AUTO AUTO NONE # channel 69
-
diff --git a/dvb-t/ca-AB-Calgary b/dvb-t/ca-AB-Calgary
deleted file mode 100644
index 041f38c..0000000
--- a/dvb-t/ca-AB-Calgary
+++ /dev/null
@@ -1,19 +0,0 @@
-#------------------------------------------------------------------------------
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20110502 1 0 ATSC CA </w_scan>
-#------------------------------------------------------------------------------
-# location and provider: Calgary AB, Canada OTA
-# date (yyyy-mm-dd) : 2014-01-18
-
-# provided by (opt) : shadowofdarkness@gmail.com
-#
-# A[2] <freq> <mod> [# comment]
-#-----------------------------
--------------------------------------------------
-A 515000000 8VSB
-A 563000000 8VSB
-A 581000000 8VSB
-A 617000000 8VSB
-A 635000000 8VSB
-A 683000000 8VSB
diff --git a/dvb-t/ch-All b/dvb-t/ch-All
index 2e2e273..0ff77ca 100644
--- a/dvb-t/ch-All
+++ b/dvb-t/ch-All
@@ -1,32 +1,339 @@
# Switzerland, whole country
# Created from http://www.broadcast.ch/portal.aspx?pid=705
# and http://www.broadcast.ch/data_program_dvbt.aspx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 522000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 538000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 554000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 562000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 602000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 618000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 626000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 642000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 658000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 658000000 8MHz 5/6 NONE QAM16 8k 1/8 NONE
-T 666000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 674000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 682000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 690000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 698000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 706000000 8MHz 1/2 NONE QAM16 8k 1/4 NONE
-T 714000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 722000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 722000000 8MHz 5/6 NONE QAM16 8k 1/8 NONE
-T 738000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 754000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 762000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 786000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 802000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 826000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 850000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ch-Citycable b/dvb-t/ch-Citycable
index 1b9ed6c..ef58d06 100644
--- a/dvb-t/ch-Citycable
+++ b/dvb-t/ch-Citycable
@@ -1,18 +1,325 @@
# Lausanne - Switzerland (DVB-T on CityCable cable network)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 522000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 554000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 570000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 578000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 586000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 610000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 618000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 626000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 658000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 730000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 746000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 818000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 826000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 834000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 842000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 7/8
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ch-Geneva b/dvb-t/ch-Geneva
index 7ad0ae4..a64cc94 100644
--- a/dvb-t/ch-Geneva
+++ b/dvb-t/ch-Geneva
@@ -1,16 +1,147 @@
# Switzerland, Geneva region
# Updated by tkernen@deckpoint.ch on 2010/12/03
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
#------------------------------------------------------------------------------
-T 570166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 578000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 658166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 666166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 682166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 1/2 NONE QAM16 8k 1/4 NONE
-T 746166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 1/2 NONE QPSK 2k 1/32 NONE
-T 770166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 794166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 818166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 850166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/co-All b/dvb-t/co-All
new file mode 100644
index 0000000..c06056a
--- /dev/null
+++ b/dvb-t/co-All
@@ -0,0 +1,34 @@
+# initial scan file for Colombia, national level
+# DVB-T2, 470-860MHz, 6MHz bandwidth
+# See: https://es.wikipedia.org/wiki/Televisi%C3%B3n_Digital_Terrestre_en_Colombia
+# See: https://www.crcom.gov.co/recursos_user/Documentos_CRC_2012/Actividades_Regulatorias/TDT/documentos_soporte_TDT_20120914.pdf#page=51
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 473000000
+ BANDWIDTH_HZ = 6000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 479000000
+ BANDWIDTH_HZ = 6000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 485000000
+ BANDWIDTH_HZ = 6000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 491000000
+ BANDWIDTH_HZ = 6000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 551000000
+ BANDWIDTH_HZ = 6000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 557000000
+ BANDWIDTH_HZ = 6000000
diff --git a/dvb-t/cz-All b/dvb-t/cz-All
index c01c0a1..672f2c6 100644
--- a/dvb-t/cz-All
+++ b/dvb-t/cz-All
@@ -1,44 +1,483 @@
# Czech Republic, whole country (updated to regulatory 2013)
# Created from http://www.ctu.cz/cs/download/plan-vyuziti-radioveho-spektra/rok_2012/pv-p_10-08_2012-11.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Baden-Wuerttemberg b/dvb-t/de-Baden-Wuerttemberg
index bc69e09..07ead31 100644
--- a/dvb-t/de-Baden-Wuerttemberg
+++ b/dvb-t/de-Baden-Wuerttemberg
@@ -1,19 +1,194 @@
# DVB-T Baden-Württemberg
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsPlus
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: SWR-BW, Bayerisches Fernsehen, hr, WDR
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: SWR-BW, Bayerisches Fernsehen, hr, WDR
-T 634000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH41: SWR-BW, Bayerisches Fernsehen, hr, WDR
-T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, arte, Phoenix, EinsPlus
-T 666000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH45: RTL, RTL2, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: SWR-BW, Bayerisches Fernsehen, hr, WDR
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: SWR-BW, Bayerisches Fernsehen, hr, WDR
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Das Erste, arte, Phoenix, EinsPlus
-T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: Das Erste, arte, Phoenix, EinsPlus
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Das Erste, arte, Phoenix, EinsPlus
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Das Erste, arte, Phoenix, EinsPlus
+[CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH26: Das Erste, arte, Phoenix, EinsPlus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH39: SWR-BW, Bayerisches Fernsehen, hr, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH40: SWR-BW, Bayerisches Fernsehen, hr, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH41: SWR-BW, Bayerisches Fernsehen, hr, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH43: Das Erste, arte, Phoenix, EinsPlus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH45: RTL, RTL2, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH49: SWR-BW, Bayerisches Fernsehen, hr, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH50: SWR-BW, Bayerisches Fernsehen, hr, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH52: Das Erste, arte, Phoenix, EinsPlus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH54: Das Erste, arte, Phoenix, EinsPlus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH59: Das Erste, arte, Phoenix, EinsPlus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH60: Das Erste, arte, Phoenix, EinsPlus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Bayern b/dvb-t/de-Bayern
index bf3b55e..a71cbca 100644
--- a/dvb-t/de-Bayern
+++ b/dvb-t/de-Bayern
@@ -1,29 +1,273 @@
# DVB-T Bayern
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
+[CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH25: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH27: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
+[CH27: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH28: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: Das Erste, arte, Phoenix, EinsPlus
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: Das Erste, arte, Phoenix, EinsPlus
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Das Erste, arte, Phoenix, EinsPlus
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: Bayerisches Fernsehen, BR-alpha, MDR, hr
+[CH29: Das Erste, arte, Phoenix, One]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH30: Das Erste, arte, Phoenix, One]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH34: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH36: Das Erste, arte, Phoenix, One]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH39: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH40: Bayerisches Fernsehen, BR-alpha, MDR, hr]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH40: Das Erste, arte, Phoenix, EinsPlus
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: Das Erste, arte, Phoenix, EinsPlus
+[CH41: Das Erste, arte, Phoenix, One]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH42: Das Erste, arte, Phoenix, One]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Das Erste, arte, Phoenix, EinsPlus
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: Bayerisches Fernsehen, BR-alpha, MDR, hr
+[CH44: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH45: Das Erste, arte, Phoenix, One]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH46: Bayerisches Fernsehen, BR-alpha, MDR, hr]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH46: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
-T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: Bayerisches Fernsehen, BR-alpha, MDR, hr
+[CH47: Bayerisches Fernsehen, BR-alpha, MDR, hr]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH47: Das Erste, arte, Phoenix, EinsPlus
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Das Erste, arte, Phoenix, EinsPlus
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
+[CH49: Das Erste, arte, Phoenix, One]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH53: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH53: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: Das Erste, arte, Phoenix, EinsPlus
+[CH55: Das Erste, arte, Phoenix, One]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH58: Bayerisches Fernsehen, BR-alpha, MDR, hr]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Berlin b/dvb-t/de-Berlin
index 4881a88..79d29b5 100644
--- a/dvb-t/de-Berlin
+++ b/dvb-t/de-Berlin
@@ -1,12 +1,110 @@
# DVB-T Berlin
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH25: RTL, RTL2, Super RTL, VOX
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH27: Das Erste, RBB, Phoenix, EinsExtra / BrandenburgAktuell
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # CH39: QVC, DasVierte, Bibel.TV, BR-Fernsehen, n-tv, EuroNews/Channe21 Shop + 7 Radioprogr
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH44: ProSieben, Sat.1, Kabel1, N24
-T 682000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH47: MDR, NDR, arte, hr
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH50: Tele5, HSE 24, WDR, SWR (BW / RP)
-T 754000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH56: Eurosport, TV.B, Music1, sixx,
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH59: BerlinerSpreekanal / JuveloTV, ServusTV, Anixe
+[CH25: RTL, RTL2, Super RTL, VOX]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH27: Das Erste, RBB, Phoenix, EinsExtra / BrandenburgAktuell]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH39: QVC, DasVierte, Bibel.TV, BR-Fernsehen, n-tv, EuroNews/Channe21 Shop + 7 Radioprogr]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH44: ProSieben, Sat.1, Kabel1, N24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH47: MDR, NDR, arte, hr]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH50: Tele5, HSE 24, WDR, SWR (BW / RP)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH56: Eurosport, TV.B, Music1, sixx,]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH59: BerlinerSpreekanal / JuveloTV, ServusTV, Anixe]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Brandenburg b/dvb-t/de-Brandenburg
index d9c6f5c..223126e 100644
--- a/dvb-t/de-Brandenburg
+++ b/dvb-t/de-Brandenburg
@@ -1,7 +1,50 @@
# DVB-T Brandenburg
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 730000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE # CH53: Das Erste, RBB, Phoenix, EinsExtra
-T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: MDR, NDR, arte
+[CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH53: Das Erste, RBB, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH57: MDR, NDR, arte]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Bremen b/dvb-t/de-Bremen
index 1b4a86c..24ab8eb 100644
--- a/dvb-t/de-Bremen
+++ b/dvb-t/de-Bremen
@@ -1,9 +1,74 @@
# DVB-T Bremen
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: Das Erste (RB), RB TV (NDR NDS), arte, Phoenix
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: RTL, RTL2, Super RTL, VOX
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Tele 5, SIXX, QVC, Mona / Bibel TV / Das Vierte
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: ProSieben, Sat.1, Kabel1, N24
+[CH22: Das Erste (RB), RB TV (NDR NDS), arte, Phoenix]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH29: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH42: RTL, RTL2, Super RTL, VOX]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH45: Tele 5, SIXX, QVC, Mona / Bibel TV / Das Vierte]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH49: ProSieben, Sat.1, Kabel1, N24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Dusseldorf b/dvb-t/de-Dusseldorf
new file mode 100644
index 0000000..aaf5a53
--- /dev/null
+++ b/dvb-t/de-Dusseldorf
@@ -0,0 +1,144 @@
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Hamburg b/dvb-t/de-Hamburg
index 806e2d6..7a43b78 100644
--- a/dvb-t/de-Hamburg
+++ b/dvb-t/de-Hamburg
@@ -1,11 +1,98 @@
# DVB-T Hamburg
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste, arte, Phoenix, EinsExtra
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Tele5, Das Vierte, QVC, Channel21/ Euronews
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL, RTL2, Super RTL, VOX
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: SIXX, Hamburg 1, Bibel TV, Eurosport
-T 738000000 8MHz 1/2 NONE QAM64 8k 1/8 NONE # CH54: NDR HH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR SH
+[CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH30: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH33: Das Erste, arte, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH36: Tele5, Das Vierte, QVC, Channel21/ Euronews]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH40: RTL, RTL2, Super RTL, VOX]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH46: SIXX, Hamburg 1, Bibel TV, Eurosport]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH54: NDR HH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR SH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Hessen b/dvb-t/de-Hessen
index b1fca3a..636e30c 100644
--- a/dvb-t/de-Hessen
+++ b/dvb-t/de-Hessen
@@ -1,19 +1,194 @@
# DVB-T Hessen
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: hr, Bayerisches Fernsehen, SWR-RP, WDR
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: Das Erste, Phoenix, arte, EinsExtra
-T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: RTL, RTL2, Super RTL, VOX
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: hr, Bayerisches Fernsehen, SWR-RP, MDR
-T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: Das Erste, Phoenix, arte, EinsExtra
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: hr, Bayerisches Fernsehen, SWR-RP, rbb
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, Phoenix, arte, EinsExtra
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Tele5, QVC, rheinmaintv / Channel21, iMusic1 / Anixe
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: hr, Bayerisches Fernsehen, SWR-BW, WDR
-T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: ProSieben, Sat.1, Kabel1, N24
-T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: hr, NDR, MDR, WDR
+[CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH24: hr, Bayerisches Fernsehen, SWR-RP, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH32: Das Erste, Phoenix, arte, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH34: RTL, RTL2, Super RTL, VOX]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH35: hr, Bayerisches Fernsehen, SWR-RP, MDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH37: Das Erste, Phoenix, arte, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH39: hr, Bayerisches Fernsehen, SWR-RP, rbb]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH43: Das Erste, Phoenix, arte, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH45: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH52: Tele5, QVC, rheinmaintv / Channel21, iMusic1 / Anixe]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH53: hr, Bayerisches Fernsehen, SWR-BW, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH54: ProSieben, Sat.1, Kabel1, N24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH55: hr, NDR, MDR, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Mecklenburg-Vorpommern b/dvb-t/de-Mecklenburg-Vorpommern
index 2d92c87..259012f 100644
--- a/dvb-t/de-Mecklenburg-Vorpommern
+++ b/dvb-t/de-Mecklenburg-Vorpommern
@@ -1,12 +1,110 @@
# DVB-T Mecklenburg-Vorpommernen
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: Das Erste, NDR MVP, RBB, MDR/NDR SH
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, NDR MVP, RBB, MDR/NDR SH
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: Das Erste, NDR MVP, RBB, MDR/NDR SH
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Das Erste, NDR MVP, RBB, MDR/NDR SH
-T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+[CH22: Das Erste, NDR MVP, RBB, MDR/NDR SH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH26: Das Erste, NDR MVP, RBB, MDR/NDR SH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH29: Das Erste, NDR MVP, RBB, MDR/NDR SH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH36: Das Erste, NDR MVP, RBB, MDR/NDR SH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH37: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH40: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH46: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH53: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Niedersachsen b/dvb-t/de-Niedersachsen
index a02bd59..496e1c4 100644
--- a/dvb-t/de-Niedersachsen
+++ b/dvb-t/de-Niedersachsen
@@ -1,29 +1,270 @@
# DVB-T Niedersachsen
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: Das Erste (RB), RB TV (NDR NDS), arte, Phoenix
+[CH21: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH22: Das Erste (RB), RB TV (NDR NDS), arte, Phoenix]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH22: Das Erste, arte, Phoenix, EinsExtra
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: RTL, RTL2, Super RTL, VOX
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsExtra
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: Tele 5, Nickelodeon/Comedy Central, Eurosport, Mona / Bibel TV / Das Vierte
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 610000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH38: Das Erste, arte, Phoenix, EinsExtra
+[CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH24: RTL, RTL2, Super RTL, VOX]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH26: Das Erste, arte, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH28: Tele 5, Nickelodeon/Comedy Central, Eurosport, Mona / Bibel TV / Das Vierte]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH29: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH36: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH38: Das Erste, arte, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH38: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: RTL, RTL2, Super RTL, VOX
+[CH42: RTL, RTL2, Super RTL, VOX]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, arte, Phoenix, EinsExtra
+[CH43: Das Erste, arte, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH43: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: ProSieben, Sat.1, Kabel1, N24
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Tele 5, SIXX, QVC, Mona / Bibel TV / Das Vierte
-T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: Das Erste, arte, Phoenix, EinsExtra
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: Das Erste, arte, Phoenix, EinsExtra
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: ProSieben, Sat.1, Kabel1, N24
-T 770000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH58: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Das Erste, arte, Phoenix, EinsExtra
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Tele 5, Nickelodeon/Comedy Central, Eurosport, Mona / Bibel TV / Das Vierte
+[CH44: ProSieben, Sat.1, Kabel1, N24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH45: Tele 5, SIXX, QVC, Mona / Bibel TV / Das Vierte]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH47: Das Erste, arte, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH48: Das Erste, arte, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH49: ProSieben, Sat.1, Kabel1, N24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH58: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH59: Das Erste, arte, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH60: Tele 5, Nickelodeon/Comedy Central, Eurosport, Mona / Bibel TV / Das Vierte]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Nordrhein-Westfalen b/dvb-t/de-Nordrhein-Westfalen
index e0fbec3..940d18d 100644
--- a/dvb-t/de-Nordrhein-Westfalen
+++ b/dvb-t/de-Nordrhein-Westfalen
@@ -1,23 +1,231 @@
# DVB-T Nordrhein-Westfalen
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH25: WDR-Dortmund, NDR/WDR-Ruhr, MDR, SWR
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsFestival
+[CH25: WDR-Dortmund, NDR/WDR-Ruhr, MDR, SWR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH26: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# CH26: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 522000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH27: WDR-Südwestfalen, NDR, MDR, SWR
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: RTL, RTL2, Super RTL, VOX
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 554000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH31: WDR-OWL_aktuell, NDR/WDR-Südwestfalen, MDR, SWR
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Tele5, CNN, Eurosport, VIVA
-T 602000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH37: WDR-Aachen, NDR/WDR-Köln, MDR, SWR
-T 674000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH46: WDR-Düsseldorf, MDR/WDR-Duisburg, NDR/WDR-Berg.Land, SWR
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: Das Erste, arte, Phoenix, EinsFestival
-T 698000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH49: WDR-Köln, MDR/WDR-Bonn, NDR/WDR-Aachen, SWR
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: Das Erste, arte, Phoenix, EinsFestival
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Tele5, CNN, Eurosport, VIVA
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: ProSieben, Sat.1, Kabel1, N24
-T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: ProSieben, Sat.1, Kabel1, N24
-T 762000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH57: WDR-Ruhr, NDR/WDR-Dortmund, MDR, SWR
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Das Erste, arte, Phoenix, EinsFestival
+[CH27: WDR-Südwestfalen, NDR, MDR, SWR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH29: RTL, RTL2, Super RTL, VOX]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH31: WDR-OWL_aktuell, NDR/WDR-Südwestfalen, MDR, SWR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH36: Tele5, CNN, Eurosport, VIVA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH37: WDR-Aachen, NDR/WDR-Köln, MDR, SWR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH46: WDR-Düsseldorf, MDR/WDR-Duisburg, NDR/WDR-Berg.Land, SWR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH48: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH49: WDR-Köln, MDR/WDR-Bonn, NDR/WDR-Aachen, SWR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH50: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH52: Tele5, CNN, Eurosport, VIVA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH53: ProSieben, Sat.1, Kabel1, N24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH55: ProSieben, Sat.1, Kabel1, N24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH57: WDR-Ruhr, NDR/WDR-Dortmund, MDR, SWR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH60: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Rheinland-Pfalz b/dvb-t/de-Rheinland-Pfalz
index c8f4b9e..8779942 100644
--- a/dvb-t/de-Rheinland-Pfalz
+++ b/dvb-t/de-Rheinland-Pfalz
@@ -1,11 +1,98 @@
# DVB-T Rheinland-Pfalz
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: SWR-RP, Bayerisches Fernsehen, hr, WDR
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: SWR-RP, Bayerisches Fernsehen, hr, WDR
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: Das Erste, arte, Phoenix, EinsPlus
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: SWR-RP, Bayerisches Fernsehen, hr, WDR
-T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH56: Das Erste, arte, Phoenix, EinsPlus
-T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: Das Erste, arte, Phoenix, EinsPlus
+[CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH33: SWR-RP, Bayerisches Fernsehen, hr, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH44: SWR-RP, Bayerisches Fernsehen, hr, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH46: Das Erste, arte, Phoenix, EinsPlus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH48: SWR-RP, Bayerisches Fernsehen, hr, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH56: Das Erste, arte, Phoenix, EinsPlus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH57: Das Erste, arte, Phoenix, EinsPlus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Saarland b/dvb-t/de-Saarland
index a55037d..4809557 100644
--- a/dvb-t/de-Saarland
+++ b/dvb-t/de-Saarland
@@ -1,7 +1,50 @@
# DVB-T Saarland
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: Das Erste, SR Fernsehen, arte, Phoenix
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: SWR-RP, Bayerisches Fernsehen, hr, WDR
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Tele5, QVC, Bibel.TV, freie Kapazität
+[CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH42: Das Erste, SR Fernsehen, arte, Phoenix]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH44: SWR-RP, Bayerisches Fernsehen, hr, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH49: Tele5, QVC, Bibel.TV, freie Kapazität]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Sachsen b/dvb-t/de-Sachsen
index 274a949..ad87514 100644
--- a/dvb-t/de-Sachsen
+++ b/dvb-t/de-Sachsen
@@ -1,14 +1,134 @@
# DVB-T Sachsen
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH24: Das Erste, arte, Phoenix, EinsFestival
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH25: Das Erste, arte, Phoenix, EinsFestival
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH27: MDR-SN, rbb, Bayerisches Fernsehen, WDR
-T 530000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH28: RTL, RTL2, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH29: MDR-SN, rbb, Bayerisches Fernsehen, WDR
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/16 NONE # CH31: LF Leipzg.Ferns., InfoTVLeipzig, BBCWorld, Bibel.TV, RadioLeipzig, RadioHoreb
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH32: MDR-SN, rbb, Bayerisches Fernsehen, WDR
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH37: MDR-SN, rbb, Bayerisches Fernsehen, WDR
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH39: Das Erste, arte, Phoenix, EinsFestival
+[CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH24: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH25: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH27: MDR-SN, rbb, Bayerisches Fernsehen, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH28: RTL, RTL2, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH29: MDR-SN, rbb, Bayerisches Fernsehen, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH31: LF Leipzg.Ferns., InfoTVLeipzig, BBCWorld, Bibel.TV, RadioLeipzig, RadioHoreb]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH32: MDR-SN, rbb, Bayerisches Fernsehen, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH37: MDR-SN, rbb, Bayerisches Fernsehen, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH39: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Sachsen-Anhalt b/dvb-t/de-Sachsen-Anhalt
index 2b2afba..9925a2d 100644
--- a/dvb-t/de-Sachsen-Anhalt
+++ b/dvb-t/de-Sachsen-Anhalt
@@ -1,13 +1,122 @@
# DVB-T Sachsen-Anhalt
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH24: Das Erste, arte, Phoenix, EinsFestival
-T 530000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH28: RTL, RTL2, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH29: Das Erste, arte, Phoenix, EinsFestival
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH34: MDR-ST, rbb, NDR, WDR
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH38: MDR-ST, rbb, NDR, WDR
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH41: Das Erste, arte, Phoenix, EinsFestival
-T 746000000 8MHz 2/3 NONE QPSK 8k 1/8 NONE # CH55: TV Halle (Testbetrieb)
+[CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH24: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH28: RTL, RTL2, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH29: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH34: MDR-ST, rbb, NDR, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH38: MDR-ST, rbb, NDR, WDR]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH41: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH55: TV Halle (Testbetrieb)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Schleswig-Holstein b/dvb-t/de-Schleswig-Holstein
index 634f51b..00976ac 100644
--- a/dvb-t/de-Schleswig-Holstein
+++ b/dvb-t/de-Schleswig-Holstein
@@ -1,18 +1,182 @@
# DVB-T Schleswig-Holstein
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsExtra
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste, arte, Phoenix, EinsExtra
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL, RTL2, Super RTL, VOX
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: RTL, RTL2, Super RTL, VOX
-T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: Das Erste, arte, Phoenix, EinsExtra
-T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: Tele 5, SIXX, das Vierte, Bibel TV
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Tele 5, SIXX, das Vierte, Bibel TV
+[CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH24: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH26: Das Erste, arte, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH30: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH33: Das Erste, arte, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH35: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH39: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH40: RTL, RTL2, Super RTL, VOX]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH45: RTL, RTL2, Super RTL, VOX]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH47: Das Erste, arte, Phoenix, EinsExtra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH57: Tele 5, SIXX, das Vierte, Bibel TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH59: Tele 5, SIXX, das Vierte, Bibel TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/de-Thueringen b/dvb-t/de-Thueringen
index 887dae8..72fa945 100644
--- a/dvb-t/de-Thueringen
+++ b/dvb-t/de-Thueringen
@@ -1,10 +1,86 @@
# DVB-T Thüringen
# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH21: Das Erste, arte, Phoenix, EinsFestival
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH25: Das Erste, arte, Phoenix, EinsFestival
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH27: MDR-TH, rbb, hr, Bayerisches Fernsehen
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH48: MDR-TH, rbb, hr, Bayerisches Fernsehen
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH53: Das Erste, arte, Phoenix, EinsFestival
+[CH21: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH25: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH27: MDR-TH, rbb, hr, Bayerisches Fernsehen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH48: MDR-TH, rbb, hr, Bayerisches Fernsehen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH50: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH53: Das Erste, arte, Phoenix, EinsFestival]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/dk-All b/dvb-t/dk-All
index 931b1af..6bd590c 100644
--- a/dvb-t/dk-All
+++ b/dvb-t/dk-All
@@ -1,23 +1,231 @@
# Denmark, whole country
# Created from http://www.digi-tv.dk/Indhold_og_tilbud/frekvenser.asp
# and http://www.digi-tv.dk/Sendenettets_opbygning/
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ee-All b/dvb-t/ee-All
new file mode 100644
index 0000000..689a35a
--- /dev/null
+++ b/dvb-t/ee-All
@@ -0,0 +1,393 @@
+# Estonia, whole country
+# Created from http://www.levira.ee/transmitter.pdf
+# and http://wiki.wifi.ee/index.php/DVB-T#Tehniline_teave
+# Additional MUX info http://www.levira.ee/program.pdf
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Albacete b/dvb-t/es-Albacete
index 7d93802..d64012e 100644
--- a/dvb-t/es-Albacete
+++ b/dvb-t/es-Albacete
@@ -1,14 +1,145 @@
# Spain, Albacete - Update 2010/08/12 (Freud)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 37: La Regional, TCM, CRN
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 46: Sogecuatro, laSexta2, laSexta3 (Todos pendientes de asignar)
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 47: CNC, Vision6, ABTeVe, Punto Radio
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 50: Boing, La 10, MTV, Punto Radio
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 53: Nitro, Marca TV, Veo13
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 56: TVE HD, Teledeporte, Pruebas TVE, RNE 1, RNE CLÃSICA, RNE 3
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 59: La 1, La 2, 24H, Clan, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: CMT, CMT2, RCM
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo7, Tienda en Veo, Intereconomía, AXN, Teledeporte, Radio Intereconomía, Radio Marca, esRadio, Vaughan Radio
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, Canal+ Dos, Canal Club, LaSexta, SER, 40 Principales, Cadena Dial
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, La Siete, FDF, CincoShop, Disney Channel, Punto Radio
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Neox, Nova, Gol Televisión, Onda Cero, Europa FM, Onda Melodía
+[Canal 37: La Regional, TCM, CRN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 46: Sogecuatro, laSexta2, laSexta3 (Todos pendientes de asignar)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 47: CNC, Vision6, ABTeVe, Punto Radio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 50: Boing, La 10, MTV, Punto Radio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 53: Nitro, Marca TV, Veo13]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 56: TVE HD, Teledeporte, Pruebas TVE, RNE 1, RNE CLÃSICA, RNE 3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 59: La 1, La 2, 24H, Clan, RNE1, RNE Clásica, RNE 3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 63: CMT, CMT2, RCM]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: Veo7, Tienda en Veo, Intereconomía, AXN, Teledeporte, Radio Intereconomía, Radio Marca, esRadio, Vaughan Radio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: Cuatro, CNN+, 40 Latino, Canal+ Dos, Canal Club, LaSexta, SER, 40 Principales, Cadena Dial]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: Telecinco, La Siete, FDF, CincoShop, Disney Channel, Punto Radio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: Antena 3, Neox, Nova, Gol Televisión, Onda Cero, Europa FM, Onda Melodía ]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Alfabia b/dvb-t/es-Alfabia
index 504cf0a..ee20e68 100644
--- a/dvb-t/es-Alfabia
+++ b/dvb-t/es-Alfabia
@@ -1,14 +1,145 @@
# DVB-T Alfabia, Mallorca, Balearic Islands, Spain.
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV3 Cat, 3/24, 33, Super3/300
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Nitro, A3TVHD, 13TV, Tienda
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV Mallorca, Canal 4
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Popular TV, TEVEi
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Xplora, laSexta3, laSextaHD, CuatroHD, Energy
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Boing, TelecincoHD, Paramount
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # La1HD, TDP, TDPHD
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.63: 24h, 50 aniv., ClanTV, La 2, TVE1; RNE 1, RNE 3, RNE C; Digitext, EPG, Lanzadera.
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.65: IB3, IB3HD, Metropolitan TV
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.67: Cuatro, La Sexta, GolTV, Divinity, Nueve
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.68: Tele 5, La7, FDF, Disney Channel, Intereconomía
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.69: Antena 3, Discovery Max, Neox, Nova, AXN
+[TV3 Cat, 3/24, 33, Super3/300]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Nitro, A3TVHD, 13TV, Tienda]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[TV Mallorca, Canal 4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Popular TV, TEVEi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Xplora, laSexta3, laSextaHD, CuatroHD, Energy]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Boing, TelecincoHD, Paramount]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[La1HD, TDP, TDPHD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C.63: 24h, 50 aniv., ClanTV, La 2, TVE1; RNE 1, RNE 3, RNE C; Digitext, EPG, Lanzadera.]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C.65: IB3, IB3HD, Metropolitan TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C.67: Cuatro, La Sexta, GolTV, Divinity, Nueve]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C.68: Tele 5, La7, FDF, Disney Channel, Intereconomía]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C.69: Antena 3, Discovery Max, Neox, Nova, AXN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Alicante b/dvb-t/es-Alicante
index c8b5620..a95a492 100644
--- a/dvb-t/es-Alicante
+++ b/dvb-t/es-Alicante
@@ -1,9 +1,85 @@
# DVB-T Alicante, Spain
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 55: TV3, K33/33, 3/24, Canal 300
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+[Canal 55: TV3, K33/33, 3/24, Canal 300]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 63: Telemadrid, La Otra, Onda 6]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: Veo, Veo 2, Net TV, Teledeporte]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Almeria b/dvb-t/es-Almeria
new file mode 100644
index 0000000..a6481e6
--- /dev/null
+++ b/dvb-t/es-Almeria
@@ -0,0 +1,108 @@
+# Spain, Almeria - Update 2016/03/17 (denise_amiga)
+[Canal 34: Interalmeria TV, 8TV, Tubienstar Astrocanal, Canal 28]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 36: Atreseries HD, Energy HD, Real Madrid TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 38: Boing, Energy, Mega, 13TV, Onda Cero, Europa FM, Melodia FM, Cope]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 41: Antena 3, Antena 3HD, laSexta, laSecta HD, Neox, Nova]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 44: Telecinco, Telecinco HD, Cuatro, Cuatro HD, FDF, Divinity]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 47: TDP, TDP HD 9Kiss TV, 10, Radio Clasica HQ, Radio 3 HQ, Radio Exterior RNE Kiss FM, Canal Ingenieria]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 57: La 1, La 1 HD, La 2, 24h, Clan, Radio, Radio 5]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 58: 13TV, Discovery MAX, Disney Channel, Paramount Channel, Cope, Radio Maria, Radio Marca, Vaughan Radio, esRadio, Guide Plus+]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 59: Canal Sur, Canal Sur 2, Andalucia TV, EHS TV, Canal Sur Radio, Flamenco Radio, Canal Fiesta Radio, Radio Andalucia Informacion]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
diff --git a/dvb-t/es-Alpicat b/dvb-t/es-Alpicat
index fe4f726..be46742 100644
--- a/dvb-t/es-Alpicat
+++ b/dvb-t/es-Alpicat
@@ -1,8 +1,73 @@
# DVB-T Alpicat (Lleida)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c58: TV3, K3/33, 3/24, 300, 3i
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c64: TVE1, TVE2, Teledeporte, C24h
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c67: Cuatro, 40Latino, CNN+, LaSexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c68: T5, T5 Sports, T5 Estrellas, Net Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2
+[c58: TV3, K3/33, 3/24, 300, 3i]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[c64: TVE1, TVE2, Teledeporte, C24h]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[c67: Cuatro, 40Latino, CNN+, LaSexta 1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[c68: T5, T5 Sports, T5 Estrellas, Net Fly Music]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Asturias b/dvb-t/es-Asturias
index f5069df..283b912 100644
--- a/dvb-t/es-Asturias
+++ b/dvb-t/es-Asturias
@@ -1,8 +1,194 @@
# DVB-T Asturias
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TPA TPA2
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVE 1, TVE 2, 24H TVE, CLAN/50 TVE, RNE1, RNE CLASICA, RNE3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TELEDEPORTE, VEO TV, VEO 2, NET TV
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CUATRO, CNN+, 40 LATINO, LA SEXTA 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TELECINCO, T5 ESTRELLAS, T5 SPORT, FLYMUSIC
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2
+[Canal 22: Atreseries HD, Energy HD, Real Madrid TV, Be Mad]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# START CANGAS DE NARCEA Y LLANES
+[Canal 25: Ed. Prensa Asturiana, TeleNarcea, TeleAvilés, UTE Opalo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+# END CANGAS DE NARCEA Y LLANES
+
+[Canal 27: Boing, Energy, Mega, 13 TV, Onda Cero, Europa FM, Melodía FM, Cope]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 28: Telecinco, Telecinco HD, Cuatro, Cuatro HD, FDF, Divinity]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 32: Antena 3, Antena 3 HD, laSexta, laSexta HD, Neox, Nova]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 35: Proximamente, Discovery Max, Disney Channel, Paramount Channel, Cope, Radio María, Radio Marca, Vaughan Radio, esRadio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# START GIJÓN
+[Canal 38: Muy Muy TV, Canal 10, Astrocanal]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+# END GIJÓN
+
+[Canal 39: La 1, La 1 HD, La 2, 24h, Clan, Radio Nacional, Radio 5]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 42: TDP, TDP HD, KISS, TEN, Radio Clásica HQ, Radio 3 HQ, Radio Exterior RNE, Kiss FM]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# START OVIEDO
+[Canal 43: Ed. Prensa Asturiana, Oviedo TV, Canal 10]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+# END OVIEDO
+
+# START INFIESTO
+[Canal 44: Ed. Prensa Asturiana, TeleAvilés, UTE Opalo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+# END INFIESTO
+
+[Canal 45: TPA7, TPA8, TPA HD, RPA, Radio Langreo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# START MIERES
+[Canal 46: Cuencas Mineras TV, Producciones Grela]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+# END MIERES
+
+# START AVILÉS
+[Canal 47: Ed. Prensa Asturiana, Canal 10, TeleAvilés]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+# END AVILÉS
+
+# START LUARCA-VALDÉS
+[Canal 56: Ed. Prensa Asturiana, TeleAvilés, ORT]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+# END LUARCA-VALDÉS
diff --git a/dvb-t/es-BaixoMinho b/dvb-t/es-BaixoMinho
index 6f6fde4..ffc1de8 100644
--- a/dvb-t/es-BaixoMinho
+++ b/dvb-t/es-BaixoMinho
@@ -6,11 +6,76 @@
# date (yyyy-mm-dd) : 2009-07-11
# provided by (opt) : neonmann@gmail.com
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
#------------------------------------------------------------------------------
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # RAR Pontevedra
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # RGE GALICIA
+[SFN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[SFN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[RAR Pontevedra]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[RGE GALICIA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Bilbao b/dvb-t/es-Bilbao
index 8331363..c4233f0 100644
--- a/dvb-t/es-Bilbao
+++ b/dvb-t/es-Bilbao
@@ -1,6 +1,72 @@
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: CNN+. Cuatro, La Sexta, 40 latino TV
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, La Sexta 2, Neo, Nova, Telehit, Onda Cero, Europa FM, Onda Melodia
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 61: ETB1, ETB2, ETB-Sat, Canal Vasco, Euskadi Irratia, Radio Euskadi, Euskadi Gastea, Radio EITB
+[Canal 67: CNN+. Cuatro, La Sexta, 40 latino TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: Antena 3, La Sexta 2, Neo, Nova, Telehit, Onda Cero, Europa FM, Onda Melodia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 63: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: Veo, Veo 2, Net TV, Teledeporte]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 61: ETB1, ETB2, ETB-Sat, Canal Vasco, Euskadi Irratia, Radio Euskadi, Euskadi Gastea, Radio EITB]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Cadiz b/dvb-t/es-Cadiz
index 68ace6b..4155003 100644
--- a/dvb-t/es-Cadiz
+++ b/dvb-t/es-Cadiz
@@ -1,8 +1,294 @@
-# DVB-T Cadiz (Andalucia) by terrex Feb 2009
-# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C59
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C64
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C67
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C68
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C69
+# DVB-T Cadiz (Andalusia) by xiterrex Aug 2014
+# Info obtained from Spanish Government (Ministerio de Industria) at URL:
+# <http://www.minetur.gob.es/telecomunicaciones/infraestructuras/paginas/tdt_ict.aspx>
+[C21 # MPE2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 # RGE1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 # RGE1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C24 # TL02CA Arcos
+[C27 # RGE2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C27 # TL06CA Olvera
+[C28 # TL01CA Algeciras]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C30 # TL05CA Jerez]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C33 # RGE2 (Main)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C38 # MPE3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41 # MPE2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C43 # TL08CA Medina]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 # MPE1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C46 # AND]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 # MPE3 (Main)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C50 # TL07CA Ubrique]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52 # RGE2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C52 # TL04CA Chiclana
+[C53 # MPE1 (Main)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54 # TL03CA Cadiz]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 # MPE2 (Main)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 # RGE1 (Main)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59 # AND (Main)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C64 # RGE1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C67 # MD67]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C68 # MD68]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C69 # MD69]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Carceres b/dvb-t/es-Carceres
index 3d3f77c..8f52a46 100644
--- a/dvb-t/es-Carceres
+++ b/dvb-t/es-Carceres
@@ -1,10 +1,108 @@
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 39: 8Madrid, TMT-Popular TV, Kiss TV, Intereconomía TV
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 50: EsMadrid TV, Ver-t, EM2, Libertad Digital TV
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 61: Canal Extremadura, Extremadura Television
+[Canal 39: 8Madrid, TMT-Popular TV, Kiss TV, Intereconomía TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 50: EsMadrid TV, Ver-t, EM2, Libertad Digital TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 63: Telemadrid, La Otra, Onda 6]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: Veo, Veo 2, Net TV, Teledeporte]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 61: Canal Extremadura, Extremadura Television]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Collserola b/dvb-t/es-Collserola
index 395bd16..60c73f0 100644
--- a/dvb-t/es-Collserola
+++ b/dvb-t/es-Collserola
@@ -1,12 +1,121 @@
# DVB-T Collserola (Barcelona)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c26: BTV, TV Badalona, TV L'Hospitalet, TV del Besòs, COM Ràdio, Ràdio Ciutat Badalona, Ràdio L'Hospitalet
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c33: 8TV, Barça TV, EDC3, 105TV, RAC 1, RAC 105
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c43: TV3HD, 3/24, Canal 9, IB3, Catalunya Música, iCat FM
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c48: Urbe TV, Canal Català, 25 TV, Localia, Ona FM, Onda Rambla, Sensació Ràdio
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c61: TV3, 33, 3/24, K3/300, Catalunya Ràdio, Catalunya Informació
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c64: TVE1, TVE2, TVE 24H, Clan/TVE 50 Años, RNE1, RNEC, RNE3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c66: Veo7, Sony TV en Veo, Tienda en Veo, Intereconomía, Teledeporte, Radio Intereconomía, Radio Marca
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c67: Cuatro, CNN+, 40 Latino, La Sexta, Ser, 40 Principales, Cadena Dial
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c68: Telecino, La Siete, FDF, CincoShop, Disney Channel, Punto Radio
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c69: Antena 3, Antena.Neox, Antena.Nova, Hogar 10, Onda Cero, Europa FM, Onda Melodía
+[BTV, TV Badalona, TV L'Hospitalet, TV del Besòs, COM Ràdio, Ràdio Ciutat Badalona, Ràdio L'Hospitalet]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[8TV, Barça TV, EDC3, 105TV, RAC 1, RAC 105]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[TV3HD, 3/24, Canal 9, IB3, Catalunya Música, iCat FM]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Urbe TV, Canal Català, 25 TV, Localia, Ona FM, Onda Rambla, Sensació Ràdio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[TV3, 33, 3/24, K3/300, Catalunya Ràdio, Catalunya Informació]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[TVE1, TVE2, TVE 24H, Clan/TVE 50 Años, RNE1, RNEC, RNE3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Veo7, Sony TV en Veo, Tienda en Veo, Intereconomía, Teledeporte, Radio Intereconomía, Radio Marca]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Cuatro, CNN+, 40 Latino, La Sexta, Ser, 40 Principales, Cadena Dial]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Telecino, La Siete, FDF, CincoShop, Disney Channel, Punto Radio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Antena 3, Antena.Neox, Antena.Nova, Hogar 10, Onda Cero, Europa FM, Onda Melodía]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Donostia b/dvb-t/es-Donostia
index fe38efd..a760346 100644
--- a/dvb-t/es-Donostia
+++ b/dvb-t/es-Donostia
@@ -1,13 +1,122 @@
# The channels with 1/32 guard-interval are French and should be perfectly visible
# here. However I have only managed to get a lock for the channel 57 of the French ones.
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Granada b/dvb-t/es-Granada
index 05847f1..1545b96 100644
--- a/dvb-t/es-Granada
+++ b/dvb-t/es-Granada
@@ -1,8 +1,73 @@
# Spain, Granada
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Huesca b/dvb-t/es-Huesca
index aaada34..53cb087 100644
--- a/dvb-t/es-Huesca
+++ b/dvb-t/es-Huesca
@@ -1,15 +1,124 @@
# DVB-T Huesca (Aragon) [Spain] [es-Huesca]
# Generated by Vicente Hernando Ara <bizenton@gmail.com>
-# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
#------------------------------------------------------------------------------
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH 43 HTV-HuescaTelevision
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH 44 La Sexta 2
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH 45 TVE HD
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH 48 NITRO
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH 54 BOING
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH 57 ARAGON TV
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH 61 TVE
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH 67
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH 68
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH 69
+[CH 43 HTV-HuescaTelevision]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH 44 La Sexta 2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH 45 TVE HD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH 48 NITRO]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH 54 BOING]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH 57 ARAGON TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH 61 TVE]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH 67]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH 68]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH 69]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Las_Palmas b/dvb-t/es-Las_Palmas
index f260327..da971ee 100644
--- a/dvb-t/es-Las_Palmas
+++ b/dvb-t/es-Las_Palmas
@@ -3,16 +3,147 @@
# Revisada y corregida por el Grupo de Usuarios de Linux de Canarias
# http://www.gulic.org
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 28: TVE HD, Teledeporte, RNE Clásica, RNE 3
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 32: Boing, Telecinco HD, La 10, MTV, Punto Radio
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 35: Sogecuatro, LaSexta2, LaSexta3
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 38: Nitro, Antena 3 HD, Marca TV, Veo13
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 44: Canal 7 Gran Canaria, TIC Canal 8, Canal 4, RTI
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 52: Localia, Nueve TV, Nueve Radio
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 60: TVE1, TVE2, 24H TVE, Clan/TVE, RNE, RNEC, RNE3, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 65: TV C, TV C2, Antena 3 Canarias, Popular TV, Canarias Radio, Cope, Cadena 100, Radio ECCA, Lanzadera, Ticker, Piloto TDT
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo7, Tienda en Veo, AXN, Intereconomia, Teledeporte, Radio Intereconomia, Radio Marca, esRadio, Vaughan Radio, Canal Ingeniería, GUIDE Plus +, C66Gancho, C66Lanzadera, C66EPG, EpgNet
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, Canal+ Dos, Canal Club, laSexta, SER, 40 Principales, Cadena Dial, Lanzadera, EPG TDT, Ticker, Lanzadera, Noticias, EPG
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, La Siete, FDF, CincoShop, Disney Channel, T5Lanzadera, T5Digitext, Noticias, Tiempo, Bolsa, Tráfico
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Neox, Nova, Gol Televisión, Onda Cero, Europa FM, Onda Melodía, tvtv DIGITAL, A3Lanzadera, A3Portal, A3EPG, A3Ticker, T-seniority, Gol Bar
+[Canal 28: TVE HD, Teledeporte, RNE Clásica, RNE 3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 32: Boing, Telecinco HD, La 10, MTV, Punto Radio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 35: Sogecuatro, LaSexta2, LaSexta3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 38: Nitro, Antena 3 HD, Marca TV, Veo13]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 44: Canal 7 Gran Canaria, TIC Canal 8, Canal 4, RTI]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 52: Localia, Nueve TV, Nueve Radio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 60: TVE1, TVE2, 24H TVE, Clan/TVE, RNE, RNEC, RNE3, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 65: TV C, TV C2, Antena 3 Canarias, Popular TV, Canarias Radio, Cope, Cadena 100, Radio ECCA, Lanzadera, Ticker, Piloto TDT]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: Veo7, Tienda en Veo, AXN, Intereconomia, Teledeporte, Radio Intereconomia, Radio Marca, esRadio, Vaughan Radio, Canal Ingeniería, GUIDE Plus +, C66Gancho, C66Lanzadera, C66EPG, EpgNet]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: Cuatro, CNN+, Canal+ Dos, Canal Club, laSexta, SER, 40 Principales, Cadena Dial, Lanzadera, EPG TDT, Ticker, Lanzadera, Noticias, EPG]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: Telecinco, La Siete, FDF, CincoShop, Disney Channel, T5Lanzadera, T5Digitext, Noticias, Tiempo, Bolsa, Tráfico]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: Antena 3, Neox, Nova, Gol Televisión, Onda Cero, Europa FM, Onda Melodía, tvtv DIGITAL, A3Lanzadera, A3Portal, A3EPG, A3Ticker, T-seniority, Gol Bar]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Lugo b/dvb-t/es-Lugo
index 7b76544..53164a7 100644
--- a/dvb-t/es-Lugo
+++ b/dvb-t/es-Lugo
@@ -1,9 +1,74 @@
# DVB-T Lugo (Centro emisor Paramo) - Rev. 1.2 - 11.12.05
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVE 1, TVE 2, 24H TVE, CLAN/50 TVE, RNE1, RNE CLASICA, RNE3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVG, GALICIA TV AMERICA, RADIO GALEGA, R.GALEGA MUSICA, SON GALICIA RADIO, PROBAS RETEGAL
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TELEDEPORTE, VEO TV, VEO 2, NET TV
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CUATRO, CNN+, 40 LATINO, LA SEXTA 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TELECINCO, T5 ESTRELLAS, T5 SPORT, FLYMUSIC
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2
+
+[TVE 1, TVE 2, 24H TVE, CLAN/50 TVE, RNE1, RNE CLASICA, RNE3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[TVG, GALICIA TV AMERICA, RADIO GALEGA, R.GALEGA MUSICA, SON GALICIA RADIO, PROBAS RETEGAL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[TELEDEPORTE, VEO TV, VEO 2, NET TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CUATRO, CNN+, 40 LATINO, LA SEXTA 1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[TELECINCO, T5 ESTRELLAS, T5 SPORT, FLYMUSIC]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Madrid b/dvb-t/es-Madrid
index 56cf68f..40df6e6 100644
--- a/dvb-t/es-Madrid
+++ b/dvb-t/es-Madrid
@@ -7,16 +7,136 @@
# date (yyyy-mm-dd) : 2011-03-16
# provided by (opt) : <your name or email here>
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
#------------------------------------------------------------------------------
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Teledifusion Madrid
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # RGE2
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # RGE MADRID
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TDT-CAM
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Teledifusion Madrid]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[RGE2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[RGE MADRID]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[TDT-CAM]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[SFN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[SFN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[SFN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[SFN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Malaga b/dvb-t/es-Malaga
index 290e186..521e5da 100644
--- a/dvb-t/es-Malaga
+++ b/dvb-t/es-Malaga
@@ -1,9 +1,73 @@
# DVB-T Malaga (Andalucia) by Pedro Leon 4 Mayo 2007
-# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C57 La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C63 Canal Sur, Canal 2 Andalucia
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66 TELEDEPORTE, VEO, *Canal Ingenieria, SETenVEO, Tienda en VEO, NET TV, Radio Intereconomia
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C67 CUATRO, CNN+, 40 LATINO, laSexta
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C68 Telecinco, T5 Estrellas, T5 Sport, FLYMUSIC, PUNTO RADIO
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C69 ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, *tvtv DIGITAL, ONDA CERO, EUROPA FM, ONDA MELODIA, Telehit
-# * Canales de datos o MHT
+[C57 La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C63 Canal Sur, Canal 2 Andalucia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C66 TELEDEPORTE, VEO, *Canal Ingenieria, SETenVEO, Tienda en VEO, NET TV, Radio Intereconomia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C67 CUATRO, CNN+, 40 LATINO, laSexta]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C68 Telecinco, T5 Estrellas, T5 Sport, FLYMUSIC, PUNTO RADIO]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C69 ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, *tvtv DIGITAL, ONDA CERO, EUROPA FM, ONDA MELODIA, Telehit]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Muros-Noia b/dvb-t/es-Muros-Noia
index a02c31d..26d3016 100644
--- a/dvb-t/es-Muros-Noia
+++ b/dvb-t/es-Muros-Noia
@@ -1,9 +1,85 @@
# DVB-T Muros and Noia
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 27: Local Ribeira
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 61: RAR A Corunha
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: RGE Galicia
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: SFN 1
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: SFN 2
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: SFN 3
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: SFN 4
+[Canal 27: Local Ribeira]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 61: RAR A Corunha]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 63: RGE Galicia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: SFN 1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: SFN 2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: SFN 3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: SFN 4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Mussara b/dvb-t/es-Mussara
index a5147b4..c02383f 100644
--- a/dvb-t/es-Mussara
+++ b/dvb-t/es-Mussara
@@ -1,8 +1,73 @@
# DVB-T La Mussara (Reus-Tarragona)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c59: TV3, K3/33, 3/24, 300, 3i
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c64: TVE1, TVE2, Teledeporte, C24h
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c67: Cuatro, 40Latino, CNN+, LaSexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c68: T5, T5 Sports, T5 Estrellas, Net Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2
+[c59: TV3, K3/33, 3/24, 300, 3i]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[c64: TVE1, TVE2, Teledeporte, C24h]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[c67: Cuatro, 40Latino, CNN+, LaSexta 1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[c68: T5, T5 Sports, T5 Estrellas, Net Fly Music]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Pamplona b/dvb-t/es-Pamplona
index 4644b2d..fed6f53 100644
--- a/dvb-t/es-Pamplona
+++ b/dvb-t/es-Pamplona
@@ -1,9 +1,85 @@
# DVB-T Pamplona
-# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Rocacorba b/dvb-t/es-Rocacorba
deleted file mode 100644
index 8eebbbf..0000000
--- a/dvb-t/es-Rocacorba
+++ /dev/null
@@ -1,6 +0,0 @@
-# DVB-T Rocacorba (Girona)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVE 1, TVE 2, ANTENA 3, TELECINCO, CUATRO
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV3, K3/33, 3XL.NET, 3/24, CANAL PILOT
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SERVICIO PRUEBAS CANAL 67
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #
diff --git a/dvb-t/es-SC_Tenerife b/dvb-t/es-SC_Tenerife
index 0706513..25ef3ba 100644
--- a/dvb-t/es-SC_Tenerife
+++ b/dvb-t/es-SC_Tenerife
@@ -3,16 +3,147 @@
# Revisada y corregida por el Grupo de Usuarios de Linux de Canarias
# http://www.gulic.org
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C23
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C24
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C26
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C29
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C45
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C56
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C59
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C60
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C67
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C68
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C69
+[C23]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C56]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C66]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C67]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C68]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C69]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Santander b/dvb-t/es-Santander
index 214badb..d2fc392 100644
--- a/dvb-t/es-Santander
+++ b/dvb-t/es-Santander
@@ -1,7 +1,50 @@
# file automatically generated by w_scan
# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Santiago_de_Compostela b/dvb-t/es-Santiago_de_Compostela
index cf63e64..75943db 100644
--- a/dvb-t/es-Santiago_de_Compostela
+++ b/dvb-t/es-Santiago_de_Compostela
@@ -1,9 +1,85 @@
# DVB-T Santiago de Compostela
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 23: Local Santiago
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 40: RAR Santiago
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: RGE Galicia
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: SFN 1
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: SFN 2
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: SFN 3
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: SFN 4
+[Canal 23: Local Santiago]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 40: RAR Santiago]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 63: RGE Galicia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: SFN 1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: SFN 2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: SFN 3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: SFN 4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Sevilla b/dvb-t/es-Sevilla
index 0c7361d..17eae2a 100644
--- a/dvb-t/es-Sevilla
+++ b/dvb-t/es-Sevilla
@@ -1,23 +1,231 @@
# DVB-T Sevilla (Spain) by x2 15-agos-2010, modificado 15-ago-2010
# thanks to http://www.tdt1.com
# thanks to http://wirbel.htpc-forum.de/w_scan/index2.html
-# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C33
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C36
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C38
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C41
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C44
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C45
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C49
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C52
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C54
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C55
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C56
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C57
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C59
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C61
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C63
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C67
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C68
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C69
+[C33]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C36]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C38]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C56]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C61]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C63]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C66]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C67]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C68]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C69]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Tenerife b/dvb-t/es-Tenerife
index 71b04be..c97a002 100644
--- a/dvb-t/es-Tenerife
+++ b/dvb-t/es-Tenerife
@@ -1,14 +1,145 @@
# DVB-T Tenerife, Spain (03/04/2011)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 23: laSexta 2, laSexta 3, laSexta HD, C+ 2, Cuatro
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 24: Canal 7, Mírame, Canal 4 Tenerife
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 26: Nitro, Antena 3, Marca, 13
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 29: Boing, Tele5 HD, MTV, La 10
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 45: TVE HD, tdp
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 56: Canal 6 TeideVisión, ElDía
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 59: TV Canaria, TV Canaria 2, Antena 3 Canaria
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 60: La 1, La 2, 24h, Clan
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Teledeporte, Canal Ingeniería, Veo7, Intereconomía
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: laSexta, laSexta 3, Gol Televisión, Cuatro, Divinity, La Tienda en Casa
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Tele5, FDF, laSiete, Disney Channel, Intereconomía
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Neox, Nova, Veo7, AXN
+[Canal 23: laSexta 2, laSexta 3, laSexta HD, C+ 2, Cuatro]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 24: Canal 7, Mírame, Canal 4 Tenerife]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 26: Nitro, Antena 3, Marca, 13]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 29: Boing, Tele5 HD, MTV, La 10]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 45: TVE HD, tdp]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 56: Canal 6 TeideVisión, ElDía]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 59: TV Canaria, TV Canaria 2, Antena 3 Canaria]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 60: La 1, La 2, 24h, Clan]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: Teledeporte, Canal Ingeniería, Veo7, Intereconomía]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: laSexta, laSexta 3, Gol Televisión, Cuatro, Divinity, La Tienda en Casa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: Tele5, FDF, laSiete, Disney Channel, Intereconomía]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: Antena 3, Neox, Nova, Veo7, AXN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Valencia b/dvb-t/es-Valencia
index 91614d0..44c3560 100644
--- a/dvb-t/es-Valencia
+++ b/dvb-t/es-Valencia
@@ -1,9 +1,97 @@
# DVB-T Valencia, Spain
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 23: TMV, Tele 7, Aprende ingles TV, Ed. Prensa Val.,R.Mediamed
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 55: TV3, 33, 3/24, K3/300
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 57: Canal 9, Punt 2, Popular TV, LP Teva, Radio 9, Si Radio
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: TVE 1, La 2, 24H TVE, Clan TVE, RNE 1, RNE C, RNE 3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Sony TV en Veo, Tienda en Veo, Intereconomia, Teledeporte, R. Interec., R. Marca
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, Promo, La Sexta, Ser, 40 Princ., Cad. Dial
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco 2, FDF, Cinco Shop, Disney Channel, Punto Radio
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, Hogar 10, Onda Cero, Europa FM, Onda Melodia
+[Canal 23: TMV, Tele 7, Aprende ingles TV, Ed. Prensa Val.,R.Mediamed]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 55: TV3, 33, 3/24, K3/300]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 57: Canal 9, Punt 2, Popular TV, LP Teva, Radio 9, Si Radio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 58: TVE 1, La 2, 24H TVE, Clan TVE, RNE 1, RNE C, RNE 3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: Veo, Sony TV en Veo, Tienda en Veo, Intereconomia, Teledeporte, R. Interec., R. Marca]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: Cuatro, CNN+, 40 Latino, Promo, La Sexta, Ser, 40 Princ., Cad. Dial]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: Telecinco, Telecinco 2, FDF, Cinco Shop, Disney Channel, Punto Radio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: Antena 3, Antena Neox, Antena Nova, Hogar 10, Onda Cero, Europa FM, Onda Melodia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Valladolid b/dvb-t/es-Valladolid
index 961554b..31bf0ac 100644
--- a/dvb-t/es-Valladolid
+++ b/dvb-t/es-Valladolid
@@ -1,7 +1,61 @@
# DVB-T Valladolid
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 57: Clan TVE, 24H TVE, La 2, TVE 1, RNE1, RNE3, RNC
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+[Canal 57: Clan TVE, 24H TVE, La 2, TVE 1, RNE1, RNE3, RNC]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: Veo, Veo 2, Net TV, Teledeporte]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Vilamarxant b/dvb-t/es-Vilamarxant
index a3867c1..c355eef 100644
--- a/dvb-t/es-Vilamarxant
+++ b/dvb-t/es-Vilamarxant
@@ -1,4 +1,25 @@
# DVB-T Vilamarxant, Valencia, C. Valenciana, Spain.
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Vitoria-Gasteiz b/dvb-t/es-Vitoria-Gasteiz
index 5d97413..a475c8b 100644
--- a/dvb-t/es-Vitoria-Gasteiz
+++ b/dvb-t/es-Vitoria-Gasteiz
@@ -1,8 +1,74 @@
# Channel names in use at 2009/07/12, in Channel 66 [fffe] is a scrambled channel.
# In the generated *channels.conf file could be necesary to change Intereconomía, Radio Intereconomía, ONDA MELODÃA to Intereconomia, Radio Intereconomia, ONDA MELODIA for Totem to work well.
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: ETB1, ETB2, ETB3, ETBSAT, Euskadi Irratia, Gaztea, EiTB Irratia, Radio Euskadi, Radio Vitoria
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: La 1, La 2, 24h, Clan, RNE1, RNEC, RNE3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Teledeporte, Canal Ingenieria, VEO7, SONY TV en VEO, Tienda en VEO, GUIDE PLUS+, Intereconomía, Radio Intereconomía, [fffe], RADIO MARCA
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: laSexta, CUATRO, CNN+, 40 LATINO, CANAL CLUB, SER, 40 PRINCIPALES, CADENA DIAL
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, FDF, LaSiete, Disney Channel, Cincoshop
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, ONDA CERO, EUROPA FM, ONDA MELODÃA, HOGAR 10
+[Canal 58: ETB1, ETB2, ETB3, ETBSAT, Euskadi Irratia, Gaztea, EiTB Irratia, Radio Euskadi, Radio Vitoria]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 63: La 1, La 2, 24h, Clan, RNE1, RNEC, RNE3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: Teledeporte, Canal Ingenieria, VEO7, SONY TV en VEO, Tienda en VEO, GUIDE PLUS+, Intereconomía, Radio Intereconomía, [fffe], RADIO MARCA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: laSexta, CUATRO, CNN+, 40 LATINO, CANAL CLUB, SER, 40 PRINCIPALES, CADENA DIAL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: Telecinco, FDF, LaSiete, Disney Channel, Cincoshop]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, ONDA CERO, EUROPA FM, ONDA MELODÃA, HOGAR 10]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/es-Zaragoza b/dvb-t/es-Zaragoza
index b9a3c90..e6aab40 100644
--- a/dvb-t/es-Zaragoza
+++ b/dvb-t/es-Zaragoza
@@ -1,7 +1,62 @@
# DVB-T Zaragoza (Aragón) [Spain] [es-Zaragoza]
# Generated by Víctor Martínez Romanos <vmromanos@gmail.com>
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: TVE 1, TVE 2, 24H, CLAN/50, RNE1, RNEC, RNE3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: TELEDEPORTE, VEO TV, VEO 2, NET TV
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: CUATRO, CNN+, 40 LATINO, LA SEXTA 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: T5 ESTRELLAS, T5 SPORT, TELECINCO, FLYMUSIC
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2
+[Canal 63: TVE 1, TVE 2, 24H, CLAN/50, RNE1, RNEC, RNE3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 66: TELEDEPORTE, VEO TV, VEO 2, NET TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 67: CUATRO, CNN+, 40 LATINO, LA SEXTA 1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 68: T5 ESTRELLAS, T5 SPORT, TELECINCO, FLYMUSIC]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-Aanekoski b/dvb-t/fi-Aanekoski
index 2534f16..7dda326 100644
--- a/dvb-t/fi-Aanekoski
+++ b/dvb-t/fi-Aanekoski
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Aanekoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Aanekoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[Aanekoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Aanekoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Aanekoski_Konginkangas b/dvb-t/fi-Aanekoski_Konginkangas
index cd6d9d8..ff13741 100644
--- a/dvb-t/fi-Aanekoski_Konginkangas
+++ b/dvb-t/fi-Aanekoski_Konginkangas
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Aanekoski_Konginkangas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Aanekoski_Konginkangas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Aanekoski_Konginkangas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Aanekoski_Konginkangas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ahtari b/dvb-t/fi-Ahtari
index 3b58df6..aa90ea2 100644
--- a/dvb-t/fi-Ahtari
+++ b/dvb-t/fi-Ahtari
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ahtari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[Ahtari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Alajarvi b/dvb-t/fi-Alajarvi
index d484cb2..712483d 100644
--- a/dvb-t/fi-Alajarvi
+++ b/dvb-t/fi-Alajarvi
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Alajarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Alajarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[Alajarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[Alajarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Anjalankoski_Ruotila b/dvb-t/fi-Anjalankoski_Ruotila
index 31b8a59..4d3ab83 100644
--- a/dvb-t/fi-Anjalankoski_Ruotila
+++ b/dvb-t/fi-Anjalankoski_Ruotila
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Anjalankoski-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Anjalankoski-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Anjalankoski-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Anjalankoski-D]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[Anjalankoski-E]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-DNA-Espoo b/dvb-t/fi-DNA-Espoo
index d15350b..7d74fc1 100644
--- a/dvb-t/fi-DNA-Espoo
+++ b/dvb-t/fi-DNA-Espoo
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 184500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Eurajoki b/dvb-t/fi-DNA-Eurajoki
index 2b0b42d..31de935 100644
--- a/dvb-t/fi-DNA-Eurajoki
+++ b/dvb-t/fi-DNA-Eurajoki
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 191500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 184500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Hameenlinna b/dvb-t/fi-DNA-Hameenlinna
index 93023be..92b4ecf 100644
--- a/dvb-t/fi-DNA-Hameenlinna
+++ b/dvb-t/fi-DNA-Hameenlinna
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 212500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Hamina b/dvb-t/fi-DNA-Hamina
index cf5ebe5..3525cb0 100644
--- a/dvb-t/fi-DNA-Hamina
+++ b/dvb-t/fi-DNA-Hamina
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Hausjarvi b/dvb-t/fi-DNA-Hausjarvi
index 93023be..92b4ecf 100644
--- a/dvb-t/fi-DNA-Hausjarvi
+++ b/dvb-t/fi-DNA-Hausjarvi
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 212500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Helsinki b/dvb-t/fi-DNA-Helsinki
index d15350b..7d74fc1 100644
--- a/dvb-t/fi-DNA-Helsinki
+++ b/dvb-t/fi-DNA-Helsinki
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 184500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Jokioinen b/dvb-t/fi-DNA-Jokioinen
index 93023be..92b4ecf 100644
--- a/dvb-t/fi-DNA-Jokioinen
+++ b/dvb-t/fi-DNA-Jokioinen
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 212500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Jyvaskyla b/dvb-t/fi-DNA-Jyvaskyla
index e57fd2e..925c825 100644
--- a/dvb-t/fi-DNA-Jyvaskyla
+++ b/dvb-t/fi-DNA-Jyvaskyla
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Kaarina b/dvb-t/fi-DNA-Kaarina
index 934f18e..85ca3bd 100644
--- a/dvb-t/fi-DNA-Kaarina
+++ b/dvb-t/fi-DNA-Kaarina
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Kajaani b/dvb-t/fi-DNA-Kajaani
index cf5ebe5..3525cb0 100644
--- a/dvb-t/fi-DNA-Kajaani
+++ b/dvb-t/fi-DNA-Kajaani
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Kangasala b/dvb-t/fi-DNA-Kangasala
index c36d192..cb27de2 100644
--- a/dvb-t/fi-DNA-Kangasala
+++ b/dvb-t/fi-DNA-Kangasala
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 212500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Karkkila b/dvb-t/fi-DNA-Karkkila
index d15350b..7d74fc1 100644
--- a/dvb-t/fi-DNA-Karkkila
+++ b/dvb-t/fi-DNA-Karkkila
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 184500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Kiiminki b/dvb-t/fi-DNA-Kiiminki
index e57fd2e..925c825 100644
--- a/dvb-t/fi-DNA-Kiiminki
+++ b/dvb-t/fi-DNA-Kiiminki
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Kokkola b/dvb-t/fi-DNA-Kokkola
index e57fd2e..925c825 100644
--- a/dvb-t/fi-DNA-Kokkola
+++ b/dvb-t/fi-DNA-Kokkola
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Kontiolahti b/dvb-t/fi-DNA-Kontiolahti
index 6e83be0..b7895d0 100644
--- a/dvb-t/fi-DNA-Kontiolahti
+++ b/dvb-t/fi-DNA-Kontiolahti
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 212500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Kouvola b/dvb-t/fi-DNA-Kouvola
index cf5ebe5..3525cb0 100644
--- a/dvb-t/fi-DNA-Kouvola
+++ b/dvb-t/fi-DNA-Kouvola
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Kuopio b/dvb-t/fi-DNA-Kuopio
index 5f54792..63be3ca 100644
--- a/dvb-t/fi-DNA-Kuopio
+++ b/dvb-t/fi-DNA-Kuopio
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 184500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 191500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Lahti b/dvb-t/fi-DNA-Lahti
index 98bb4e9..8147d50 100644
--- a/dvb-t/fi-DNA-Lahti
+++ b/dvb-t/fi-DNA-Lahti
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 191500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Lappeenranta b/dvb-t/fi-DNA-Lappeenranta
index 6e83be0..b7895d0 100644
--- a/dvb-t/fi-DNA-Lappeenranta
+++ b/dvb-t/fi-DNA-Lappeenranta
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 212500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Lohja b/dvb-t/fi-DNA-Lohja
index d15350b..7d74fc1 100644
--- a/dvb-t/fi-DNA-Lohja
+++ b/dvb-t/fi-DNA-Lohja
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 184500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Loviisa b/dvb-t/fi-DNA-Loviisa
index d15350b..7d74fc1 100644
--- a/dvb-t/fi-DNA-Loviisa
+++ b/dvb-t/fi-DNA-Loviisa
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 184500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Mikkeli b/dvb-t/fi-DNA-Mikkeli
index 6e83be0..b7895d0 100644
--- a/dvb-t/fi-DNA-Mikkeli
+++ b/dvb-t/fi-DNA-Mikkeli
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 212500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Nousiainen b/dvb-t/fi-DNA-Nousiainen
index 934f18e..85ca3bd 100644
--- a/dvb-t/fi-DNA-Nousiainen
+++ b/dvb-t/fi-DNA-Nousiainen
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Nurmijarvi b/dvb-t/fi-DNA-Nurmijarvi
index d15350b..7d74fc1 100644
--- a/dvb-t/fi-DNA-Nurmijarvi
+++ b/dvb-t/fi-DNA-Nurmijarvi
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 184500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Porvoo b/dvb-t/fi-DNA-Porvoo
index d15350b..7d74fc1 100644
--- a/dvb-t/fi-DNA-Porvoo
+++ b/dvb-t/fi-DNA-Porvoo
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 184500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Salo b/dvb-t/fi-DNA-Salo
index 934f18e..85ca3bd 100644
--- a/dvb-t/fi-DNA-Salo
+++ b/dvb-t/fi-DNA-Salo
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Savonlinna b/dvb-t/fi-DNA-Savonlinna
index 28f16bd..7295413 100644
--- a/dvb-t/fi-DNA-Savonlinna
+++ b/dvb-t/fi-DNA-Savonlinna
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 212500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Seinajoki b/dvb-t/fi-DNA-Seinajoki
index 8e94d85..2f5d7e5 100644
--- a/dvb-t/fi-DNA-Seinajoki
+++ b/dvb-t/fi-DNA-Seinajoki
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 191500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Tyrnava b/dvb-t/fi-DNA-Tyrnava
index e57fd2e..925c825 100644
--- a/dvb-t/fi-DNA-Tyrnava
+++ b/dvb-t/fi-DNA-Tyrnava
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Ulvila b/dvb-t/fi-DNA-Ulvila
index 2b0b42d..31de935 100644
--- a/dvb-t/fi-DNA-Ulvila
+++ b/dvb-t/fi-DNA-Ulvila
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 191500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 184500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Vaasa b/dvb-t/fi-DNA-Vaasa
index 8e94d85..2f5d7e5 100644
--- a/dvb-t/fi-DNA-Vaasa
+++ b/dvb-t/fi-DNA-Vaasa
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 219500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 191500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Valkeakoski b/dvb-t/fi-DNA-Valkeakoski
index c36d192..cb27de2 100644
--- a/dvb-t/fi-DNA-Valkeakoski
+++ b/dvb-t/fi-DNA-Valkeakoski
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 212500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Vesilahti b/dvb-t/fi-DNA-Vesilahti
index c36d192..cb27de2 100644
--- a/dvb-t/fi-DNA-Vesilahti
+++ b/dvb-t/fi-DNA-Vesilahti
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 198500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 226500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 212500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-DNA-Ylivieska b/dvb-t/fi-DNA-Ylivieska
index 98bb4e9..8147d50 100644
--- a/dvb-t/fi-DNA-Ylivieska
+++ b/dvb-t/fi-DNA-Ylivieska
@@ -1,5 +1,38 @@
# 2014-03-08 Olli Salonen <olli.salonen@iki.fi>
# generated from http://www.dna.fi/tuki-antenniverkon-nakyvyysalueet
-T 191500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 205500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
-T 177500000 7MHz AUTO AUTO AUTO 32k 19/256 AUTO
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 19/256
+ HIERARCHY = AUTO
+ INVERSION = AUTO
+
diff --git a/dvb-t/fi-Enontekio_Ahovaara b/dvb-t/fi-Enontekio_Ahovaara
index c33c1bd..21abdbc 100644
--- a/dvb-t/fi-Enontekio_Ahovaara
+++ b/dvb-t/fi-Enontekio_Ahovaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Enontekio_Ahovaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Enontekio_Ahovaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Enontekio_Hetta b/dvb-t/fi-Enontekio_Hetta
index 9e1521a..6ff6b84 100644
--- a/dvb-t/fi-Enontekio_Hetta
+++ b/dvb-t/fi-Enontekio_Hetta
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Enontekio_Hetta]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Enontekio_Hetta]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Enontekio_Kuttanen b/dvb-t/fi-Enontekio_Kuttanen
index d14e918..a792d59 100644
--- a/dvb-t/fi-Enontekio_Kuttanen
+++ b/dvb-t/fi-Enontekio_Kuttanen
@@ -1,4 +1,8 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Enontekio_Kuttanen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Espoo b/dvb-t/fi-Espoo
index f77a2ec..bc01a39 100644
--- a/dvb-t/fi-Espoo
+++ b/dvb-t/fi-Espoo
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Espoo-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Espoo-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Espoo-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Espoo-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Espoo-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Eurajoki b/dvb-t/fi-Eurajoki
index 294f211..2ccc418 100644
--- a/dvb-t/fi-Eurajoki
+++ b/dvb-t/fi-Eurajoki
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Eurajoki-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Eurajoki-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Eurajoki-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Eurajoki-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Eurajoki-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Fiskars b/dvb-t/fi-Fiskars
index e0d4a61..5f8cacc 100644
--- a/dvb-t/fi-Fiskars
+++ b/dvb-t/fi-Fiskars
@@ -1,6 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Fiskars-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Fiskars-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Fiskars-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Haapavesi b/dvb-t/fi-Haapavesi
index 0dd514a..8be1f62 100644
--- a/dvb-t/fi-Haapavesi
+++ b/dvb-t/fi-Haapavesi
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Haapavesi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Haapavesi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Haapavesi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[Haapavesi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Hameenkyro_Kyroskoski b/dvb-t/fi-Hameenkyro_Kyroskoski
index e7a1b76..8a98791 100644
--- a/dvb-t/fi-Hameenkyro_Kyroskoski
+++ b/dvb-t/fi-Hameenkyro_Kyroskoski
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Hameenkyro_Kyroskoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Hameenkyro_Kyroskoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Hameenkyro_Kyroskoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[Hameenkyro_Kyroskoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Hameenlinna_Painokangas b/dvb-t/fi-Hameenlinna_Painokangas
index 109ada3..9a56b2b 100644
--- a/dvb-t/fi-Hameenlinna_Painokangas
+++ b/dvb-t/fi-Hameenlinna_Painokangas
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Hameenlinna_Painokangas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Hameenlinna_Painokangas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Hameenlinna_Painokangas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Hanko b/dvb-t/fi-Hanko
index 6e4f57a..ab08a14 100644
--- a/dvb-t/fi-Hanko
+++ b/dvb-t/fi-Hanko
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Hanko]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Hanko]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[Hanko]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Hanko]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Hartola b/dvb-t/fi-Hartola
index cde1665..d10df22 100644
--- a/dvb-t/fi-Hartola
+++ b/dvb-t/fi-Hartola
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Hartola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Hartola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Hartola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Heinavesi b/dvb-t/fi-Heinavesi
index 1db3d11..b33bb39 100644
--- a/dvb-t/fi-Heinavesi
+++ b/dvb-t/fi-Heinavesi
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Heinavesi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Heinavesi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Heinavesi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Heinola b/dvb-t/fi-Heinola
index 75001d5..7a6f234 100644
--- a/dvb-t/fi-Heinola
+++ b/dvb-t/fi-Heinola
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Heinola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Heinola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Heinola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Heinola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Hyrynsalmi b/dvb-t/fi-Hyrynsalmi
index a305343..e11f89a 100644
--- a/dvb-t/fi-Hyrynsalmi
+++ b/dvb-t/fi-Hyrynsalmi
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Hyrynsalmi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyrynsalmi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyrynsalmi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Hyrynsalmi_Kyparavaara b/dvb-t/fi-Hyrynsalmi_Kyparavaara
index 2aa1ec3..f402d8a 100644
--- a/dvb-t/fi-Hyrynsalmi_Kyparavaara
+++ b/dvb-t/fi-Hyrynsalmi_Kyparavaara
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Hyrynsalmi_Kyparavaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyrynsalmi_Kyparavaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyrynsalmi_Kyparavaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Hyrynsalmi_Paljakka b/dvb-t/fi-Hyrynsalmi_Paljakka
index 0df57e3..806a3c0 100644
--- a/dvb-t/fi-Hyrynsalmi_Paljakka
+++ b/dvb-t/fi-Hyrynsalmi_Paljakka
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Hyrynsalmi_Paljakka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyrynsalmi_Paljakka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyrynsalmi_Paljakka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Hyvinkaa b/dvb-t/fi-Hyvinkaa
index e9de8e8..25b77d1 100644
--- a/dvb-t/fi-Hyvinkaa
+++ b/dvb-t/fi-Hyvinkaa
@@ -1,6 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 350000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Hyvinkaa-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyvinkaa-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyvinkaa-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ii_Raiskio b/dvb-t/fi-Ii_Raiskio
index ef139d4..c5fda67 100644
--- a/dvb-t/fi-Ii_Raiskio
+++ b/dvb-t/fi-Ii_Raiskio
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ii_Raiskio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Ii_Raiskio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Iisalmi b/dvb-t/fi-Iisalmi
index 02337c1..d281825 100644
--- a/dvb-t/fi-Iisalmi
+++ b/dvb-t/fi-Iisalmi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Iisalmi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Iisalmi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ikaalinen b/dvb-t/fi-Ikaalinen
index 7baf77f..885d44b 100644
--- a/dvb-t/fi-Ikaalinen
+++ b/dvb-t/fi-Ikaalinen
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ikaalinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[Ikaalinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Ikaalinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Ikaalinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ikaalinen_Riitiala b/dvb-t/fi-Ikaalinen_Riitiala
index c2d9657..55d8202 100644
--- a/dvb-t/fi-Ikaalinen_Riitiala
+++ b/dvb-t/fi-Ikaalinen_Riitiala
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ikaalinen_Riitiala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Ikaalinen_Riitiala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[Ikaalinen_Riitiala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Ikaalinen_Riitiala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Inari b/dvb-t/fi-Inari
index 4eb7655..31deb21 100644
--- a/dvb-t/fi-Inari
+++ b/dvb-t/fi-Inari
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Inari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Inari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Inari_Janispaa b/dvb-t/fi-Inari_Janispaa
index 376bfe8..37bd31e 100644
--- a/dvb-t/fi-Inari_Janispaa
+++ b/dvb-t/fi-Inari_Janispaa
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Inari_Janispaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Inari_Janispaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Inari_Naatamo b/dvb-t/fi-Inari_Naatamo
index 5ab0cce..ba84360 100644
--- a/dvb-t/fi-Inari_Naatamo
+++ b/dvb-t/fi-Inari_Naatamo
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Inari_Naatamo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Inari_Naatamo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ivalo_Saarineitamovaara b/dvb-t/fi-Ivalo_Saarineitamovaara
index 88b0457..70181bb 100644
--- a/dvb-t/fi-Ivalo_Saarineitamovaara
+++ b/dvb-t/fi-Ivalo_Saarineitamovaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ivalo_Saarineitamovaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Ivalo_Saarineitamovaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Jalasjarvi b/dvb-t/fi-Jalasjarvi
index 99a213c..9bc7058 100644
--- a/dvb-t/fi-Jalasjarvi
+++ b/dvb-t/fi-Jalasjarvi
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Jalasjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Jalasjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Jalasjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Jalasjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Jamsa_Halli b/dvb-t/fi-Jamsa_Halli
index f8b39c6..5d06520 100644
--- a/dvb-t/fi-Jamsa_Halli
+++ b/dvb-t/fi-Jamsa_Halli
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Jamsa_Halli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Halli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Halli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Halli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Jamsa_Kaipola b/dvb-t/fi-Jamsa_Kaipola
index 530927b..ca8e563 100644
--- a/dvb-t/fi-Jamsa_Kaipola
+++ b/dvb-t/fi-Jamsa_Kaipola
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Jamsa_Kaipola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Kaipola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Kaipola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Kaipola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Jamsa_Matkosvuori b/dvb-t/fi-Jamsa_Matkosvuori
index 2cac328..eacacff 100644
--- a/dvb-t/fi-Jamsa_Matkosvuori
+++ b/dvb-t/fi-Jamsa_Matkosvuori
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Jamsa_Matkosvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Matkosvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Matkosvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Matkosvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Jamsa_Ouninpohja b/dvb-t/fi-Jamsa_Ouninpohja
index feae4e6..70eb8e1 100644
--- a/dvb-t/fi-Jamsa_Ouninpohja
+++ b/dvb-t/fi-Jamsa_Ouninpohja
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Jamsa_Ouninpohja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Ouninpohja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsa_Ouninpohja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Jamsankoski b/dvb-t/fi-Jamsankoski
index 6a52743..142be91 100644
--- a/dvb-t/fi-Jamsankoski
+++ b/dvb-t/fi-Jamsankoski
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Jamsankoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsankoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsankoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[Jamsankoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Joensuu_Vestinkallio b/dvb-t/fi-Joensuu_Vestinkallio
index f5e298a..765ba1c 100644
--- a/dvb-t/fi-Joensuu_Vestinkallio
+++ b/dvb-t/fi-Joensuu_Vestinkallio
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Joensuu_Vestinkallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[Joensuu_Vestinkallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Joensuu_Vestinkallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Joroinen_Puukkola b/dvb-t/fi-Joroinen_Puukkola
index ca0c569..5fce8db 100644
--- a/dvb-t/fi-Joroinen_Puukkola
+++ b/dvb-t/fi-Joroinen_Puukkola
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Joroinen_Puukkola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Joroinen_Puukkola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Joroinen_Puukkola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Joutsa_Lankia b/dvb-t/fi-Joutsa_Lankia
index 1134f94..cc44c81 100644
--- a/dvb-t/fi-Joutsa_Lankia
+++ b/dvb-t/fi-Joutsa_Lankia
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Joutsa_Lankia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutsa_Lankia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutsa_Lankia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutsa_Lankia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Joutseno b/dvb-t/fi-Joutseno
index bb05688..0bde1b7 100644
--- a/dvb-t/fi-Joutseno
+++ b/dvb-t/fi-Joutseno
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Joutseno-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutseno-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutseno-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutseno-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutseno-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Juupajoki_Kopsamo b/dvb-t/fi-Juupajoki_Kopsamo
index 0c460bf..a99af77 100644
--- a/dvb-t/fi-Juupajoki_Kopsamo
+++ b/dvb-t/fi-Juupajoki_Kopsamo
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Juupajoki_Kopsamo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Juupajoki_Kopsamo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Juupajoki_Kopsamo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Juva b/dvb-t/fi-Juva
index e158428..ab8a15e 100644
--- a/dvb-t/fi-Juva
+++ b/dvb-t/fi-Juva
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Juva]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Juva]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Juva]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Juva]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Jyvaskyla b/dvb-t/fi-Jyvaskyla
index 22ca83c..287792e 100644
--- a/dvb-t/fi-Jyvaskyla
+++ b/dvb-t/fi-Jyvaskyla
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Jyvaskyla-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Jyvaskyla-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Jyvaskyla-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Jyvaskyla-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Jyvaskyla-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Jyvaskyla_Vaajakoski b/dvb-t/fi-Jyvaskyla_Vaajakoski
index 6dd4889..92b5ac9 100644
--- a/dvb-t/fi-Jyvaskyla_Vaajakoski
+++ b/dvb-t/fi-Jyvaskyla_Vaajakoski
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Jyvaskyla_Vaajakoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Jyvaskyla_Vaajakoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Jyvaskyla_Vaajakoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kaavi_Sivakkavaara b/dvb-t/fi-Kaavi_Sivakkavaara
index 744097f..7595a39 100644
--- a/dvb-t/fi-Kaavi_Sivakkavaara
+++ b/dvb-t/fi-Kaavi_Sivakkavaara
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kaavi_Sivakkavaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Kaavi_Sivakkavaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Kaavi_Sivakkavaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kajaani_Pollyvaara b/dvb-t/fi-Kajaani_Pollyvaara
index 31f059a..3ea7b90 100644
--- a/dvb-t/fi-Kajaani_Pollyvaara
+++ b/dvb-t/fi-Kajaani_Pollyvaara
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kajaani_Pollyvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Kajaani_Pollyvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[Kajaani_Pollyvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kalajoki b/dvb-t/fi-Kalajoki
index 189f2e3..cab796d 100644
--- a/dvb-t/fi-Kalajoki
+++ b/dvb-t/fi-Kalajoki
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kalajoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Kalajoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Kalajoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kangaslampi b/dvb-t/fi-Kangaslampi
index 7ee87b0..d84b2a9 100644
--- a/dvb-t/fi-Kangaslampi
+++ b/dvb-t/fi-Kangaslampi
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kangaslampi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[Kangaslampi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Kangaslampi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Kangaslampi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kangasniemi_Turkinmaki b/dvb-t/fi-Kangasniemi_Turkinmaki
index 1df5b81..56476e6 100644
--- a/dvb-t/fi-Kangasniemi_Turkinmaki
+++ b/dvb-t/fi-Kangasniemi_Turkinmaki
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kangasniemi_Turkinmaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Kangasniemi_Turkinmaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Kangasniemi_Turkinmaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Kangasniemi_Turkinmaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kankaanpaa b/dvb-t/fi-Kankaanpaa
index 9b15ac9..a3df7ba 100644
--- a/dvb-t/fi-Kankaanpaa
+++ b/dvb-t/fi-Kankaanpaa
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kankaanpaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Kankaanpaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Kankaanpaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Kankaanpaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Karigasniemi b/dvb-t/fi-Karigasniemi
index 4438ee0..60548c7 100644
--- a/dvb-t/fi-Karigasniemi
+++ b/dvb-t/fi-Karigasniemi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Karigasniemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Karigasniemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Karkkila b/dvb-t/fi-Karkkila
index df84c99..7baeef4 100644
--- a/dvb-t/fi-Karkkila
+++ b/dvb-t/fi-Karkkila
@@ -1,6 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Karkkila-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[Karkkila-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Karkkila-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Karstula b/dvb-t/fi-Karstula
index 0377d77..dfd3001 100644
--- a/dvb-t/fi-Karstula
+++ b/dvb-t/fi-Karstula
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Karstula]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[Karstula]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Karstula]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Karvia b/dvb-t/fi-Karvia
index 9ba1fec..51e89b7 100644
--- a/dvb-t/fi-Karvia
+++ b/dvb-t/fi-Karvia
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Karvia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Karvia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Karvia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kaunispaa b/dvb-t/fi-Kaunispaa
index 4eb7655..e9fea9c 100644
--- a/dvb-t/fi-Kaunispaa
+++ b/dvb-t/fi-Kaunispaa
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kaunispaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Kaunispaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kemijarvi_Suomutunturi b/dvb-t/fi-Kemijarvi_Suomutunturi
index 7f96259..dac5d93 100644
--- a/dvb-t/fi-Kemijarvi_Suomutunturi
+++ b/dvb-t/fi-Kemijarvi_Suomutunturi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kemijarvi_Suomutunturi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Kemijarvi_Suomutunturi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kerimaki b/dvb-t/fi-Kerimaki
index 8dbbdfc..68f45d1 100644
--- a/dvb-t/fi-Kerimaki
+++ b/dvb-t/fi-Kerimaki
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kerimaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Kerimaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Kerimaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[Kerimaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Keuruu b/dvb-t/fi-Keuruu
index acb8129..dd49b5b 100644
--- a/dvb-t/fi-Keuruu
+++ b/dvb-t/fi-Keuruu
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Keuruu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Keuruu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Keuruu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Keuruu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Keuruu_Haapamaki b/dvb-t/fi-Keuruu_Haapamaki
index b3b4663..cfb9b0e 100644
--- a/dvb-t/fi-Keuruu_Haapamaki
+++ b/dvb-t/fi-Keuruu_Haapamaki
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Keuruu_Haapamaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Keuruu_Haapamaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Keuruu_Haapamaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[Keuruu_Haapamaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kihnio b/dvb-t/fi-Kihnio
index 3af6822..7c5c992 100644
--- a/dvb-t/fi-Kihnio
+++ b/dvb-t/fi-Kihnio
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kihnio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[Kihnio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Kihnio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Kihnio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kiihtelysvaara b/dvb-t/fi-Kiihtelysvaara
index a805130..52e60b8 100644
--- a/dvb-t/fi-Kiihtelysvaara
+++ b/dvb-t/fi-Kiihtelysvaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kiihtelysvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Kiihtelysvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kilpisjarvi b/dvb-t/fi-Kilpisjarvi
index f463f4d..9d3435c 100644
--- a/dvb-t/fi-Kilpisjarvi
+++ b/dvb-t/fi-Kilpisjarvi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kilpisjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[Kilpisjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kittila_Levitunturi b/dvb-t/fi-Kittila_Levitunturi
index d20d560..ae4c1c9 100644
--- a/dvb-t/fi-Kittila_Levitunturi
+++ b/dvb-t/fi-Kittila_Levitunturi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kittila_Levitunturi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Kittila_Levitunturi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kolari_Vuolittaja b/dvb-t/fi-Kolari_Vuolittaja
index 2d1982a..f507750 100644
--- a/dvb-t/fi-Kolari_Vuolittaja
+++ b/dvb-t/fi-Kolari_Vuolittaja
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kolari_Vuolittaja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Kolari_Vuolittaja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Koli b/dvb-t/fi-Koli
index eb975f3..034bf2d 100644
--- a/dvb-t/fi-Koli
+++ b/dvb-t/fi-Koli
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Koli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Koli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Koli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Koli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Korpilahti_Vaarunvuori b/dvb-t/fi-Korpilahti_Vaarunvuori
index 6a52743..7fa3ed6 100644
--- a/dvb-t/fi-Korpilahti_Vaarunvuori
+++ b/dvb-t/fi-Korpilahti_Vaarunvuori
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Korpilahti_Vaarunvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Korpilahti_Vaarunvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Korpilahti_Vaarunvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[Korpilahti_Vaarunvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Korppoo b/dvb-t/fi-Korppoo
index b30b9c5..6c84241 100644
--- a/dvb-t/fi-Korppoo
+++ b/dvb-t/fi-Korppoo
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Korppoo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Korppoo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Korppoo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Korppoo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kruunupyy b/dvb-t/fi-Kruunupyy
index 77fbcd8..ef91e8d 100644
--- a/dvb-t/fi-Kruunupyy
+++ b/dvb-t/fi-Kruunupyy
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kruunupyy-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Kruunupyy-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Kruunupyy-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[Kruunupyy-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Kruunupyy-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kuhmo_Haukela b/dvb-t/fi-Kuhmo_Haukela
index 2bd1ba2..c3a3bd8 100644
--- a/dvb-t/fi-Kuhmo_Haukela
+++ b/dvb-t/fi-Kuhmo_Haukela
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kuhmo_Haukela]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmo_Haukela]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmo_Haukela]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kuhmo_Lentiira b/dvb-t/fi-Kuhmo_Lentiira
index 68d24b7..1127999 100644
--- a/dvb-t/fi-Kuhmo_Lentiira
+++ b/dvb-t/fi-Kuhmo_Lentiira
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kuhmo_Lentiira]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmo_Lentiira]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmo_Lentiira]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kuhmo_Niva b/dvb-t/fi-Kuhmo_Niva
index df1b5e9..6f7aa2c 100644
--- a/dvb-t/fi-Kuhmo_Niva
+++ b/dvb-t/fi-Kuhmo_Niva
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kuhmo_Niva]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmo_Niva]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmo_Niva]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kuhmoinen b/dvb-t/fi-Kuhmoinen
index 1395069..53d2de9 100644
--- a/dvb-t/fi-Kuhmoinen
+++ b/dvb-t/fi-Kuhmoinen
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kuhmoinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmoinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmoinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmoinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kuhmoinen_Harjunsalmi b/dvb-t/fi-Kuhmoinen_Harjunsalmi
index 812fdab..059df91 100644
--- a/dvb-t/fi-Kuhmoinen_Harjunsalmi
+++ b/dvb-t/fi-Kuhmoinen_Harjunsalmi
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kuhmoinen_Harjunsalmi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmoinen_Harjunsalmi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmoinen_Harjunsalmi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmoinen_Harjunsalmi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kuhmoinen_Puukkoinen b/dvb-t/fi-Kuhmoinen_Puukkoinen
index b2c2427..113e0f4 100644
--- a/dvb-t/fi-Kuhmoinen_Puukkoinen
+++ b/dvb-t/fi-Kuhmoinen_Puukkoinen
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kuhmoinen_Puukkoinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmoinen_Puukkoinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuhmoinen_Puukkoinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kuopio b/dvb-t/fi-Kuopio
index aa2008f..ae9d0f2 100644
--- a/dvb-t/fi-Kuopio
+++ b/dvb-t/fi-Kuopio
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kuopio-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuopio-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuopio-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuopio-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuopio-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kurikka_Kesti b/dvb-t/fi-Kurikka_Kesti
new file mode 100644
index 0000000..c34cfe6
--- /dev/null
+++ b/dvb-t/fi-Kurikka_Kesti
@@ -0,0 +1,23 @@
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Kurikka_Kesti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Kurikka_Kesti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Kurikka_Kesti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Kurikka_Kesti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kustavi_Viherlahti b/dvb-t/fi-Kustavi_Viherlahti
index 28d8d91..9840401 100644
--- a/dvb-t/fi-Kustavi_Viherlahti
+++ b/dvb-t/fi-Kustavi_Viherlahti
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kustavi_Viherlahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[Kustavi_Viherlahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Kustavi_Viherlahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Kustavi_Viherlahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kuusamo_Hamppulampi b/dvb-t/fi-Kuusamo_Hamppulampi
index 358286d..6ce9243 100644
--- a/dvb-t/fi-Kuusamo_Hamppulampi
+++ b/dvb-t/fi-Kuusamo_Hamppulampi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kuusamo_Hamppulampi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuusamo_Hamppulampi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kyyjarvi_Noposenaho b/dvb-t/fi-Kyyjarvi_Noposenaho
index bf891e1..d3deab8 100644
--- a/dvb-t/fi-Kyyjarvi_Noposenaho
+++ b/dvb-t/fi-Kyyjarvi_Noposenaho
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Kyyjarvi_Noposenaho]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Kyyjarvi_Noposenaho]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[Kyyjarvi_Noposenaho]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Lahti b/dvb-t/fi-Lahti
index 92c0d2c..19da8e7 100644
--- a/dvb-t/fi-Lahti
+++ b/dvb-t/fi-Lahti
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Lahti-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[Lahti-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Lahti-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Lahti-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Lahti-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Lapua b/dvb-t/fi-Lapua
index fff1bc1..cb982f1 100644
--- a/dvb-t/fi-Lapua
+++ b/dvb-t/fi-Lapua
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Lapua-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Lapua-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Lapua-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[Lapua-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Lapua-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Laukaa b/dvb-t/fi-Laukaa
index 6a52743..3c484ae 100644
--- a/dvb-t/fi-Laukaa
+++ b/dvb-t/fi-Laukaa
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Laukaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Laukaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Laukaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[Laukaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Laukaa_Vihtavuori b/dvb-t/fi-Laukaa_Vihtavuori
index 6a52743..5bc93a7 100644
--- a/dvb-t/fi-Laukaa_Vihtavuori
+++ b/dvb-t/fi-Laukaa_Vihtavuori
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Laukaa_Vihtavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Laukaa_Vihtavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Laukaa_Vihtavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[Laukaa_Vihtavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Lavia b/dvb-t/fi-Lavia
index c2e7a0c..f2f1391 100644
--- a/dvb-t/fi-Lavia
+++ b/dvb-t/fi-Lavia
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Lavia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Lavia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Lavia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Lohja b/dvb-t/fi-Lohja
index 367f0e3..7952ddf 100644
--- a/dvb-t/fi-Lohja
+++ b/dvb-t/fi-Lohja
@@ -1,6 +1,19 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Lohja-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Lohja-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Lohja-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+
diff --git a/dvb-t/fi-Loimaa b/dvb-t/fi-Loimaa
index ee8433d..0b6aad8 100644
--- a/dvb-t/fi-Loimaa
+++ b/dvb-t/fi-Loimaa
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Loimaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[Loimaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Loimaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Loimaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Luhanka b/dvb-t/fi-Luhanka
index 6765851..f6407ce 100644
--- a/dvb-t/fi-Luhanka
+++ b/dvb-t/fi-Luhanka
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Luhanka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Luhanka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Luhanka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Luhanka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Luopioinen b/dvb-t/fi-Luopioinen
index d251734..9ed4e3f 100644
--- a/dvb-t/fi-Luopioinen
+++ b/dvb-t/fi-Luopioinen
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Luopioinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Luopioinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Luopioinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Luopioinen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Mantta b/dvb-t/fi-Mantta
index 2a440c7..e201405 100644
--- a/dvb-t/fi-Mantta
+++ b/dvb-t/fi-Mantta
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Mantta]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Mantta]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[Mantta]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Mantta]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Mantyharju b/dvb-t/fi-Mantyharju
index 84ee2ab..3b7f127 100644
--- a/dvb-t/fi-Mantyharju
+++ b/dvb-t/fi-Mantyharju
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Mantyharju]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Mantyharju]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Mantyharju]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Mikkeli b/dvb-t/fi-Mikkeli
index 0198404..f523878 100644
--- a/dvb-t/fi-Mikkeli
+++ b/dvb-t/fi-Mikkeli
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Mikkeli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[Mikkeli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Mikkeli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[Mikkeli]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Muonio_Olostunturi b/dvb-t/fi-Muonio_Olostunturi
index a0f2c9d..bfdf0c7 100644
--- a/dvb-t/fi-Muonio_Olostunturi
+++ b/dvb-t/fi-Muonio_Olostunturi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Muonio_Olostunturi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Muonio_Olostunturi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Nilsia b/dvb-t/fi-Nilsia
index e756bd7..208d1c4 100644
--- a/dvb-t/fi-Nilsia
+++ b/dvb-t/fi-Nilsia
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Nilsia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Nilsia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Nilsia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Nilsia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Nilsia_Keski-Siikajarvi b/dvb-t/fi-Nilsia_Keski-Siikajarvi
index 328026f..bfbc561 100644
--- a/dvb-t/fi-Nilsia_Keski-Siikajarvi
+++ b/dvb-t/fi-Nilsia_Keski-Siikajarvi
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Nilsia_Keski-Siikajarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Nilsia_Keski-Siikajarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[Nilsia_Keski-Siikajarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Nilsia_Pisa b/dvb-t/fi-Nilsia_Pisa
index 0a9f233..8c8ee34 100644
--- a/dvb-t/fi-Nilsia_Pisa
+++ b/dvb-t/fi-Nilsia_Pisa
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Nilsia_Pisa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Nilsia_Pisa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Nilsia_Pisa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Nokia b/dvb-t/fi-Nokia
index 7e4853d..2a2b380 100644
--- a/dvb-t/fi-Nokia
+++ b/dvb-t/fi-Nokia
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Nokia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Nokia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[Nokia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Nokia]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Nokia_Siuro b/dvb-t/fi-Nokia_Siuro
index 7e4853d..1ba3cca 100644
--- a/dvb-t/fi-Nokia_Siuro
+++ b/dvb-t/fi-Nokia_Siuro
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Nokia_Siuro]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Nokia_Siuro]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[Nokia_Siuro]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Nokia_Siuro]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Nummi-Pusula_Hyonola b/dvb-t/fi-Nummi-Pusula_Hyonola
index 0b255be..08840cc 100644
--- a/dvb-t/fi-Nummi-Pusula_Hyonola
+++ b/dvb-t/fi-Nummi-Pusula_Hyonola
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Nummi-Pusula_Hyonola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Nummi-Pusula_Hyonola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[Nummi-Pusula_Hyonola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Nummi-Pusula_Hyonola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Nuorgam_Njallavaara b/dvb-t/fi-Nuorgam_Njallavaara
index d4b5c21..e1c1c3e 100644
--- a/dvb-t/fi-Nuorgam_Njallavaara
+++ b/dvb-t/fi-Nuorgam_Njallavaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Nuorgam_Njallavaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Nuorgam_Njallavaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Nuorgam_raja b/dvb-t/fi-Nuorgam_raja
index d4b5c21..2b2cb3c 100644
--- a/dvb-t/fi-Nuorgam_raja
+++ b/dvb-t/fi-Nuorgam_raja
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Nuorgam_raja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Nuorgam_raja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Nurmes_Konnanvaara b/dvb-t/fi-Nurmes_Konnanvaara
index 0f67047..7cd3d91 100644
--- a/dvb-t/fi-Nurmes_Konnanvaara
+++ b/dvb-t/fi-Nurmes_Konnanvaara
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Nurmes_Konnanvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Nurmes_Konnanvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[Nurmes_Konnanvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Nurmes_Konnanvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Nurmes_Kortevaara b/dvb-t/fi-Nurmes_Kortevaara
index c00c535..3e118ad 100644
--- a/dvb-t/fi-Nurmes_Kortevaara
+++ b/dvb-t/fi-Nurmes_Kortevaara
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Nurmes_Kortevaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Nurmes_Kortevaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Nurmes_Kortevaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Orivesi_Talviainen b/dvb-t/fi-Orivesi_Talviainen
index 1e7c752..149782e 100644
--- a/dvb-t/fi-Orivesi_Talviainen
+++ b/dvb-t/fi-Orivesi_Talviainen
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Orivesi_Talviainen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Orivesi_Talviainen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[Orivesi_Talviainen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Oulu b/dvb-t/fi-Oulu
index ae0133d..0753c6c 100644
--- a/dvb-t/fi-Oulu
+++ b/dvb-t/fi-Oulu
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Oulu-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[Oulu-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Oulu-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Oulu-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Oulu-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Padasjoki b/dvb-t/fi-Padasjoki
index 6cfd9fa..47246b4 100644
--- a/dvb-t/fi-Padasjoki
+++ b/dvb-t/fi-Padasjoki
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Padasjoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[Padasjoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Padasjoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Padasjoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Padasjoki_Arrakoski b/dvb-t/fi-Padasjoki_Arrakoski
index b56e164..c8c1b05 100644
--- a/dvb-t/fi-Padasjoki_Arrakoski
+++ b/dvb-t/fi-Padasjoki_Arrakoski
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Padasjoki_Arrakoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Padasjoki_Arrakoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Padasjoki_Arrakoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[Padasjoki_Arrakoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Paltamo_Kivesvaara b/dvb-t/fi-Paltamo_Kivesvaara
index 563c641..56f8ba0 100644
--- a/dvb-t/fi-Paltamo_Kivesvaara
+++ b/dvb-t/fi-Paltamo_Kivesvaara
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Paltamo_Kivesvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Paltamo_Kivesvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[Paltamo_Kivesvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Parainen_Houtskari b/dvb-t/fi-Parainen_Houtskari
index b30b9c5..e187814 100644
--- a/dvb-t/fi-Parainen_Houtskari
+++ b/dvb-t/fi-Parainen_Houtskari
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Parainen_Houtskari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Parainen_Houtskari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Parainen_Houtskari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Parainen_Houtskari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Parikkala b/dvb-t/fi-Parikkala
index c3a1870..f0f52f7 100644
--- a/dvb-t/fi-Parikkala
+++ b/dvb-t/fi-Parikkala
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Parikkala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Parikkala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[Parikkala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[Parikkala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Parkano_Sopukallio b/dvb-t/fi-Parkano_Sopukallio
index d9e0722..62e8507 100644
--- a/dvb-t/fi-Parkano_Sopukallio
+++ b/dvb-t/fi-Parkano_Sopukallio
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Parkano_Sopukallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Parkano_Sopukallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Parkano_Sopukallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[Parkano_Sopukallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pello b/dvb-t/fi-Pello
index 12faa96..2cbd28e 100644
--- a/dvb-t/fi-Pello
+++ b/dvb-t/fi-Pello
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pello]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Pello]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pello_Ratasvaara b/dvb-t/fi-Pello_Ratasvaara
index ff4811f..ff7f660 100644
--- a/dvb-t/fi-Pello_Ratasvaara
+++ b/dvb-t/fi-Pello_Ratasvaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pello_Ratasvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[Pello_Ratasvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Perho b/dvb-t/fi-Perho
index 7bd3060..0a7a2dc 100644
--- a/dvb-t/fi-Perho
+++ b/dvb-t/fi-Perho
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Perho]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Perho]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Perho]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Perho]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pernaja b/dvb-t/fi-Pernaja
index 3e80114..5459e88 100644
--- a/dvb-t/fi-Pernaja
+++ b/dvb-t/fi-Pernaja
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pernaja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Pernaja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Pernaja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pieksamaki_Halkokumpu b/dvb-t/fi-Pieksamaki_Halkokumpu
index d45114e..f03f9a0 100644
--- a/dvb-t/fi-Pieksamaki_Halkokumpu
+++ b/dvb-t/fi-Pieksamaki_Halkokumpu
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pieksamaki_Halkokumpu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Pieksamaki_Halkokumpu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Pieksamaki_Halkokumpu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pihtipudas b/dvb-t/fi-Pihtipudas
index e4f9707..42cdd29 100644
--- a/dvb-t/fi-Pihtipudas
+++ b/dvb-t/fi-Pihtipudas
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pihtipudas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Pihtipudas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[Pihtipudas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Porvoo_Suomenkyla b/dvb-t/fi-Porvoo_Suomenkyla
index 56ed3da..7b5e79d 100644
--- a/dvb-t/fi-Porvoo_Suomenkyla
+++ b/dvb-t/fi-Porvoo_Suomenkyla
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Porvoo_Suomenkyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Porvoo_Suomenkyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Porvoo_Suomenkyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Porvoo_Suomenkyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Posio b/dvb-t/fi-Posio
index 086f1e5..0258647 100644
--- a/dvb-t/fi-Posio
+++ b/dvb-t/fi-Posio
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Posio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Posio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pudasjarvi b/dvb-t/fi-Pudasjarvi
index 43fc1a1..dc85d9a 100644
--- a/dvb-t/fi-Pudasjarvi
+++ b/dvb-t/fi-Pudasjarvi
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pudasjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Pudasjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Pudasjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pudasjarvi_Iso-Syote b/dvb-t/fi-Pudasjarvi_Iso-Syote
index eac3af8..24cebdd 100644
--- a/dvb-t/fi-Pudasjarvi_Iso-Syote
+++ b/dvb-t/fi-Pudasjarvi_Iso-Syote
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pudasjarvi_Iso-Syote]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Pudasjarvi_Iso-Syote]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Pudasjarvi_Iso-Syote]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pudasjarvi_Kangasvaara b/dvb-t/fi-Pudasjarvi_Kangasvaara
index 0d56826..cb91163 100644
--- a/dvb-t/fi-Pudasjarvi_Kangasvaara
+++ b/dvb-t/fi-Pudasjarvi_Kangasvaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pudasjarvi_Kangasvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Pudasjarvi_Kangasvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Puolanka b/dvb-t/fi-Puolanka
index f2f5ae8..3370a9a 100644
--- a/dvb-t/fi-Puolanka
+++ b/dvb-t/fi-Puolanka
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Puolanka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Puolanka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[Puolanka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Puolanka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pyhatunturi b/dvb-t/fi-Pyhatunturi
index cc6d62a..c500576 100644
--- a/dvb-t/fi-Pyhatunturi
+++ b/dvb-t/fi-Pyhatunturi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pyhatunturi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Pyhatunturi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pyhavuori b/dvb-t/fi-Pyhavuori
index c21bd26..ad23265 100644
--- a/dvb-t/fi-Pyhavuori
+++ b/dvb-t/fi-Pyhavuori
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pyhavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Pyhavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[Pyhavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Pylkonmaki_Karankajarvi b/dvb-t/fi-Pylkonmaki_Karankajarvi
index 32fc368..2d7ef17 100644
--- a/dvb-t/fi-Pylkonmaki_Karankajarvi
+++ b/dvb-t/fi-Pylkonmaki_Karankajarvi
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Pylkonmaki_Karankajarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Pylkonmaki_Karankajarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Pylkonmaki_Karankajarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Raahe_Mestauskallio b/dvb-t/fi-Raahe_Mestauskallio
index 8ed4d47..e4cc7b1 100644
--- a/dvb-t/fi-Raahe_Mestauskallio
+++ b/dvb-t/fi-Raahe_Mestauskallio
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Raahe_Mestauskallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Raahe_Mestauskallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[Raahe_Mestauskallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Raahe_Mestauskallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Raahe_Piehinki b/dvb-t/fi-Raahe_Piehinki
index 189f2e3..1b3836d 100644
--- a/dvb-t/fi-Raahe_Piehinki
+++ b/dvb-t/fi-Raahe_Piehinki
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Raahe_Piehinki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Raahe_Piehinki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[Raahe_Piehinki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ranua_Haasionmaa b/dvb-t/fi-Ranua_Haasionmaa
index fdd5170..837a10f 100644
--- a/dvb-t/fi-Ranua_Haasionmaa
+++ b/dvb-t/fi-Ranua_Haasionmaa
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ranua_Haasionmaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Ranua_Haasionmaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ranua_Leppiaho b/dvb-t/fi-Ranua_Leppiaho
index 04878f0..94d3eef 100644
--- a/dvb-t/fi-Ranua_Leppiaho
+++ b/dvb-t/fi-Ranua_Leppiaho
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ranua_Leppiaho]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Ranua_Leppiaho]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Rautavaara_Angervikko b/dvb-t/fi-Rautavaara_Angervikko
index a3bf806..c89e4bf 100644
--- a/dvb-t/fi-Rautavaara_Angervikko
+++ b/dvb-t/fi-Rautavaara_Angervikko
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Rautavaara_Angervikko]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Rautavaara_Angervikko]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[Rautavaara_Angervikko]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Rautavaara_Angervikko]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Rautjarvi_Simpele b/dvb-t/fi-Rautjarvi_Simpele
index 219d861..2d4c254 100644
--- a/dvb-t/fi-Rautjarvi_Simpele
+++ b/dvb-t/fi-Rautjarvi_Simpele
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Rautjarvi_Simpele]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Rautjarvi_Simpele]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Rautjarvi_Simpele]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ristijarvi b/dvb-t/fi-Ristijarvi
index cc71a2e..79a58c3 100644
--- a/dvb-t/fi-Ristijarvi
+++ b/dvb-t/fi-Ristijarvi
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ristijarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Ristijarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Ristijarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Rovaniemi b/dvb-t/fi-Rovaniemi
index ad311da..87a65b1 100644
--- a/dvb-t/fi-Rovaniemi
+++ b/dvb-t/fi-Rovaniemi
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Rovaniemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Rovaniemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Rovaniemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Rovaniemi_Kaihuanvaara b/dvb-t/fi-Rovaniemi_Kaihuanvaara
index 4af59fc..3808ebc 100644
--- a/dvb-t/fi-Rovaniemi_Kaihuanvaara
+++ b/dvb-t/fi-Rovaniemi_Kaihuanvaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Rovaniemi_Kaihuanvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Rovaniemi_Kaihuanvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Rovaniemi_Karhuvaara b/dvb-t/fi-Rovaniemi_Karhuvaara
index 2d1982a..069ecb4 100644
--- a/dvb-t/fi-Rovaniemi_Karhuvaara
+++ b/dvb-t/fi-Rovaniemi_Karhuvaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Rovaniemi_Karhuvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Rovaniemi_Karhuvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Rovaniemi_Marasenkallio b/dvb-t/fi-Rovaniemi_Marasenkallio
index 42d5e58..6c8d542 100644
--- a/dvb-t/fi-Rovaniemi_Marasenkallio
+++ b/dvb-t/fi-Rovaniemi_Marasenkallio
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Rovaniemi_Marasenkallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Rovaniemi_Marasenkallio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Rovaniemi_Rantalaki b/dvb-t/fi-Rovaniemi_Rantalaki
index c47a475..fe3ea4c 100644
--- a/dvb-t/fi-Rovaniemi_Rantalaki
+++ b/dvb-t/fi-Rovaniemi_Rantalaki
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Rovaniemi_Rantalaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Rovaniemi_Rantalaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Rovaniemi_Sonka b/dvb-t/fi-Rovaniemi_Sonka
index 42d5e58..932b409 100644
--- a/dvb-t/fi-Rovaniemi_Sonka
+++ b/dvb-t/fi-Rovaniemi_Sonka
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Rovaniemi_Sonka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Rovaniemi_Sonka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Rovaniemi_Sorviselka b/dvb-t/fi-Rovaniemi_Sorviselka
index c47a475..feb3bcf 100644
--- a/dvb-t/fi-Rovaniemi_Sorviselka
+++ b/dvb-t/fi-Rovaniemi_Sorviselka
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Rovaniemi_Sorviselka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[Rovaniemi_Sorviselka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ruka b/dvb-t/fi-Ruka
index 342588e..de41ddc 100644
--- a/dvb-t/fi-Ruka
+++ b/dvb-t/fi-Ruka
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ruka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[Ruka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Ruka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ruovesi_Storminiemi b/dvb-t/fi-Ruovesi_Storminiemi
index e7a1b76..ac465cb 100644
--- a/dvb-t/fi-Ruovesi_Storminiemi
+++ b/dvb-t/fi-Ruovesi_Storminiemi
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ruovesi_Storminiemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Ruovesi_Storminiemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Ruovesi_Storminiemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[Ruovesi_Storminiemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Saarijarvi b/dvb-t/fi-Saarijarvi
index 3a1d529..18c923f 100644
--- a/dvb-t/fi-Saarijarvi
+++ b/dvb-t/fi-Saarijarvi
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Saarijarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Saarijarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[Saarijarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[Saarijarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Saarijarvi_Kalmari b/dvb-t/fi-Saarijarvi_Kalmari
index 32fc368..77d5ade 100644
--- a/dvb-t/fi-Saarijarvi_Kalmari
+++ b/dvb-t/fi-Saarijarvi_Kalmari
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Saarijarvi_Kalmari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Saarijarvi_Kalmari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Saarijarvi_Kalmari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Saarijarvi_Mahlu b/dvb-t/fi-Saarijarvi_Mahlu
index 5bc654d..48324d0 100644
--- a/dvb-t/fi-Saarijarvi_Mahlu
+++ b/dvb-t/fi-Saarijarvi_Mahlu
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Saarijarvi_Mahlu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Saarijarvi_Mahlu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Saarijarvi_Mahlu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Salla_Hirvasvaara b/dvb-t/fi-Salla_Hirvasvaara
index dabee50..e1410a0 100644
--- a/dvb-t/fi-Salla_Hirvasvaara
+++ b/dvb-t/fi-Salla_Hirvasvaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Salla_Hirvasvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Salla_Hirvasvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Salla_Ihistysjanka b/dvb-t/fi-Salla_Ihistysjanka
index f174639..0d857b5 100644
--- a/dvb-t/fi-Salla_Ihistysjanka
+++ b/dvb-t/fi-Salla_Ihistysjanka
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Salla_Ihistysjanka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[Salla_Ihistysjanka]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Salla_Naruska b/dvb-t/fi-Salla_Naruska
index 82cc301..06bc1ba 100644
--- a/dvb-t/fi-Salla_Naruska
+++ b/dvb-t/fi-Salla_Naruska
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Salla_Naruska]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[Salla_Naruska]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Salla_Sallatunturi b/dvb-t/fi-Salla_Sallatunturi
index 02337c1..54a5554 100644
--- a/dvb-t/fi-Salla_Sallatunturi
+++ b/dvb-t/fi-Salla_Sallatunturi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Salla_Sallatunturi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Salla_Sallatunturi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Salla_Sarivaara b/dvb-t/fi-Salla_Sarivaara
index 02337c1..eb9bbc0 100644
--- a/dvb-t/fi-Salla_Sarivaara
+++ b/dvb-t/fi-Salla_Sarivaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Salla_Sarivaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Salla_Sarivaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Salo_Isokyla b/dvb-t/fi-Salo_Isokyla
index fbc0e16..0cf08b8 100644
--- a/dvb-t/fi-Salo_Isokyla
+++ b/dvb-t/fi-Salo_Isokyla
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Salo_Isokyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Salo_Isokyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[Salo_Isokyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Salo_Isokyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Savukoski_Martti b/dvb-t/fi-Savukoski_Martti
index 528b935..aafbdcb 100644
--- a/dvb-t/fi-Savukoski_Martti
+++ b/dvb-t/fi-Savukoski_Martti
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Savukoski_Martti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Savukoski_Martti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Savukoski_Tanhua b/dvb-t/fi-Savukoski_Tanhua
index 8b0ed7d..91f5fa7 100644
--- a/dvb-t/fi-Savukoski_Tanhua
+++ b/dvb-t/fi-Savukoski_Tanhua
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Savukoski_Tanhua]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Savukoski_Tanhua]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Siilinjarvi b/dvb-t/fi-Siilinjarvi
index f9740e3..7fc1f47 100644
--- a/dvb-t/fi-Siilinjarvi
+++ b/dvb-t/fi-Siilinjarvi
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Siilinjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[Siilinjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[Siilinjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Siilinjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Simo_Viantie b/dvb-t/fi-Simo_Viantie
new file mode 100644
index 0000000..580c7bd
--- /dev/null
+++ b/dvb-t/fi-Simo_Viantie
@@ -0,0 +1,18 @@
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Simo_Viantie]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Simo_Viantie]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Simo_Viantie]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Sipoo_Norrkulla b/dvb-t/fi-Sipoo_Norrkulla
index 36e347f..abfb413 100644
--- a/dvb-t/fi-Sipoo_Norrkulla
+++ b/dvb-t/fi-Sipoo_Norrkulla
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Sipoo_Norrkulla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[Sipoo_Norrkulla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[Sipoo_Norrkulla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Sipoo_Norrkulla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Sodankyla_Pittiovaara b/dvb-t/fi-Sodankyla_Pittiovaara
index 7d4d202..a123f64 100644
--- a/dvb-t/fi-Sodankyla_Pittiovaara
+++ b/dvb-t/fi-Sodankyla_Pittiovaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Sodankyla_Pittiovaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Sodankyla_Pittiovaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Sodankyla_Vuotso b/dvb-t/fi-Sodankyla_Vuotso
index f3d427f..9c60b77 100644
--- a/dvb-t/fi-Sodankyla_Vuotso
+++ b/dvb-t/fi-Sodankyla_Vuotso
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Sodankyla_Vuotso]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Sodankyla_Vuotso]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Sulkava_Vaatalanmaki b/dvb-t/fi-Sulkava_Vaatalanmaki
index f152823..31bdd61 100644
--- a/dvb-t/fi-Sulkava_Vaatalanmaki
+++ b/dvb-t/fi-Sulkava_Vaatalanmaki
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Sulkava_Vaatalanmaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Sulkava_Vaatalanmaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Sulkava_Vaatalanmaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Suomussalmi_Ala-Vuokki b/dvb-t/fi-Suomussalmi_Ala-Vuokki
index d993115..0878a88 100644
--- a/dvb-t/fi-Suomussalmi_Ala-Vuokki
+++ b/dvb-t/fi-Suomussalmi_Ala-Vuokki
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Suomussalmi_Ala-Vuokki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[Suomussalmi_Ala-Vuokki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Suomussalmi_Ammansaari b/dvb-t/fi-Suomussalmi_Ammansaari
index 45a47d1..9afceff 100644
--- a/dvb-t/fi-Suomussalmi_Ammansaari
+++ b/dvb-t/fi-Suomussalmi_Ammansaari
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Suomussalmi_Ammansaari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Suomussalmi_Ammansaari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Suomussalmi_Juntusranta b/dvb-t/fi-Suomussalmi_Juntusranta
index 45a47d1..66c4e5b 100644
--- a/dvb-t/fi-Suomussalmi_Juntusranta
+++ b/dvb-t/fi-Suomussalmi_Juntusranta
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Suomussalmi_Juntusranta]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Suomussalmi_Juntusranta]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Suomussalmi_Myllylahti b/dvb-t/fi-Suomussalmi_Myllylahti
index d8824b2..9630977 100644
--- a/dvb-t/fi-Suomussalmi_Myllylahti
+++ b/dvb-t/fi-Suomussalmi_Myllylahti
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Suomussalmi_Myllylahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Suomussalmi_Myllylahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Sysma_Liikola b/dvb-t/fi-Sysma_Liikola
index 7920a08..9db4424 100644
--- a/dvb-t/fi-Sysma_Liikola
+++ b/dvb-t/fi-Sysma_Liikola
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Sysma_Liikola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Sysma_Liikola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Sysma_Liikola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Sysma_Liikola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Taivalkoski b/dvb-t/fi-Taivalkoski
index 69fe3cb..c307ae4 100644
--- a/dvb-t/fi-Taivalkoski
+++ b/dvb-t/fi-Taivalkoski
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Taivalkoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Taivalkoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Taivalkoski_Taivalvaara b/dvb-t/fi-Taivalkoski_Taivalvaara
index db30f84..ff81bf0 100644
--- a/dvb-t/fi-Taivalkoski_Taivalvaara
+++ b/dvb-t/fi-Taivalkoski_Taivalvaara
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Taivalkoski_Taivalvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Taivalkoski_Taivalvaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Tammela b/dvb-t/fi-Tammela
index 1fbd401..8266610 100644
--- a/dvb-t/fi-Tammela
+++ b/dvb-t/fi-Tammela
@@ -1,7 +1,29 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Tammela-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammela-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammela-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammela-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammela-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+
diff --git a/dvb-t/fi-Tammisaari b/dvb-t/fi-Tammisaari
index 41970b1..5248fd2 100644
--- a/dvb-t/fi-Tammisaari
+++ b/dvb-t/fi-Tammisaari
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Tammisaari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammisaari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammisaari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammisaari]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Tampere b/dvb-t/fi-Tampere
index ee78734..35497e7 100644
--- a/dvb-t/fi-Tampere
+++ b/dvb-t/fi-Tampere
@@ -1,7 +1,29 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Tampere-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+
diff --git a/dvb-t/fi-Tampere_Pyynikki b/dvb-t/fi-Tampere_Pyynikki
index 76ba232..ebd975f 100644
--- a/dvb-t/fi-Tampere_Pyynikki
+++ b/dvb-t/fi-Tampere_Pyynikki
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Tampere_Pyynikki-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere_Pyynikki-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere_Pyynikki-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere_Pyynikki-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere_Pyynikki-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Tervola b/dvb-t/fi-Tervola
index a532c2e..d2c2d94 100644
--- a/dvb-t/fi-Tervola
+++ b/dvb-t/fi-Tervola
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Tervola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Tervola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[Tervola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Turku b/dvb-t/fi-Turku
index 81b9c58..413f6ca 100644
--- a/dvb-t/fi-Turku
+++ b/dvb-t/fi-Turku
@@ -1,7 +1,28 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Turku-A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[Turku-B]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Turku-C]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Turku-E]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[Turku-F]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Utsjoki b/dvb-t/fi-Utsjoki
index 42a1548..b884a17 100644
--- a/dvb-t/fi-Utsjoki
+++ b/dvb-t/fi-Utsjoki
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Utsjoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Utsjoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Utsjoki_Nuvvus b/dvb-t/fi-Utsjoki_Nuvvus
index c1758b5..66d35a3 100644
--- a/dvb-t/fi-Utsjoki_Nuvvus
+++ b/dvb-t/fi-Utsjoki_Nuvvus
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Utsjoki_Nuvvus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Utsjoki_Nuvvus]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Utsjoki_Outakoski b/dvb-t/fi-Utsjoki_Outakoski
index 4438ee0..53a75af 100644
--- a/dvb-t/fi-Utsjoki_Outakoski
+++ b/dvb-t/fi-Utsjoki_Outakoski
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Utsjoki_Outakoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Utsjoki_Outakoski]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Utsjoki_Polvarniemi b/dvb-t/fi-Utsjoki_Polvarniemi
index 4438ee0..0ee4ceb 100644
--- a/dvb-t/fi-Utsjoki_Polvarniemi
+++ b/dvb-t/fi-Utsjoki_Polvarniemi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Utsjoki_Polvarniemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Utsjoki_Polvarniemi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Utsjoki_Rovisuvanto b/dvb-t/fi-Utsjoki_Rovisuvanto
index 748370f..7459a8d 100644
--- a/dvb-t/fi-Utsjoki_Rovisuvanto
+++ b/dvb-t/fi-Utsjoki_Rovisuvanto
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Utsjoki_Rovisuvanto]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Utsjoki_Rovisuvanto]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Utsjoki_Tenola b/dvb-t/fi-Utsjoki_Tenola
index d3c19c2..9650439 100644
--- a/dvb-t/fi-Utsjoki_Tenola
+++ b/dvb-t/fi-Utsjoki_Tenola
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Utsjoki_Tenola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Utsjoki_Tenola]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Uusikaupunki_Orivo b/dvb-t/fi-Uusikaupunki_Orivo
index ea27b86..abe1f7f 100644
--- a/dvb-t/fi-Uusikaupunki_Orivo
+++ b/dvb-t/fi-Uusikaupunki_Orivo
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Uusikaupunki_Orivo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Uusikaupunki_Orivo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Uusikaupunki_Orivo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Uusikaupunki_Orivo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Vaala b/dvb-t/fi-Vaala
index 531ec04..86e8773 100644
--- a/dvb-t/fi-Vaala
+++ b/dvb-t/fi-Vaala
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Vaala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[Vaala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Vaala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Vaasa b/dvb-t/fi-Vaasa
index 38ae49f..7826313 100644
--- a/dvb-t/fi-Vaasa
+++ b/dvb-t/fi-Vaasa
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Vaasa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Vaasa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Vaasa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Valtimo b/dvb-t/fi-Valtimo
index 32f04c5..81e8245 100644
--- a/dvb-t/fi-Valtimo
+++ b/dvb-t/fi-Valtimo
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Valtimo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[Valtimo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Valtimo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Vammala_Jyranvuori b/dvb-t/fi-Vammala_Jyranvuori
index 01f3d3d..26582a8 100644
--- a/dvb-t/fi-Vammala_Jyranvuori
+++ b/dvb-t/fi-Vammala_Jyranvuori
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Vammala_Jyranvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Vammala_Jyranvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[Vammala_Jyranvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[Vammala_Jyranvuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Vammala_Roismala b/dvb-t/fi-Vammala_Roismala
index ff228b2..53f3793 100644
--- a/dvb-t/fi-Vammala_Roismala
+++ b/dvb-t/fi-Vammala_Roismala
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Vammala_Roismala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Vammala_Roismala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Vammala_Roismala]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Vammala_Savi b/dvb-t/fi-Vammala_Savi
index 51ecf07..189afb4 100644
--- a/dvb-t/fi-Vammala_Savi
+++ b/dvb-t/fi-Vammala_Savi
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Vammala_Savi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Vammala_Savi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[Vammala_Savi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Vantaa_Hakunila b/dvb-t/fi-Vantaa_Hakunila
index 3c76ad5..4fceb86 100644
--- a/dvb-t/fi-Vantaa_Hakunila
+++ b/dvb-t/fi-Vantaa_Hakunila
@@ -1,6 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Vantaa_Hakunila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Vantaa_Hakunila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Vantaa_Hakunila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Varpaisjarvi_Honkamaki b/dvb-t/fi-Varpaisjarvi_Honkamaki
index c302258..5bdf974 100644
--- a/dvb-t/fi-Varpaisjarvi_Honkamaki
+++ b/dvb-t/fi-Varpaisjarvi_Honkamaki
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Varpaisjarvi_Honkamaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[Varpaisjarvi_Honkamaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Varpaisjarvi_Honkamaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Varpaisjarvi_Honkamaki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Virrat_Lappavuori b/dvb-t/fi-Virrat_Lappavuori
index 72f369d..61f12b0 100644
--- a/dvb-t/fi-Virrat_Lappavuori
+++ b/dvb-t/fi-Virrat_Lappavuori
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Virrat_Lappavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Virrat_Lappavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Virrat_Lappavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Virrat_Lappavuori]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Vuokatti b/dvb-t/fi-Vuokatti
index 5384321..5a78cf3 100644
--- a/dvb-t/fi-Vuokatti
+++ b/dvb-t/fi-Vuokatti
@@ -1,6 +1,23 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Vuokatti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Vuokatti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[Vuokatti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[Vuokatti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ylitornio_Ainiovaara b/dvb-t/fi-Ylitornio_Ainiovaara
index db30295..ebd72b9 100644
--- a/dvb-t/fi-Ylitornio_Ainiovaara
+++ b/dvb-t/fi-Ylitornio_Ainiovaara
@@ -1,5 +1,18 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ylitornio_Ainiovaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Ylitornio_Ainiovaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Ylitornio_Ainiovaara]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ylitornio_Raanujarvi b/dvb-t/fi-Ylitornio_Raanujarvi
index 4a04198..885c18f 100644
--- a/dvb-t/fi-Ylitornio_Raanujarvi
+++ b/dvb-t/fi-Ylitornio_Raanujarvi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Ylitornio_Raanujarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[Ylitornio_Raanujarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Yllas b/dvb-t/fi-Yllas
index 12faa96..0488cfb 100644
--- a/dvb-t/fi-Yllas
+++ b/dvb-t/fi-Yllas
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Yllas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Yllas]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Yllasjarvi b/dvb-t/fi-Yllasjarvi
index ad6f2a2..6790089 100644
--- a/dvb-t/fi-Yllasjarvi
+++ b/dvb-t/fi-Yllasjarvi
@@ -1,4 +1,13 @@
-# 2012-07-23 Antti Palosaari <crope@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Yllasjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Yllasjarvi]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fr-All b/dvb-t/fr-All
index 77c77d5..c3eba11 100644
--- a/dvb-t/fr-All
+++ b/dvb-t/fr-All
@@ -1,42 +1,481 @@
# France ALL (All channel 21 to 60)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 21
-T 482000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 22
-T 490000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 23
-T 498000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 24
-T 506000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 25
-T 514000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 26
-T 522000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 27
-T 530000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 28
-T 538000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 29
-T 546000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 30
-T 554000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 31
-T 562000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 32
-T 570000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 33
-T 578000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 34
-T 586000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 35
-T 594000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 36
-T 602000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 37
-T 610000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 38
-T 618000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 39
-T 626000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 40
-T 634000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 41
-T 642000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 42
-T 650000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 43
-T 658000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 44
-T 666000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 45
-T 674000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 46
-T 682000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 47
-T 690000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 48
-T 698000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 49
-T 706000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 50
-T 714000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 51
-T 722000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 52
-T 730000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 53
-T 738000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 54
-T 746000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 55
-T 754000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 56
-T 762000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 57
-T 770000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 58
-T 778000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 59
-T 786000000 8MHZ 2/3 NONE QAM64 8K 1/32 NONE #Channel UHF 60
+[UHF 21]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 22]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 23]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 24]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 25]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 26]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 27]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 28]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 29]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 30]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 31]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 32]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 33]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 34]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 35]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 36]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 37]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 38]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 39]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 40]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 41]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 42]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 43]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 44]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 45]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 46]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 47]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 48]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 49]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 50]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 51]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 52]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 53]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 54]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 55]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 56]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 57]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 58]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 59]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[UHF 60]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/fr-Paris b/dvb-t/fr-Paris
new file mode 100644
index 0000000..57a7362
--- /dev/null
+++ b/dvb-t/fr-Paris
@@ -0,0 +1,103 @@
+# en : Paris - France - various DVB-T transmitters
+# fr : Paris - France - differents emetteurs DVB-T de la Tour Eiffel
+# Latest update for the data / derniere mise a jour des donnees : 2017-01-01
+#
+# City Multiplex number : R1 R2 R3 R4 R6 R7 R15
+# Paris - Eiffel Tower - Channel number : 35 25 22 30 32 42 28
+#
+# Note :
+# R8 - Is no longer used since the 05/04/2016 - Channel 58 is no longer used
+# R5 - Is no longer used since the 05/04/2016 - Channel 28 Re-assigned for R15
+#
+
+# R1 - Channel/Canal 35 - Groupe GR1 A (France 2 HD, France 4 HD, France Ô SD, franceinfo: SD), Groupe GR 1 (France 3-Paris Ile de France), Groupe R1 TFL (BFM Business Paris HD)
+[CHANNEL 35]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# R2 - Channel/Canal 25 - Groupe NTN (C8, BFM TV, I-Tele, CStar, Gulli)
+[CHANNEL 25]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# R3 - Channel/Canal 22 - Groupe CNH (Canal+, Canal+ Cinema, Canal+ Sport, Planete+, LCI, Paris Premiere, ?, ?, ?, DATASYSTEM R7, ?)
+[CHANNEL 22]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# R4 - Channel/Canal 30 - Groupe Multi4 (M6, W9, Arte, France5, 6ter)
+[CHANNEL 30]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# R6 - Channel/Canal 32 - Groupe SMR6 (TF1, NRJ12, TMC, NT1, LCP-Public Senat)
+[CHANNEL 32]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# R7 - Channel/Canal 42 - Groupe MHD7 (HD1, Cherie 25, L equipe 21, RMC Decouverte, Numero 23)
+[CHANNEL 42]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# R15 - Channel 28 - local channels only on Paris - Eiffel tower transmitter
+# Group Multi-7 (Canal 31, IDF1, France 24, Canal 34)
+[CHANNEL 28]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530166000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
diff --git a/dvb-t/gr-Athens b/dvb-t/gr-Athens
index f683333..28e6c05 100644
--- a/dvb-t/gr-Athens
+++ b/dvb-t/gr-Athens
@@ -1,5 +1,95 @@
-# Initial scan config for Digital DVB-T (Ert) in Athens Greece
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE # Digea DVB-T
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE # Digea DVB-T
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# Initial scan config for DVB-T in Athens Greece
+# Created from the frequencies listed in
+# http://www.satspot.gr/television/channels/160-tv-sixnotites-attiki
+# and the actual service names for comments.
+
+# ART, ANT1, ALPHA, E
+[Digea 01]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# STAR, M.tv, SKAI, MEGA
+[Digea 02]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# Vouli, Kosmos, N Plus, Deutero, N1, N HD, Trito, Proto
+[DT DIGITAL 01]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# DW, PROTO, KOSMOS, RIK, TRITO, TV 5, Europe, BBC World News
+[DT DIGITAL 02]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# BLUE SKY, ATTICA TV, AB CHANNEL, CHANNEL 9, ACTION24
+[MULTI ATTIKI 01]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# KONTRA, MAD TV, EXTRA CHANNEL, HIGH TV
+[MULTI ATTIKI 02]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+# NICKELODEON, SMILE, SBC, MTV GREECE
+[MULTI ATTIKI 03]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
diff --git a/dvb-t/hk-HongKong b/dvb-t/hk-HongKong
index 4c332ff..1e2d136 100644
--- a/dvb-t/hk-HongKong
+++ b/dvb-t/hk-HongKong
@@ -1,18 +1,94 @@
# Hong Kong (DMB-TH)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# TVB (band 35)
-T 586000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# ATV (band 37)
-T 602000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Simulcast (band 22)
-T 482000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Simulcast (band 30)
-T 546000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Simulcast (band 32)
-T 562000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Simulcast (band 40)
-T 628000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 628000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Simulcast (band 43)
-T 650000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hr-All b/dvb-t/hr-All
index 6561858..2919099 100644
--- a/dvb-t/hr-All
+++ b/dvb-t/hr-All
@@ -1,30 +1,315 @@
# Croatia, whole country
# Created from http://www.oiv.hr/broadcasting/tables/dtv_hr.aspx
# and from http://www.oiv.hr/broadcasting/tables/dtv_channel_hr.aspx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # D1 MUXD
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXA
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D4 MUXA
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D5 MUXA, D9 MUXD
-T 538000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MUXD
-T 538000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE # d72 MUXD
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D6 MUXA
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXD
-T 570000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D8 MUXA
-T 578000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D8 MUXD
-T 586000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE # d71 MUXD
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D3 MUXD
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D1 MUXA
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXB
-T 642000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # D4 MUXD
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D1 MUXB, D3 MUXA, D6 MUXB
-T 666000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MUXD
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SLO MUXA
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D3 MUXB, D4 MUXB
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXA, D9 MUXA
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D5 MUXB, D8 MUXB
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D6 MUXD
-T 762000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE # Tusti Vrh MUXD
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXD
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXB, D9 MUXB
-T 850000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MFN
+[D1 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D2 MUXA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D4 MUXA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D5 MUXA, D9 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D5 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[d72 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D6 MUXA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D7 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D8 MUXA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D8 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[d71 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D3 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D1 MUXA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D2 MUXB]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D4 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D1 MUXB, D3 MUXA, D6 MUXB]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D5 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[SLO MUXA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D3 MUXB, D4 MUXB]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D7 MUXA, D9 MUXA]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D5 MUXB, D8 MUXB]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D6 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Tusti Vrh MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D2 MUXD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D7 MUXB, D9 MUXB]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[D5 MFN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Bekescsaba b/dvb-t/hu-Bekescsaba
index 61aed7b..dac2e7b 100644
--- a/dvb-t/hu-Bekescsaba
+++ b/dvb-t/hu-Bekescsaba
@@ -1,16 +1,37 @@
# Hungary / Bekescsaba
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-38:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-54:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-65:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 738000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Budapest b/dvb-t/hu-Budapest
index f890986..b4c17b3 100644
--- a/dvb-t/hu-Budapest
+++ b/dvb-t/hu-Budapest
@@ -1,16 +1,37 @@
# Hungary / Budapest
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-38:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-55:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-62:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 802000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Csavoly-Kiskoros b/dvb-t/hu-Csavoly-Kiskoros
index f17d75b..9b88371 100644
--- a/dvb-t/hu-Csavoly-Kiskoros
+++ b/dvb-t/hu-Csavoly-Kiskoros
@@ -1,10 +1,20 @@
# Hungary / Csavoly-Kiskoros
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-45:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-00:
# NON-FREE --------------------------------------------------------------------------------
@@ -18,4 +28,15 @@ T 666000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Debrecen-Komadi b/dvb-t/hu-Debrecen-Komadi
index fd2d49b..7395939 100644
--- a/dvb-t/hu-Debrecen-Komadi
+++ b/dvb-t/hu-Debrecen-Komadi
@@ -1,16 +1,37 @@
# Hungary / Debrecen-Komadi
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-46:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-51:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-62:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 714000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 802000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Fehergyarmat b/dvb-t/hu-Fehergyarmat
index e9b27af..dbfdda0 100644
--- a/dvb-t/hu-Fehergyarmat
+++ b/dvb-t/hu-Fehergyarmat
@@ -1,10 +1,20 @@
# Hungary / Fehergyarmat
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-58:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-00:
# NON-FREE --------------------------------------------------------------------------------
@@ -18,4 +28,15 @@ T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Gerecse-Dorog-Tatabanya b/dvb-t/hu-Gerecse-Dorog-Tatabanya
index 2030a21..1a14795 100644
--- a/dvb-t/hu-Gerecse-Dorog-Tatabanya
+++ b/dvb-t/hu-Gerecse-Dorog-Tatabanya
@@ -1,16 +1,37 @@
# Hungary / Gerecse-Dorog-Tatabanya
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-64:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-29:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-63:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 538000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 810000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Gyor b/dvb-t/hu-Gyor
index 9b7d0dd..5ecd59c 100644
--- a/dvb-t/hu-Gyor
+++ b/dvb-t/hu-Gyor
@@ -1,16 +1,37 @@
# Hungary / Gyor
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-42:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-25:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-61:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Kabhegy-Kaposvar-Tamasi b/dvb-t/hu-Kabhegy-Kaposvar-Tamasi
index 54a52b0..6c5cbfe 100644
--- a/dvb-t/hu-Kabhegy-Kaposvar-Tamasi
+++ b/dvb-t/hu-Kabhegy-Kaposvar-Tamasi
@@ -1,10 +1,20 @@
# Hungary / Kabhegy-Kaposvar-Tamasi
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-64:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-00:
# NON-FREE --------------------------------------------------------------------------------
@@ -18,4 +28,15 @@ T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac b/dvb-t/hu-Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac
index 6054377..2b2cab5 100644
--- a/dvb-t/hu-Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac
+++ b/dvb-t/hu-Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac
@@ -1,16 +1,37 @@
# Hungary / Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-38:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-55:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-62:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 802000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Karcag b/dvb-t/hu-Karcag
index 7a70d0e..ae6390a 100644
--- a/dvb-t/hu-Karcag
+++ b/dvb-t/hu-Karcag
@@ -1,16 +1,37 @@
# Hungary / Karcag
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-46:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-30:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-64:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Kecskemet b/dvb-t/hu-Kecskemet
index 37ab7c0..cf9ffad 100644
--- a/dvb-t/hu-Kecskemet
+++ b/dvb-t/hu-Kecskemet
@@ -1,16 +1,37 @@
# Hungary / Kecskemet
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-56:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-39:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-68:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd b/dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd
index 6ad14bc..58afcd9 100644
--- a/dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd
+++ b/dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd
@@ -1,16 +1,37 @@
# Hungary / Kekes-Cegled-Miskolctapolca
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-44:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-39:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-69:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 858000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Miskolc-Aggtelek-Fony b/dvb-t/hu-Miskolc-Aggtelek-Fony
index c287a95..361ac5a 100644
--- a/dvb-t/hu-Miskolc-Aggtelek-Fony
+++ b/dvb-t/hu-Miskolc-Aggtelek-Fony
@@ -1,16 +1,37 @@
# Hungary / Miskolc-Aggtelek-Fony
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-45:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-31:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-63:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 810000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Mor-Siofok-Veszprem-Zirc b/dvb-t/hu-Mor-Siofok-Veszprem-Zirc
index 2ac4cec..cc2e32a 100644
--- a/dvb-t/hu-Mor-Siofok-Veszprem-Zirc
+++ b/dvb-t/hu-Mor-Siofok-Veszprem-Zirc
@@ -1,16 +1,37 @@
# Hungary / Mor-Siofok-Veszprem-Zirc
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-64:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-29:
# NON-FREE ----------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-61:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 538000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Nagykanizsa-Barcs-Keszthely b/dvb-t/hu-Nagykanizsa-Barcs-Keszthely
index 5b2a455..ce0ee07 100644
--- a/dvb-t/hu-Nagykanizsa-Barcs-Keszthely
+++ b/dvb-t/hu-Nagykanizsa-Barcs-Keszthely
@@ -1,16 +1,37 @@
# Hungary / Nagykanizsa-Barcs-Keszthely
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-24:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-55:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-65:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely b/dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely
index 2f3eedd..03f8e96 100644
--- a/dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely
+++ b/dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely
@@ -1,16 +1,37 @@
# Hungary / Nyíregyhaza-Tokaj-Kzincbarcika-Saly-Satoraljaujhely
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-68:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-31:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-63:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 810000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Pecs-Siklos b/dvb-t/hu-Pecs-Siklos
index d78ba84..b5497c8 100644
--- a/dvb-t/hu-Pecs-Siklos
+++ b/dvb-t/hu-Pecs-Siklos
@@ -1,10 +1,20 @@
# Hungary / Pecs-Siklos
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-52:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-00:
# NON-FREE --------------------------------------------------------------------------------
@@ -18,4 +28,15 @@ T 722000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 842000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Sopron-Koszeg b/dvb-t/hu-Sopron-Koszeg
index 297390c..4a9b080 100644
--- a/dvb-t/hu-Sopron-Koszeg
+++ b/dvb-t/hu-Sopron-Koszeg
@@ -1,16 +1,37 @@
# Hungary / Sopron-Koszeg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-42:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-40:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-68:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 626000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Szeged b/dvb-t/hu-Szeged
index 6dcc0e4..5fa2aa1 100644
--- a/dvb-t/hu-Szeged
+++ b/dvb-t/hu-Szeged
@@ -1,16 +1,37 @@
# Hungary / Szeged
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-60:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-22:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-65:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Szekesfehervar b/dvb-t/hu-Szekesfehervar
index a68f357..69b2162 100644
--- a/dvb-t/hu-Szekesfehervar
+++ b/dvb-t/hu-Szekesfehervar
@@ -1,16 +1,37 @@
# Hungary / Szekesfehervar
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-30:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-29:
# NON-FREE --------------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-63:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 538000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 810000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Szentes-Battonya b/dvb-t/hu-Szentes-Battonya
index cfc683b..c4f756a 100644
--- a/dvb-t/hu-Szentes-Battonya
+++ b/dvb-t/hu-Szentes-Battonya
@@ -1,10 +1,20 @@
# Hungary / Szentes-Battonya
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-60:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-00:
# NON-FREE ----------------------------------------------------------------------------
@@ -18,4 +28,15 @@ T 786000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Szolnok b/dvb-t/hu-Szolnok
index 98da473..1f371e0 100644
--- a/dvb-t/hu-Szolnok
+++ b/dvb-t/hu-Szolnok
@@ -1,16 +1,37 @@
# Hungary / Szolnok
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-56:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-30:
# NON-FREE ----------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-64:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg b/dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg
index af1ddb2..5877b4c 100644
--- a/dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg
+++ b/dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg
@@ -1,16 +1,37 @@
# Hungary / Szombathely-Vasvar-Lenti-Zalaegerszeg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-38:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-58:
# NON-FREE ----------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-68:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar b/dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar
index 029ebbb..78075e4 100644
--- a/dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar
+++ b/dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar
@@ -1,16 +1,37 @@
# Hungary / Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
# A.multiplex UHF-52:
# FREE -----------------------------------------------------------------------------------
# m1 HD, m2 HD, Duna World, Duna HD, MR1 Kossuth Radio, MR2 Petofi Radio, MR3 Bartok Radio
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# B.multiplex UHF-37:
# NON-FREE ----------------------------------------------------------------------------
# PRO4, VIASAT3, Prizma TV, Muzsika TV, Universal Channel, Comedy Central, Minimax,
# Cartoon Network, Spektrum, History, Sport1, Sport2, Dorcel TV
-T 602000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# C.multiplex UHF-67:
# FREE --------------------------------------------------------------------------------
@@ -18,4 +39,15 @@ T 602000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
# NON-FREE ----------------------------------------------------------------------------
# Cool, Film+, HBO, National Geographic, Disney Channel, AXN, FEM3, Private spice, ATV,
# HirTV, Sportklub
-T 842000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-CairnHill b/dvb-t/ie-CairnHill
index 2409177..d3a5dc5 100644
--- a/dvb-t/ie-CairnHill
+++ b/dvb-t/ie-CairnHill
@@ -1,5 +1,26 @@
# Ireland, Cairn Hill
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH47: Saorview MUX1
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH44: Saorview MUX2
+[CH47: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH44: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-ClermontCarn b/dvb-t/ie-ClermontCarn
index fde9fc9..81f17d2 100644
--- a/dvb-t/ie-ClermontCarn
+++ b/dvb-t/ie-ClermontCarn
@@ -1,5 +1,26 @@
# Ireland, Clermont Carn
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH52: Saorview MUX1
-T 754000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH56: Saorview MUX2
+[CH52: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH56: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-Dungarvan b/dvb-t/ie-Dungarvan
index f415097..1c2ccd8 100644
--- a/dvb-t/ie-Dungarvan
+++ b/dvb-t/ie-Dungarvan
@@ -1,5 +1,26 @@
# Ireland, Dungarvan
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH55: Saorview MUX1
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH59: Saorview MUX2
+[CH55: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH59: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-HolywellHill b/dvb-t/ie-HolywellHill
index 1b83b76..5bb2c58 100644
--- a/dvb-t/ie-HolywellHill
+++ b/dvb-t/ie-HolywellHill
@@ -1,5 +1,26 @@
# Ireland, Holywell Hill
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH30: Saorview MUX1
-T 570000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH33: Saorview MUX2
+[CH30: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH33: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-Kippure b/dvb-t/ie-Kippure
index df6d883..8a7a3be 100644
--- a/dvb-t/ie-Kippure
+++ b/dvb-t/ie-Kippure
@@ -1,5 +1,26 @@
# Ireland, Kippure
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH54: Saorview MUX1
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH58: Saorview MUX2
+[CH54: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH58: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-Maghera b/dvb-t/ie-Maghera
index 11c08b7..e87acd9 100644
--- a/dvb-t/ie-Maghera
+++ b/dvb-t/ie-Maghera
@@ -1,5 +1,26 @@
# Ireland, Maghera
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH48: Saorview MUX1
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH55: Saorview MUX2
+[CH48: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH55: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-MountLeinster b/dvb-t/ie-MountLeinster
index e5515c2..60430a2 100644
--- a/dvb-t/ie-MountLeinster
+++ b/dvb-t/ie-MountLeinster
@@ -1,5 +1,26 @@
# Ireland, Mount Leinster
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH23: Saorview MUX1
-T 514000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH26: Saorview MUX2
+[CH23: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH26: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-Mullaghanish b/dvb-t/ie-Mullaghanish
index 7767a5d..9eb7ceb 100644
--- a/dvb-t/ie-Mullaghanish
+++ b/dvb-t/ie-Mullaghanish
@@ -1,5 +1,26 @@
# Ireland, Mullaghanish
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH21: Saorview MUX1
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH24: Saorview MUX2
+[CH21: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH24: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-SpurHill b/dvb-t/ie-SpurHill
index 7566d82..96782fe 100644
--- a/dvb-t/ie-SpurHill
+++ b/dvb-t/ie-SpurHill
@@ -1,5 +1,26 @@
# Ireland, Spur Hill
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH45: Saorview MUX1
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH49: Saorview MUX2
+[CH45: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH49: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-ThreeRock b/dvb-t/ie-ThreeRock
index ec21a00..7df648e 100644
--- a/dvb-t/ie-ThreeRock
+++ b/dvb-t/ie-ThreeRock
@@ -1,5 +1,26 @@
# Ireland, Three Rock
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH30: Saorview MUX1
-T 570000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE # CH33: Saorview MUX2
+[CH30: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH33: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-Truskmore b/dvb-t/ie-Truskmore
index a42de62..838429c 100644
--- a/dvb-t/ie-Truskmore
+++ b/dvb-t/ie-Truskmore
@@ -1,5 +1,26 @@
# Ireland, Truskmore
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH53: Saorview MUX1
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH57: Saorview MUX2
+[CH53: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH57: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ie-WoodcockHill b/dvb-t/ie-WoodcockHill
index 23961bd..065e6fc 100644
--- a/dvb-t/ie-WoodcockHill
+++ b/dvb-t/ie-WoodcockHill
@@ -1,5 +1,26 @@
# Ireland, Woodcock Hill
# Generated from http://www.comreg.ie/_fileupload/Broadcast_Technical_Parameters.xlsx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH47: Saorview MUX1
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # CH44: Saorview MUX2
+[CH47: Saorview MUX1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CH44: Saorview MUX2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/il-All b/dvb-t/il-All
index 3a74a6c..14e2b5d 100644
--- a/dvb-t/il-All
+++ b/dvb-t/il-All
@@ -1,5 +1,26 @@
# Israel, Israel Broadcasting Authority's transmitters
# Generated from list in http://www.iba.org.il/reception/
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ir-Tehran b/dvb-t/ir-Tehran
index d9ec5ad..9c28a77 100644
--- a/dvb-t/ir-Tehran
+++ b/dvb-t/ir-Tehran
@@ -1,4 +1,25 @@
# DVB-T Tehran
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # IRIB-TV1/2/3/4/5, IRINN, AMOUZESH, QURAN-TV
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # PRESS TV, AL-ALAM, AL-KOUSAR, JAAMEJAM 1, IRIB MOSTANAD, IRIB OSTANI
+[IRIB-TV1/2/3/4/5, IRINN, AMOUZESH, QURAN-TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[PRESS TV, AL-ALAM, AL-KOUSAR, JAAMEJAM 1, IRIB MOSTANAD, IRIB OSTANI]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/is-Reykjavik b/dvb-t/is-Reykjavik
index 8d3f039..c898a6b 100644
--- a/dvb-t/is-Reykjavik
+++ b/dvb-t/is-Reykjavik
@@ -7,23 +7,220 @@
# date (yyyy-mm-dd) : 2010-10-22
# provided by (opt) : <your name or email here>
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
#------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # Vodafone
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 770000000 8MHz 1/2 NONE QAM64 2k 1/32 NONE # Vodafone
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 738000000 8MHz 1/2 NONE QPSK 2k 1/32 NONE # Vodafone
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Vodafone]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/it-All b/dvb-t/it-All
index e1134c3..c41cac3 100644
--- a/dvb-t/it-All
+++ b/dvb-t/it-All
@@ -12,124 +12,750 @@
# http://en.wikipedia.org/wiki/File:VHF_Usage.svg
# http://en.wikipedia.org/wiki/Television_channel_frequencies
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
### VHF - Band III ###
# 5
-T 177500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 6
-T 184500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 7
-T 191500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 8
-T 198500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 9
-T 205500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 10
-T 212500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 11
-T 219500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 219500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 12
-T 226500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 226500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
### UHF - Band IV ###
# 21
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 22
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 23
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 24
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 26
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 27
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 28
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 29
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 30
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 31
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 32
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 33
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 34
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 35
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 36
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 37
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
### UHF - Band V ###
# 38
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 39
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 40
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 41
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 42
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 43
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 44
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 45
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 46
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 47
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 48
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 49
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 50
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 51
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 53
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 54
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 55
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 56
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 57
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 58
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 60
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 61
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 62
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 63
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 64
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 65
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 66
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 67
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 68
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 69
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ke-Nairobi b/dvb-t/ke-Nairobi
new file mode 100644
index 0000000..eb06512
--- /dev/null
+++ b/dvb-t/ke-Nairobi
@@ -0,0 +1,226 @@
+# location and provider : Nairobi-Kenya
+# date : 2016-12-03
+# provided by : Joseph Zikusooka
+# : http://joseph.zikusooka.com
+# : josephzik@gmail.com
+#
+#------------------------------------------------------------------------------
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT22
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = AUTO
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT22
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = AUTO
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = AUTO
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 851968000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = 3/4
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 4K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = 1
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 1007943680
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 1645032704
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 5940000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 5060000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 6740000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/lt-All b/dvb-t/lt-All
index daf2da2..4ae5fef 100644
--- a/dvb-t/lt-All
+++ b/dvb-t/lt-All
@@ -3,37 +3,300 @@
# Created by baruse@gmail.com
# LRTC I tinklas
-T 482000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 22
-T 514000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 26
-T 618000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 39
-T 658000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 44
-T 682000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 47
-T 762000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 57
-T 770000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 58
-T 786000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 60
-T 794000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 61
+[kanalas 22]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 26]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 39]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 44]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 47]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 57]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 58]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 60]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 61]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# LRTC II tinklas
-T 570000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 33
-T 610000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 38
-T 690000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 48
-T 738000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 54
-T 802000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 62
-T 810000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 63
-T 818000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 64
+[kanalas 33]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 38]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 48]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 54]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 62]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 63]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 64]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# TEO LT I tinklas
-T 594000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 36
-T 706000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 50
-T 778000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 59
-T 826000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 65
+[kanalas 36]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 50]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 59]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 65]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# TEO LT II tinklas
-T 474000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 21
-T 546000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 30
-T 730000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 53
+[kanalas 21]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 30]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[kanalas 53]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#T 786000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 60
# Vilniui bonusas
-T 602000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 37
-#T 730000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 53
+[kanalas 37]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/lu-All b/dvb-t/lu-All
index 32e87f8..4e8053f 100644
--- a/dvb-t/lu-All
+++ b/dvb-t/lu-All
@@ -1,6 +1,49 @@
# DVB-T Luxembourg [2007-11-18]
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 191500000 7MHz 2/3 NONE QAM16 8k 1/8 NONE # Kanal 7 M6, RTL 8, LUXE.TV
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Kanal 21 air
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # Kanal 24 club RTL, RTL TVI, plug TV, RTL 4, RTL 5, RTL 7
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # Kanal 27 RTL TeleLetz, 2 ten RTL
+[Kanal 7 M6, RTL 8, LUXE.TV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Kanal 21 air]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Kanal 24 club RTL, RTL TVI, plug TV, RTL 4, RTL 5, RTL 7]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Kanal 27 RTL TeleLetz, 2 ten RTL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/lv-Riga b/dvb-t/lv-Riga
index 98478e0..bfb2e37 100644
--- a/dvb-t/lv-Riga
+++ b/dvb-t/lv-Riga
@@ -2,24 +2,91 @@
# Generated by Raimonds Cicans
# UTF8 encoding
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# DLRTC
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE # Weak signal! VÄjÅ¡ signÄls! Слабый Ñигнал!
+[Weak signal! VÄjÅ¡ signÄls! Слабый Ñигнал!]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# Baltkom TV
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 658000000 8MHz 1/2 NONE QPSK 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 834000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
-# WARNING!
-# Some applications detect incorrect guard-interval.
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
-# UZMANĪBU!
-# Dažas programmas nekorekti nosaka "guard-interval" parametru.
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
-# Ð’ÐИМÐÐИЕ!
-# Ðекоторые программы некорректно определÑÑŽÑ‚ параметр "guard-interval"
diff --git a/dvb-t/nl-All b/dvb-t/nl-All
index c1e6596..33fccd3 100644
--- a/dvb-t/nl-All
+++ b/dvb-t/nl-All
@@ -1,44 +1,483 @@
# The Netherlands, whole country
-# Created from http://radio-tv-nederland.nl/TV%20zenderlijst%20Nederland.xls
+# Created from http://radio-tv-nederland.nl/TV 1.251978e-312nderlijst%20Nederland.xls
# and http://radio-tv-nederland.nl/dvbt/dvbt-lokaal.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 482000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 514000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 538000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 546000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 562000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 578000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 594000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 666000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 674000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 690000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 698000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 706000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 722000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 746000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 786000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/no-Trondelag_Stjordal b/dvb-t/no-Trondelag_Stjordal
index a9dc446..f6d8997 100644
--- a/dvb-t/no-Trondelag_Stjordal
+++ b/dvb-t/no-Trondelag_Stjordal
@@ -1,7 +1,39 @@
# Norway / Trondelag / Stjordal
# modified according to data automatically generated by w_scan
# free (nrk) channels are on 658000000
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-AucklandInfill b/dvb-t/nz-AucklandInfill
index 08e572f..dc05f0c 100644
--- a/dvb-t/nz-AucklandInfill
+++ b/dvb-t/nz-AucklandInfill
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 562000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-AucklandWaiatarua b/dvb-t/nz-AucklandWaiatarua
index 83c1be8..4fbeb87 100644
--- a/dvb-t/nz-AucklandWaiatarua
+++ b/dvb-t/nz-AucklandWaiatarua
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 570000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-Christchurch b/dvb-t/nz-Christchurch
index 794a0b9..242c186 100644
--- a/dvb-t/nz-Christchurch
+++ b/dvb-t/nz-Christchurch
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-Dunedin b/dvb-t/nz-Dunedin
index ad19937..440449a 100644
--- a/dvb-t/nz-Dunedin
+++ b/dvb-t/nz-Dunedin
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-Hamilton b/dvb-t/nz-Hamilton
index 6b44438..eeb5b41 100644
--- a/dvb-t/nz-Hamilton
+++ b/dvb-t/nz-Hamilton
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-HawkesBayMtErin b/dvb-t/nz-HawkesBayMtErin
index aece900..6b6cee1 100644
--- a/dvb-t/nz-HawkesBayMtErin
+++ b/dvb-t/nz-HawkesBayMtErin
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-HawkesBayNapier b/dvb-t/nz-HawkesBayNapier
index cebd667..0941b83 100644
--- a/dvb-t/nz-HawkesBayNapier
+++ b/dvb-t/nz-HawkesBayNapier
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-Manawatu b/dvb-t/nz-Manawatu
index eb64119..9c01304 100644
--- a/dvb-t/nz-Manawatu
+++ b/dvb-t/nz-Manawatu
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-Tauranga b/dvb-t/nz-Tauranga
index 3c3abce..3b30c5e 100644
--- a/dvb-t/nz-Tauranga
+++ b/dvb-t/nz-Tauranga
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-Waikato b/dvb-t/nz-Waikato
index 6dd7c81..d88cea6 100644
--- a/dvb-t/nz-Waikato
+++ b/dvb-t/nz-Waikato
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-WellingtonInfill b/dvb-t/nz-WellingtonInfill
index 61042c4..63d4871 100644
--- a/dvb-t/nz-WellingtonInfill
+++ b/dvb-t/nz-WellingtonInfill
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-WellingtonKaukau b/dvb-t/nz-WellingtonKaukau
index fa49dd6..9111f1a 100644
--- a/dvb-t/nz-WellingtonKaukau
+++ b/dvb-t/nz-WellingtonKaukau
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/nz-WellingtonNgarara b/dvb-t/nz-WellingtonNgarara
index 4fb3469..27d920c 100644
--- a/dvb-t/nz-WellingtonNgarara
+++ b/dvb-t/nz-WellingtonNgarara
@@ -3,8 +3,40 @@
# Channel allocation details for NZ can be found at
# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/pl-Czestochowa b/dvb-t/pl-Czestochowa
index 5ab452f..e24f5f6 100644
--- a/dvb-t/pl-Czestochowa
+++ b/dvb-t/pl-Czestochowa
@@ -7,8 +7,40 @@
# date (yyyy-mm-dd) : 2012-11-30
# provided by (opt) : Jakub Kasprzycki jakub@kasprzycki.name
#
-# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
#------------------------------------------------------------------------------
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE # MUX-1 Emitel Wreczyca 100KW H
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE # MUX-2 Emitel Wreczyca 100KW H
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE # MUX-3 TON Czestochowa/Bleszno 2KW H
+[MUX-1 Emitel Wreczyca 100KW H]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[MUX-2 Emitel Wreczyca 100KW H]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[MUX-3 TON Czestochowa/Bleszno 2KW H]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/pl-Gdansk b/dvb-t/pl-Gdansk
index 3b64d73..6ff18cb 100644
--- a/dvb-t/pl-Gdansk
+++ b/dvb-t/pl-Gdansk
@@ -1,4 +1,25 @@
# Gdańsk, Poland
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/pl-Krakow b/dvb-t/pl-Krakow
index d81b77d..12b164f 100644
--- a/dvb-t/pl-Krakow
+++ b/dvb-t/pl-Krakow
@@ -7,11 +7,76 @@
# date (yyyy-mm-dd) : 2011-10-29
# provided by (opt) : Damian Golda
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
#------------------------------------------------------------------------------
-T 490000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # Ch.23, Mux2 Tarnow/g.Sw.Marcina
-T 690000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # NW 04 Malopolskie, Ch.48, Mux3 Krakow/Choragwica 2kW
-T 698000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # Ch.49, Mux2 Katowice/Kosztowy
-T 714000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # Ch.51, Mux3 Katowice/Kosztowy 2.5kW
-T 802000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # Ch.62, Mux1 Wisla/Skrzyczne
-T 818000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # TP EmiTel Ch.64, Mux3 Krakow/Choragwica
+[Ch.23, Mux2 Tarnow/g.Sw.Marcina]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[NW 04 Malopolskie, Ch.48, Mux3 Krakow/Choragwica 2kW]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Ch.49, Mux2 Katowice/Kosztowy]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Ch.51, Mux3 Katowice/Kosztowy 2.5kW]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Ch.62, Mux1 Wisla/Skrzyczne]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[TP EmiTel Ch.64, Mux3 Krakow/Choragwica]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/pl-Krosno_Sucha_Gora b/dvb-t/pl-Krosno_Sucha_Gora
new file mode 100644
index 0000000..cb4e92d
--- /dev/null
+++ b/dvb-t/pl-Krosno_Sucha_Gora
@@ -0,0 +1,35 @@
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
diff --git a/dvb-t/pl-Rzeszow b/dvb-t/pl-Rzeszow
index 561705e..1991878 100644
--- a/dvb-t/pl-Rzeszow
+++ b/dvb-t/pl-Rzeszow
@@ -1,3 +1,13 @@
# Rzeszow / Sucha Gora, South-East Poland
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/pl-Szczecin b/dvb-t/pl-Szczecin
new file mode 100644
index 0000000..86db69f
--- /dev/null
+++ b/dvb-t/pl-Szczecin
@@ -0,0 +1,46 @@
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20091230 1 0 OFDM PL </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Poland, Szczecin
+# date (yyyy-mm-dd) : 2015-12-01
+# provided by (opt) : Fantom
+#
+#------------------------------------------------------------------------------
+
+[Zachodniopomorskie, Ch.41, Mux1 Szczecin/Kolowo 100kW]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Zachodniopomorskie, Ch.34, Mux2 Szczecin/Kolowo 100kW]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Zachodniopomorskie, Ch.48, Mux3 Szczecin/Kolowo 100kW]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
diff --git a/dvb-t/pl-Warszawa b/dvb-t/pl-Warszawa
index 6ea4bb6..e6c6b3e 100644
--- a/dvb-t/pl-Warszawa
+++ b/dvb-t/pl-Warszawa
@@ -1,10 +1,64 @@
-# location : PL Warszawa mazowieckie
-# date scanned : 2011-11-17
+# Warsaw (Masowian), Poland
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
-#T 538000000 8MHz AUTO AUTO AUTO AUTO AUTO AUTO # Polsat HD
-T 548000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE #
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # MUX2 (dotych. naziemne bez TVP)
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # TVN ND
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE # MUX3 (TVP)
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE #
+# Channels info: http://sat-charts.eu/dvb-t.php
+#
+[Raszyn/PKiN MUX-3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Raszyn/PKiN MUX-8 (TVNHD)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Raszyn/PKiN MUX-1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Raszyn/PKiN MUX-2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[PKiN MUX-8]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 5/6
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/pl-Wroclaw b/dvb-t/pl-Wroclaw
index d6b0f9b..cffbe7f 100644
--- a/dvb-t/pl-Wroclaw
+++ b/dvb-t/pl-Wroclaw
@@ -1,3 +1,13 @@
# Wroclaw / Zorawina, South-West Poland
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/pt-All b/dvb-t/pt-All
index 646759c..119e4db 100644
--- a/dvb-t/pt-All
+++ b/dvb-t/pt-All
@@ -1,9 +1,85 @@
# Generated from http://tdt-portugal.blogspot.pt/
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Monte da Virgem
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Lousa (Trevim)
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Montejunto
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Mainland SFN
+[Monte da Virgem]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Lousa (Trevim)]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Montejunto]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Mainland SFN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ro-Bucharest b/dvb-t/ro-Bucharest
index fac0ca9..e2427ce 100644
--- a/dvb-t/ro-Bucharest
+++ b/dvb-t/ro-Bucharest
@@ -1,5 +1,37 @@
# Romania / Bucharest
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/16 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # SRTV
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # SNR DVB-T
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[SRTV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[SNR DVB-T]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ru-Krasnodar b/dvb-t/ru-Krasnodar
index 51d58d0..04a0fdb 100644
--- a/dvb-t/ru-Krasnodar
+++ b/dvb-t/ru-Krasnodar
@@ -1,6 +1,26 @@
# Russia, Krasnodar
-# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
-T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 0
-T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 1
-T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 2
-T2 618000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 4/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 4/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 1
+ INVERSION = AUTO
diff --git a/dvb-t/ru-Novosibirsk b/dvb-t/ru-Novosibirsk
index 443c7e4..3be3c33 100644
--- a/dvb-t/ru-Novosibirsk
+++ b/dvb-t/ru-Novosibirsk
@@ -1,6 +1,26 @@
# Russia, Novosibirsk
-# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
-T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 0
-T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 1
-T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 2
-T2 530000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 4/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 4/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 1
+ INVERSION = AUTO
diff --git a/dvb-t/ru-Vladivostok b/dvb-t/ru-Vladivostok
new file mode 100644
index 0000000..997838f
--- /dev/null
+++ b/dvb-t/ru-Vladivostok
@@ -0,0 +1,54 @@
+# Channel ranges for DVB-T2 in Vladivostok - Russia
+# Contributed by: Придворов Ðндрей "(Pridvorov Andrey)" <ua0lnj@bk.ru>
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 1
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 2
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
diff --git a/dvb-t/ru-Volgodonsk b/dvb-t/ru-Volgodonsk
index 2089a70..6832d72 100644
--- a/dvb-t/ru-Volgodonsk
+++ b/dvb-t/ru-Volgodonsk
@@ -1,6 +1,26 @@
# Russia, Volgodonsk
-# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
-T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 0
-T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 1
-T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 2
-T2 650000000 8MHz 4/5 NONE QAM64 32k AUTO NONE 3
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 4/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 4/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 1
+ INVERSION = AUTO
diff --git a/dvb-t/ru-all b/dvb-t/ru-all
new file mode 100644
index 0000000..070355f
--- /dev/null
+++ b/dvb-t/ru-all
@@ -0,0 +1,730 @@
+# Channel ranges for DVB-T2 in Russia
+# Contributed by: Придворов Ðндрей "(Pridvorov Andrey)" <ua0lnj@bk.ru>
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 178000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 186000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 194000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 202000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 210000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 218000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 226000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 794000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 802000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 810000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 818000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 826000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 834000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 842000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 850000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 858000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
diff --git a/dvb-t/se-Aareavaara b/dvb-t/se-Aareavaara
new file mode 100644
index 0000000..13d716a
--- /dev/null
+++ b/dvb-t/se-Aareavaara
@@ -0,0 +1,5 @@
+# Sweden - Aareavaara
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Adolfstrom b/dvb-t/se-Adolfstrom
new file mode 100644
index 0000000..b7aa445
--- /dev/null
+++ b/dvb-t/se-Adolfstrom
@@ -0,0 +1,5 @@
+# Sweden - Adolfström
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Agnas b/dvb-t/se-Agnas
new file mode 100644
index 0000000..bd7c1c9
--- /dev/null
+++ b/dvb-t/se-Agnas
@@ -0,0 +1,5 @@
+# Sweden - Agnäs
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Akersjon b/dvb-t/se-Akersjon
new file mode 100644
index 0000000..26dc4ed
--- /dev/null
+++ b/dvb-t/se-Akersjon
@@ -0,0 +1,5 @@
+# Sweden - Åkersjön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Alafors b/dvb-t/se-Alafors
new file mode 100644
index 0000000..c126dce
--- /dev/null
+++ b/dvb-t/se-Alafors
@@ -0,0 +1,35 @@
+# Sweden - Alafors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Albacken b/dvb-t/se-Albacken
new file mode 100644
index 0000000..e91aa4f
--- /dev/null
+++ b/dvb-t/se-Albacken
@@ -0,0 +1,5 @@
+# Sweden - Albacken
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Algsjo b/dvb-t/se-Algsjo
new file mode 100644
index 0000000..6bcb782
--- /dev/null
+++ b/dvb-t/se-Algsjo
@@ -0,0 +1,5 @@
+# Sweden - Älgsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Alingsas_Mariedal b/dvb-t/se-Alingsas_Mariedal
new file mode 100644
index 0000000..249fe98
--- /dev/null
+++ b/dvb-t/se-Alingsas_Mariedal
@@ -0,0 +1,35 @@
+# Sweden - Alingsås/Mariedal
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Alvangen b/dvb-t/se-Alvangen
new file mode 100644
index 0000000..cd389a2
--- /dev/null
+++ b/dvb-t/se-Alvangen
@@ -0,0 +1,35 @@
+# Sweden - Älvängen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Alvdalen_Brunnsberg b/dvb-t/se-Alvdalen_Brunnsberg
index d9e5427..4f1b825 100644
--- a/dvb-t/se-Alvdalen_Brunnsberg
+++ b/dvb-t/se-Alvdalen_Brunnsberg
@@ -1,3 +1,13 @@
# Sweden - Älvdalen/Brunnsberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Alvdalsasen b/dvb-t/se-Alvdalsasen
index d291cf6..1561589 100644
--- a/dvb-t/se-Alvdalsasen
+++ b/dvb-t/se-Alvdalsasen
@@ -1,3 +1,13 @@
# Sweden - Älvdalsåsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Alvsbacka b/dvb-t/se-Alvsbacka
new file mode 100644
index 0000000..ceb9635
--- /dev/null
+++ b/dvb-t/se-Alvsbacka
@@ -0,0 +1,5 @@
+# Sweden - Älvsbacka
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Alvsbyn b/dvb-t/se-Alvsbyn
index 214928d..4c308d0 100644
--- a/dvb-t/se-Alvsbyn
+++ b/dvb-t/se-Alvsbyn
@@ -1,7 +1,70 @@
# Sweden - Älvsbyn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ammarnas_Ribovardo b/dvb-t/se-Ammarnas_Ribovardo
new file mode 100644
index 0000000..9206a9a
--- /dev/null
+++ b/dvb-t/se-Ammarnas_Ribovardo
@@ -0,0 +1,5 @@
+# Sweden - Ammarnäs Ribovardo
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ammarnas_Tjultrask b/dvb-t/se-Ammarnas_Tjultrask
new file mode 100644
index 0000000..4bb1d35
--- /dev/null
+++ b/dvb-t/se-Ammarnas_Tjultrask
@@ -0,0 +1,5 @@
+# Sweden - Ammarnäs/Tjulträsk
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Amot b/dvb-t/se-Amot
index f93453c..36697b7 100644
--- a/dvb-t/se-Amot
+++ b/dvb-t/se-Amot
@@ -1,3 +1,13 @@
# Sweden - Ã…mot
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Amotfors_Kroppstad b/dvb-t/se-Amotfors_Kroppstad
new file mode 100644
index 0000000..9272645
--- /dev/null
+++ b/dvb-t/se-Amotfors_Kroppstad
@@ -0,0 +1,5 @@
+# Sweden - Ã…motfors Kroppstad
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-An b/dvb-t/se-An
new file mode 100644
index 0000000..acabed7
--- /dev/null
+++ b/dvb-t/se-An
@@ -0,0 +1,5 @@
+# Sweden - Ã…n
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Andersvattnet_Ersmyrberget b/dvb-t/se-Andersvattnet_Ersmyrberget
new file mode 100644
index 0000000..aa82b3f
--- /dev/null
+++ b/dvb-t/se-Andersvattnet_Ersmyrberget
@@ -0,0 +1,5 @@
+# Sweden - Andersvattnet/Ersmyrberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ange_Snoberg b/dvb-t/se-Ange_Snoberg
index 661ec98..7f0bac7 100644
--- a/dvb-t/se-Ange_Snoberg
+++ b/dvb-t/se-Ange_Snoberg
@@ -1,6 +1,63 @@
# Sweden - Ånge/Snöberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Angebo b/dvb-t/se-Angebo
index ee67956..d3145ea 100644
--- a/dvb-t/se-Angebo
+++ b/dvb-t/se-Angebo
@@ -1,3 +1,6 @@
# Sweden - Ängebo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Angelholm_Vegeholm b/dvb-t/se-Angelholm_Vegeholm
index fd79bf7..3611129 100644
--- a/dvb-t/se-Angelholm_Vegeholm
+++ b/dvb-t/se-Angelholm_Vegeholm
@@ -1,7 +1,35 @@
# Sweden - Ängelholm/Vegeholm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000 \ No newline at end of file
diff --git a/dvb-t/se-Angersjo b/dvb-t/se-Angersjo
new file mode 100644
index 0000000..190c7f5
--- /dev/null
+++ b/dvb-t/se-Angersjo
@@ -0,0 +1,5 @@
+# Sweden - Ängersjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Are b/dvb-t/se-Are
new file mode 100644
index 0000000..be581bb
--- /dev/null
+++ b/dvb-t/se-Are
@@ -0,0 +1,35 @@
+# Sweden - Ã…re
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Arjang b/dvb-t/se-Arjang
new file mode 100644
index 0000000..3b540ab
--- /dev/null
+++ b/dvb-t/se-Arjang
@@ -0,0 +1,35 @@
+# Sweden - Årjäng
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Arjeplog_Galtispouda b/dvb-t/se-Arjeplog_Galtispouda
new file mode 100644
index 0000000..dc0c818
--- /dev/null
+++ b/dvb-t/se-Arjeplog_Galtispouda
@@ -0,0 +1,35 @@
+# Sweden - Arjeplog Galtispouda
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Arosjokk b/dvb-t/se-Arosjokk
new file mode 100644
index 0000000..fa88de3
--- /dev/null
+++ b/dvb-t/se-Arosjokk
@@ -0,0 +1,5 @@
+# Sweden - Ã…rosjokk
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Arvidsjaur_Jultrask b/dvb-t/se-Arvidsjaur_Jultrask
index 4b559b8..76c4862 100644
--- a/dvb-t/se-Arvidsjaur_Jultrask
+++ b/dvb-t/se-Arvidsjaur_Jultrask
@@ -1,6 +1,35 @@
# Sweden - Arvidsjaur/Julträsk
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Arvika_Orshultaberget b/dvb-t/se-Arvika_Orshultaberget
new file mode 100644
index 0000000..7d041b2
--- /dev/null
+++ b/dvb-t/se-Arvika_Orshultaberget
@@ -0,0 +1,5 @@
+# Sweden - Arvika/Örshultaberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-As b/dvb-t/se-As
new file mode 100644
index 0000000..ca6213e
--- /dev/null
+++ b/dvb-t/se-As
@@ -0,0 +1,5 @@
+# Sweden - Ã…s
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Asele_Aslia b/dvb-t/se-Asele_Aslia
new file mode 100644
index 0000000..cac0d8e
--- /dev/null
+++ b/dvb-t/se-Asele_Aslia
@@ -0,0 +1,5 @@
+# Sweden - Ã…sele Ã…slia
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Asmon_Sormoflo b/dvb-t/se-Asmon_Sormoflo
new file mode 100644
index 0000000..c744206
--- /dev/null
+++ b/dvb-t/se-Asmon_Sormoflo
@@ -0,0 +1,5 @@
+# Sweden - Åsmon/Sörmoflo
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Aspeboda b/dvb-t/se-Aspeboda
index 825b96b..5ca5003 100644
--- a/dvb-t/se-Aspeboda
+++ b/dvb-t/se-Aspeboda
@@ -1,3 +1,13 @@
# Sweden - Aspeboda
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Atvidaberg b/dvb-t/se-Atvidaberg
index 37a7fad..380b7e1 100644
--- a/dvb-t/se-Atvidaberg
+++ b/dvb-t/se-Atvidaberg
@@ -1,4 +1,35 @@
# Sweden - Ã…tvidaberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Avesta_Krylbo b/dvb-t/se-Avesta_Krylbo
index e454a41..e9a146b 100644
--- a/dvb-t/se-Avesta_Krylbo
+++ b/dvb-t/se-Avesta_Krylbo
@@ -1,4 +1,35 @@
# Sweden - Avesta/Krylbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Backe b/dvb-t/se-Backe
new file mode 100644
index 0000000..e688bf7
--- /dev/null
+++ b/dvb-t/se-Backe
@@ -0,0 +1,5 @@
+# Sweden - Backe
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Backefors b/dvb-t/se-Backefors
index d681425..b6b9ba8 100644
--- a/dvb-t/se-Backefors
+++ b/dvb-t/se-Backefors
@@ -1,7 +1,35 @@
# Sweden - Bäckefors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 586000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000 \ No newline at end of file
diff --git a/dvb-t/se-Bankeryd b/dvb-t/se-Bankeryd
index 06faa37..ab12312 100644
--- a/dvb-t/se-Bankeryd
+++ b/dvb-t/se-Bankeryd
@@ -1,4 +1,35 @@
# Sweden - Bankeryd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000 \ No newline at end of file
diff --git a/dvb-t/se-Bengtsfors b/dvb-t/se-Bengtsfors
new file mode 100644
index 0000000..41de7e2
--- /dev/null
+++ b/dvb-t/se-Bengtsfors
@@ -0,0 +1,5 @@
+# Sweden - Bengtsfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Berghamn b/dvb-t/se-Berghamn
new file mode 100644
index 0000000..59b198a
--- /dev/null
+++ b/dvb-t/se-Berghamn
@@ -0,0 +1,5 @@
+# Sweden - Berghamn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bergshamra_Vaxtuna b/dvb-t/se-Bergshamra_Vaxtuna
new file mode 100644
index 0000000..08e7e6e
--- /dev/null
+++ b/dvb-t/se-Bergshamra_Vaxtuna
@@ -0,0 +1,35 @@
+# Sweden - Bergshamra/Vaxtuna
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bergsjo_Balleberget b/dvb-t/se-Bergsjo_Balleberget
index 0c95297..f4c8c33 100644
--- a/dvb-t/se-Bergsjo_Balleberget
+++ b/dvb-t/se-Bergsjo_Balleberget
@@ -1,3 +1,13 @@
# Sweden - Bergsjö/Bålleberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Bergvik b/dvb-t/se-Bergvik
index 327562d..d1ac6bf 100644
--- a/dvb-t/se-Bergvik
+++ b/dvb-t/se-Bergvik
@@ -1,3 +1,13 @@
# Sweden - Bergvik
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Billsjo b/dvb-t/se-Billsjo
new file mode 100644
index 0000000..ff3bbf7
--- /dev/null
+++ b/dvb-t/se-Billsjo
@@ -0,0 +1,5 @@
+# Sweden - Billsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bispfors b/dvb-t/se-Bispfors
new file mode 100644
index 0000000..d93aa7a
--- /dev/null
+++ b/dvb-t/se-Bispfors
@@ -0,0 +1,35 @@
+# Sweden - Bispfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjorkliden_Tornehamn b/dvb-t/se-Bjorkliden_Tornehamn
new file mode 100644
index 0000000..3653d56
--- /dev/null
+++ b/dvb-t/se-Bjorkliden_Tornehamn
@@ -0,0 +1,5 @@
+# Sweden - Björkliden/Tornehamn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjorksele b/dvb-t/se-Bjorksele
new file mode 100644
index 0000000..fa24fd2
--- /dev/null
+++ b/dvb-t/se-Bjorksele
@@ -0,0 +1,5 @@
+# Sweden - Björksele
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjorkvattnet b/dvb-t/se-Bjorkvattnet
new file mode 100644
index 0000000..b8ce3ad
--- /dev/null
+++ b/dvb-t/se-Bjorkvattnet
@@ -0,0 +1,5 @@
+# Sweden - Björkvattnet
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjorna b/dvb-t/se-Bjorna
new file mode 100644
index 0000000..a022329
--- /dev/null
+++ b/dvb-t/se-Bjorna
@@ -0,0 +1,5 @@
+# Sweden - Björna
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjurberget_Hemtjarn b/dvb-t/se-Bjurberget_Hemtjarn
new file mode 100644
index 0000000..e6d57c5
--- /dev/null
+++ b/dvb-t/se-Bjurberget_Hemtjarn
@@ -0,0 +1,5 @@
+# Sweden - Bjurberget/Hemtjärn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjurtrask b/dvb-t/se-Bjurtrask
new file mode 100644
index 0000000..c1d7a32
--- /dev/null
+++ b/dvb-t/se-Bjurtrask
@@ -0,0 +1,5 @@
+# Sweden - Bjurträsk
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Boberg b/dvb-t/se-Boberg
new file mode 100644
index 0000000..323b1c2
--- /dev/null
+++ b/dvb-t/se-Boberg
@@ -0,0 +1,5 @@
+# Sweden - Boberg
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Boda_Fagerum b/dvb-t/se-Boda_Fagerum
new file mode 100644
index 0000000..2f705a7
--- /dev/null
+++ b/dvb-t/se-Boda_Fagerum
@@ -0,0 +1,35 @@
+# Sweden - Böda/Fagerum
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Boden_Skogsa b/dvb-t/se-Boden_Skogsa
new file mode 100644
index 0000000..c7dbabe
--- /dev/null
+++ b/dvb-t/se-Boden_Skogsa
@@ -0,0 +1,5 @@
+# Sweden - Boden/Skogså
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bograngen b/dvb-t/se-Bograngen
new file mode 100644
index 0000000..0ae4656
--- /dev/null
+++ b/dvb-t/se-Bograngen
@@ -0,0 +1,5 @@
+# Sweden - Bograngen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bollebygd b/dvb-t/se-Bollebygd
index 155df13..8060661 100644
--- a/dvb-t/se-Bollebygd
+++ b/dvb-t/se-Bollebygd
@@ -1,4 +1,36 @@
# Sweden - Bollebygd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Bollnas b/dvb-t/se-Bollnas
index 38eaf1b..63f56b5 100644
--- a/dvb-t/se-Bollnas
+++ b/dvb-t/se-Bollnas
@@ -1,6 +1,63 @@
# Sweden - Bollnäs
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000 \ No newline at end of file
diff --git a/dvb-t/se-Bonhamn b/dvb-t/se-Bonhamn
new file mode 100644
index 0000000..07e6d84
--- /dev/null
+++ b/dvb-t/se-Bonhamn
@@ -0,0 +1,5 @@
+# Sweden - Bönhamn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Boras_Dalsjofors b/dvb-t/se-Boras_Dalsjofors
index ea73212..8ae4b9d 100644
--- a/dvb-t/se-Boras_Dalsjofors
+++ b/dvb-t/se-Boras_Dalsjofors
@@ -1,7 +1,35 @@
# Sweden - Borås/Dalsjöfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Boras_Sjobo b/dvb-t/se-Boras_Sjobo
index 9e1dfe2..f2e80f1 100644
--- a/dvb-t/se-Boras_Sjobo
+++ b/dvb-t/se-Boras_Sjobo
@@ -1,4 +1,35 @@
# Sweden - Borås/Sjöbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Borgafjall b/dvb-t/se-Borgafjall
new file mode 100644
index 0000000..68e72a3
--- /dev/null
+++ b/dvb-t/se-Borgafjall
@@ -0,0 +1,5 @@
+# Sweden - Borgafjäll
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Borgholm_Ramsattra b/dvb-t/se-Borgholm_Ramsattra
new file mode 100644
index 0000000..04df002
--- /dev/null
+++ b/dvb-t/se-Borgholm_Ramsattra
@@ -0,0 +1,31 @@
+# Sweden - Borgholm/Ramsättra
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Borgsjobyn b/dvb-t/se-Borgsjobyn
new file mode 100644
index 0000000..cd55d97
--- /dev/null
+++ b/dvb-t/se-Borgsjobyn
@@ -0,0 +1,5 @@
+# Sweden - Borgsjöbyn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Borkan b/dvb-t/se-Borkan
new file mode 100644
index 0000000..efeba30
--- /dev/null
+++ b/dvb-t/se-Borkan
@@ -0,0 +1,5 @@
+# Sweden - Borkan
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Borlange_Idkerberget b/dvb-t/se-Borlange_Idkerberget
index e30e298..b678ee9 100644
--- a/dvb-t/se-Borlange_Idkerberget
+++ b/dvb-t/se-Borlange_Idkerberget
@@ -1,6 +1,63 @@
# Sweden - Borlänge/Idkerberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Borlange_Nygardarna b/dvb-t/se-Borlange_Nygardarna
index c4caad9..393e729 100644
--- a/dvb-t/se-Borlange_Nygardarna
+++ b/dvb-t/se-Borlange_Nygardarna
@@ -1,4 +1,49 @@
# Sweden - Borlänge/Nygårdarna
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bortansbyn_Bortan b/dvb-t/se-Bortansbyn_Bortan
new file mode 100644
index 0000000..4c0f263
--- /dev/null
+++ b/dvb-t/se-Bortansbyn_Bortan
@@ -0,0 +1,5 @@
+# Sweden - Bortansbyn/Bortan
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bosebyn b/dvb-t/se-Bosebyn
new file mode 100644
index 0000000..edb7c4e
--- /dev/null
+++ b/dvb-t/se-Bosebyn
@@ -0,0 +1,5 @@
+# Sweden - Bosebyn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Botsmark b/dvb-t/se-Botsmark
new file mode 100644
index 0000000..ca257a1
--- /dev/null
+++ b/dvb-t/se-Botsmark
@@ -0,0 +1,5 @@
+# Sweden - Botsmark
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bottnaryd_Ryd b/dvb-t/se-Bottnaryd_Ryd
index 88545b4..a29e54f 100644
--- a/dvb-t/se-Bottnaryd_Ryd
+++ b/dvb-t/se-Bottnaryd_Ryd
@@ -1,3 +1,13 @@
# Sweden - Bottnaryd/Ryd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Bredaker b/dvb-t/se-Bredaker
new file mode 100644
index 0000000..342744a
--- /dev/null
+++ b/dvb-t/se-Bredaker
@@ -0,0 +1,5 @@
+# Sweden - Bredåker
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bredbyn_Kubbe b/dvb-t/se-Bredbyn_Kubbe
new file mode 100644
index 0000000..1038e20
--- /dev/null
+++ b/dvb-t/se-Bredbyn_Kubbe
@@ -0,0 +1,5 @@
+# Sweden - Bredbyn/Kubbe
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bredbyn_Vasterfannbyn b/dvb-t/se-Bredbyn_Vasterfannbyn
new file mode 100644
index 0000000..2abb1ad
--- /dev/null
+++ b/dvb-t/se-Bredbyn_Vasterfannbyn
@@ -0,0 +1,5 @@
+# Sweden - Bredbyn Västerfannbyn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bredsjon b/dvb-t/se-Bredsjon
new file mode 100644
index 0000000..c6b4e7e
--- /dev/null
+++ b/dvb-t/se-Bredsjon
@@ -0,0 +1,5 @@
+# Sweden - Bredsjön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bromsebro b/dvb-t/se-Bromsebro
index 7dc23bc..48e8175 100644
--- a/dvb-t/se-Bromsebro
+++ b/dvb-t/se-Bromsebro
@@ -1,4 +1,35 @@
# Sweden - Brömsebro
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Bruzaholm b/dvb-t/se-Bruzaholm
index d2d82b4..45caddd 100644
--- a/dvb-t/se-Bruzaholm
+++ b/dvb-t/se-Bruzaholm
@@ -1,3 +1,13 @@
# Sweden - Bruzaholm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Bydalen_Hovdehogen b/dvb-t/se-Bydalen_Hovdehogen
new file mode 100644
index 0000000..dcec415
--- /dev/null
+++ b/dvb-t/se-Bydalen_Hovdehogen
@@ -0,0 +1,5 @@
+# Sweden - Bydalen/Hovdehögen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bygdetrask b/dvb-t/se-Bygdetrask
new file mode 100644
index 0000000..1766162
--- /dev/null
+++ b/dvb-t/se-Bygdetrask
@@ -0,0 +1,5 @@
+# Sweden - Bygdeträsk
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bygdsiljum b/dvb-t/se-Bygdsiljum
new file mode 100644
index 0000000..2a7eb03
--- /dev/null
+++ b/dvb-t/se-Bygdsiljum
@@ -0,0 +1,5 @@
+# Sweden - Bygdsiljum
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Byxelkrok b/dvb-t/se-Byxelkrok
index 280accd..abff541 100644
--- a/dvb-t/se-Byxelkrok
+++ b/dvb-t/se-Byxelkrok
@@ -1,4 +1,25 @@
# Sweden - Byxelkrok
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Dadran b/dvb-t/se-Dadran
index 6d55531..c8eb9a0 100644
--- a/dvb-t/se-Dadran
+++ b/dvb-t/se-Dadran
@@ -1,3 +1,5 @@
# Sweden - DÃ¥dran
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Dal b/dvb-t/se-Dal
new file mode 100644
index 0000000..f33ab2e
--- /dev/null
+++ b/dvb-t/se-Dal
@@ -0,0 +1,5 @@
+# Sweden - Dal
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Dalfors b/dvb-t/se-Dalfors
index b9f5c76..57ae1d3 100644
--- a/dvb-t/se-Dalfors
+++ b/dvb-t/se-Dalfors
@@ -1,3 +1,13 @@
# Sweden - Dalfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Dals_Langed b/dvb-t/se-Dals_Langed
new file mode 100644
index 0000000..473733d
--- /dev/null
+++ b/dvb-t/se-Dals_Langed
@@ -0,0 +1,5 @@
+# Sweden - Dals LÃ¥nged
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Dalstuga b/dvb-t/se-Dalstuga
index d7f5374..328496a 100644
--- a/dvb-t/se-Dalstuga
+++ b/dvb-t/se-Dalstuga
@@ -1,3 +1,13 @@
# Sweden - Dalstuga
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Degeberga b/dvb-t/se-Degeberga
new file mode 100644
index 0000000..a3518f7
--- /dev/null
+++ b/dvb-t/se-Degeberga
@@ -0,0 +1,5 @@
+# Sweden - Degeberga
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Degerfors b/dvb-t/se-Degerfors
index c0dc0b9..b2f6572 100644
--- a/dvb-t/se-Degerfors
+++ b/dvb-t/se-Degerfors
@@ -1,6 +1,35 @@
# Sweden - Degerfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Delary b/dvb-t/se-Delary
index 3c9fdf9..e62500a 100644
--- a/dvb-t/se-Delary
+++ b/dvb-t/se-Delary
@@ -1,3 +1,13 @@
# Sweden - Delary
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Delary_Kolaboda b/dvb-t/se-Delary_Kolaboda
new file mode 100644
index 0000000..362df26
--- /dev/null
+++ b/dvb-t/se-Delary_Kolaboda
@@ -0,0 +1,5 @@
+# Sweden - Delary/Kölaboda
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Djura b/dvb-t/se-Djura
index c532219..020a4d4 100644
--- a/dvb-t/se-Djura
+++ b/dvb-t/se-Djura
@@ -1,3 +1,13 @@
# Sweden - Djura
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Dorotea b/dvb-t/se-Dorotea
new file mode 100644
index 0000000..7b5aaca
--- /dev/null
+++ b/dvb-t/se-Dorotea
@@ -0,0 +1,5 @@
+# Sweden - Dorotea
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Drevdagen b/dvb-t/se-Drevdagen
index 8b331c9..e2c9da3 100644
--- a/dvb-t/se-Drevdagen
+++ b/dvb-t/se-Drevdagen
@@ -1,3 +1,13 @@
# Sweden - Drevdagen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Duved b/dvb-t/se-Duved
new file mode 100644
index 0000000..dfb39da
--- /dev/null
+++ b/dvb-t/se-Duved
@@ -0,0 +1,5 @@
+# Sweden - Duved
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Duvnas b/dvb-t/se-Duvnas
index 4fea089..33aaf97 100644
--- a/dvb-t/se-Duvnas
+++ b/dvb-t/se-Duvnas
@@ -1,3 +1,13 @@
# Sweden - Duvnäs
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Duvnas_Basna b/dvb-t/se-Duvnas_Basna
index 22e0bdf..de5ec55 100644
--- a/dvb-t/se-Duvnas_Basna
+++ b/dvb-t/se-Duvnas_Basna
@@ -1,3 +1,13 @@
# Sweden - Duvnäs/Bäsna
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Edane b/dvb-t/se-Edane
new file mode 100644
index 0000000..c168681
--- /dev/null
+++ b/dvb-t/se-Edane
@@ -0,0 +1,5 @@
+# Sweden - Edane
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Edsbyn b/dvb-t/se-Edsbyn
index a8a3eaa..f92440f 100644
--- a/dvb-t/se-Edsbyn
+++ b/dvb-t/se-Edsbyn
@@ -1,3 +1,13 @@
# Sweden - Edsbyn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Edsele b/dvb-t/se-Edsele
new file mode 100644
index 0000000..c7df3b8
--- /dev/null
+++ b/dvb-t/se-Edsele
@@ -0,0 +1,5 @@
+# Sweden - Edsele
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Edsleskog_Hogheden b/dvb-t/se-Edsleskog_Hogheden
new file mode 100644
index 0000000..3df7f0d
--- /dev/null
+++ b/dvb-t/se-Edsleskog_Hogheden
@@ -0,0 +1,5 @@
+# Sweden - Edsleskog/Högheden
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Eksharad_Ekesberget b/dvb-t/se-Eksharad_Ekesberget
new file mode 100644
index 0000000..6daa2d5
--- /dev/null
+++ b/dvb-t/se-Eksharad_Ekesberget
@@ -0,0 +1,5 @@
+# Sweden - Ekshärad Ekesberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ellos b/dvb-t/se-Ellos
new file mode 100644
index 0000000..ba83849
--- /dev/null
+++ b/dvb-t/se-Ellos
@@ -0,0 +1,5 @@
+# Sweden - Ellös
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Emmaboda_Balshult b/dvb-t/se-Emmaboda_Balshult
index 0e6a2f8..61d117b 100644
--- a/dvb-t/se-Emmaboda_Balshult
+++ b/dvb-t/se-Emmaboda_Balshult
@@ -1,6 +1,36 @@
# Sweden - Emmaboda/Bälshult
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Enafors b/dvb-t/se-Enafors
new file mode 100644
index 0000000..5e2089a
--- /dev/null
+++ b/dvb-t/se-Enafors
@@ -0,0 +1,5 @@
+# Sweden - Enafors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Enviken b/dvb-t/se-Enviken
index 0744d26..9936718 100644
--- a/dvb-t/se-Enviken
+++ b/dvb-t/se-Enviken
@@ -1,4 +1,36 @@
# Sweden - Enviken
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Erikslund_Bergasen b/dvb-t/se-Erikslund_Bergasen
new file mode 100644
index 0000000..6b1622c
--- /dev/null
+++ b/dvb-t/se-Erikslund_Bergasen
@@ -0,0 +1,5 @@
+# Sweden - Erikslund/Bergåsen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fagersta b/dvb-t/se-Fagersta
index 9de6d73..3201b34 100644
--- a/dvb-t/se-Fagersta
+++ b/dvb-t/se-Fagersta
@@ -1,4 +1,25 @@
# Sweden - Fagersta
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Fagersta_Jattasen b/dvb-t/se-Fagersta_Jattasen
new file mode 100644
index 0000000..de93d29
--- /dev/null
+++ b/dvb-t/se-Fagersta_Jattasen
@@ -0,0 +1,35 @@
+# Sweden - Fagersta Jättåsen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Falerum_Centrum b/dvb-t/se-Falerum_Centrum
index 36d5496..716f262 100644
--- a/dvb-t/se-Falerum_Centrum
+++ b/dvb-t/se-Falerum_Centrum
@@ -1,3 +1,13 @@
# Sweden - Falerum/Centrum
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Falkenberg_Ringsegard b/dvb-t/se-Falkenberg_Ringsegard
new file mode 100644
index 0000000..709dbad
--- /dev/null
+++ b/dvb-t/se-Falkenberg_Ringsegard
@@ -0,0 +1,5 @@
+# Sweden - Falkenberg/Ringsegård
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Faltrask b/dvb-t/se-Faltrask
new file mode 100644
index 0000000..93bcda1
--- /dev/null
+++ b/dvb-t/se-Faltrask
@@ -0,0 +1,5 @@
+# Sweden - Falträsk
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Falun_Lovberget b/dvb-t/se-Falun_Lovberget
index 8b6cd13..792bcb7 100644
--- a/dvb-t/se-Falun_Lovberget
+++ b/dvb-t/se-Falun_Lovberget
@@ -1,6 +1,36 @@
# Sweden - Falun/Lövberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Farila b/dvb-t/se-Farila
index b1c1840..ead5163 100644
--- a/dvb-t/se-Farila
+++ b/dvb-t/se-Farila
@@ -1,3 +1,13 @@
# Sweden - Färila
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Farjestaden_Algutsrum b/dvb-t/se-Farjestaden_Algutsrum
new file mode 100644
index 0000000..e45a1da
--- /dev/null
+++ b/dvb-t/se-Farjestaden_Algutsrum
@@ -0,0 +1,35 @@
+# Sweden - Färjestaden/Algutsrum
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Faro_Ajkerstrask b/dvb-t/se-Faro_Ajkerstrask
index 7bdbed7..f3f2652 100644
--- a/dvb-t/se-Faro_Ajkerstrask
+++ b/dvb-t/se-Faro_Ajkerstrask
@@ -1,4 +1,25 @@
# Sweden - Fårö/Ajkersträsk
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Faro_Ajkestrask b/dvb-t/se-Faro_Ajkestrask
new file mode 100644
index 0000000..5e36835
--- /dev/null
+++ b/dvb-t/se-Faro_Ajkestrask
@@ -0,0 +1,30 @@
+# Sweden - Fårö/Ajkesträsk
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Farosund_Bunge b/dvb-t/se-Farosund_Bunge
index 4148e0b..bb0dcb1 100644
--- a/dvb-t/se-Farosund_Bunge
+++ b/dvb-t/se-Farosund_Bunge
@@ -1,7 +1,31 @@
# Sweden - Fårösund/Bunge
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Fengersfors b/dvb-t/se-Fengersfors
new file mode 100644
index 0000000..94eeca2
--- /dev/null
+++ b/dvb-t/se-Fengersfors
@@ -0,0 +1,5 @@
+# Sweden - Fengersfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Filipstad_Klockarhojden b/dvb-t/se-Filipstad_Klockarhojden
index a30d2ad..c3674bb 100644
--- a/dvb-t/se-Filipstad_Klockarhojden
+++ b/dvb-t/se-Filipstad_Klockarhojden
@@ -1,6 +1,36 @@
# Sweden - Filipstad/Klockarhöjden
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Finnveden b/dvb-t/se-Finnveden
index f577cfd..1fa0dbf 100644
--- a/dvb-t/se-Finnveden
+++ b/dvb-t/se-Finnveden
@@ -1,6 +1,36 @@
# Sweden - Finnveden
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Fjal b/dvb-t/se-Fjal
new file mode 100644
index 0000000..600d991
--- /dev/null
+++ b/dvb-t/se-Fjal
@@ -0,0 +1,5 @@
+# Sweden - Fjäl
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fjallsta b/dvb-t/se-Fjallsta
new file mode 100644
index 0000000..afc99cc
--- /dev/null
+++ b/dvb-t/se-Fjallsta
@@ -0,0 +1,5 @@
+# Sweden - Fjällsta
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Flarke b/dvb-t/se-Flarke
new file mode 100644
index 0000000..2e0d9ea
--- /dev/null
+++ b/dvb-t/se-Flarke
@@ -0,0 +1,5 @@
+# Sweden - Flärke
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Floda b/dvb-t/se-Floda
new file mode 100644
index 0000000..af4e629
--- /dev/null
+++ b/dvb-t/se-Floda
@@ -0,0 +1,5 @@
+# Sweden - Floda
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Flurkmark b/dvb-t/se-Flurkmark
new file mode 100644
index 0000000..cedba80
--- /dev/null
+++ b/dvb-t/se-Flurkmark
@@ -0,0 +1,5 @@
+# Sweden - Flurkmark
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Flyggsjo b/dvb-t/se-Flyggsjo
new file mode 100644
index 0000000..bcec030
--- /dev/null
+++ b/dvb-t/se-Flyggsjo
@@ -0,0 +1,5 @@
+# Sweden - Flyggsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Flyn b/dvb-t/se-Flyn
new file mode 100644
index 0000000..59b8aee
--- /dev/null
+++ b/dvb-t/se-Flyn
@@ -0,0 +1,5 @@
+# Sweden - Flyn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Folsbyn b/dvb-t/se-Folsbyn
new file mode 100644
index 0000000..9b70007
--- /dev/null
+++ b/dvb-t/se-Folsbyn
@@ -0,0 +1,5 @@
+# Sweden - Fölsbyn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Forsed b/dvb-t/se-Forsed
new file mode 100644
index 0000000..4981325
--- /dev/null
+++ b/dvb-t/se-Forsed
@@ -0,0 +1,5 @@
+# Sweden - Forsed
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Forsmo b/dvb-t/se-Forsmo
new file mode 100644
index 0000000..560bafa
--- /dev/null
+++ b/dvb-t/se-Forsmo
@@ -0,0 +1,5 @@
+# Sweden - Forsmo
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Forsmo_Yttersel b/dvb-t/se-Forsmo_Yttersel
new file mode 100644
index 0000000..86681c6
--- /dev/null
+++ b/dvb-t/se-Forsmo_Yttersel
@@ -0,0 +1,5 @@
+# Sweden - Forsmo/Yttersel
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Forsnaset b/dvb-t/se-Forsnaset
new file mode 100644
index 0000000..8127217
--- /dev/null
+++ b/dvb-t/se-Forsnaset
@@ -0,0 +1,5 @@
+# Sweden - Forsnäset
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Frankrikegarden_Frankrike b/dvb-t/se-Frankrikegarden_Frankrike
new file mode 100644
index 0000000..8a82988
--- /dev/null
+++ b/dvb-t/se-Frankrikegarden_Frankrike
@@ -0,0 +1,5 @@
+# Sweden - Frankrikegården/Frankrike
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fransta b/dvb-t/se-Fransta
new file mode 100644
index 0000000..ac86ede
--- /dev/null
+++ b/dvb-t/se-Fransta
@@ -0,0 +1,5 @@
+# Sweden - Fränsta
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fredrika b/dvb-t/se-Fredrika
new file mode 100644
index 0000000..76230d1
--- /dev/null
+++ b/dvb-t/se-Fredrika
@@ -0,0 +1,5 @@
+# Sweden - Fredrika
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fredriksberg b/dvb-t/se-Fredriksberg
index 3838a7b..038defe 100644
--- a/dvb-t/se-Fredriksberg
+++ b/dvb-t/se-Fredriksberg
@@ -1,3 +1,13 @@
# Sweden - Fredriksberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Fredros b/dvb-t/se-Fredros
new file mode 100644
index 0000000..2013d86
--- /dev/null
+++ b/dvb-t/se-Fredros
@@ -0,0 +1,5 @@
+# Sweden - Fredros
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fritsla b/dvb-t/se-Fritsla
index fd5dc30..124e763 100644
--- a/dvb-t/se-Fritsla
+++ b/dvb-t/se-Fritsla
@@ -1,3 +1,13 @@
# Sweden - Fritsla
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Fullsjon b/dvb-t/se-Fullsjon
new file mode 100644
index 0000000..f57739d
--- /dev/null
+++ b/dvb-t/se-Fullsjon
@@ -0,0 +1,5 @@
+# Sweden - Fullsjön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Funasdalen_Funasdalsberge b/dvb-t/se-Funasdalen_Funasdalsberge
new file mode 100644
index 0000000..b24ce5c
--- /dev/null
+++ b/dvb-t/se-Funasdalen_Funasdalsberge
@@ -0,0 +1,35 @@
+# Sweden - Funäsdalen Funäsdalsberge
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Funasdalen_Telestation b/dvb-t/se-Funasdalen_Telestation
new file mode 100644
index 0000000..0cff062
--- /dev/null
+++ b/dvb-t/se-Funasdalen_Telestation
@@ -0,0 +1,5 @@
+# Sweden - Funäsdalen/Telestation
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Furudal b/dvb-t/se-Furudal
index ca847cf..92d0817 100644
--- a/dvb-t/se-Furudal
+++ b/dvb-t/se-Furudal
@@ -1,3 +1,13 @@
# Sweden - Furudal
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Gaddede b/dvb-t/se-Gaddede
new file mode 100644
index 0000000..31183b5
--- /dev/null
+++ b/dvb-t/se-Gaddede
@@ -0,0 +1,5 @@
+# Sweden - Gäddede
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gallivare b/dvb-t/se-Gallivare
index 27167ea..1f98a96 100644
--- a/dvb-t/se-Gallivare
+++ b/dvb-t/se-Gallivare
@@ -1,6 +1,36 @@
# Sweden - Gällivare
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Gallsatter b/dvb-t/se-Gallsatter
new file mode 100644
index 0000000..fce5424
--- /dev/null
+++ b/dvb-t/se-Gallsatter
@@ -0,0 +1,5 @@
+# Sweden - Gallsätter
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gardikfors b/dvb-t/se-Gardikfors
new file mode 100644
index 0000000..5c97a95
--- /dev/null
+++ b/dvb-t/se-Gardikfors
@@ -0,0 +1,5 @@
+# Sweden - Gardikfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gargnas b/dvb-t/se-Gargnas
new file mode 100644
index 0000000..5ef79a1
--- /dev/null
+++ b/dvb-t/se-Gargnas
@@ -0,0 +1,5 @@
+# Sweden - Gargnäs
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Garpenberg_Kuppgarden b/dvb-t/se-Garpenberg_Kuppgarden
index bcd7685..9dc790e 100644
--- a/dvb-t/se-Garpenberg_Kuppgarden
+++ b/dvb-t/se-Garpenberg_Kuppgarden
@@ -1,3 +1,13 @@
# Sweden - Garpenberg/Kuppgården
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Gavle_Skogmur b/dvb-t/se-Gavle_Skogmur
index 0a229e7..ae8ac75 100644
--- a/dvb-t/se-Gavle_Skogmur
+++ b/dvb-t/se-Gavle_Skogmur
@@ -1,6 +1,36 @@
# Sweden - Gävle/Skogmur
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Gillhov b/dvb-t/se-Gillhov
new file mode 100644
index 0000000..15415f1
--- /dev/null
+++ b/dvb-t/se-Gillhov
@@ -0,0 +1,5 @@
+# Sweden - Gillhov
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Glimakra b/dvb-t/se-Glimakra
new file mode 100644
index 0000000..5f027cc
--- /dev/null
+++ b/dvb-t/se-Glimakra
@@ -0,0 +1,5 @@
+# Sweden - Glimåkra
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gnarp b/dvb-t/se-Gnarp
index b47e78a..04b461f 100644
--- a/dvb-t/se-Gnarp
+++ b/dvb-t/se-Gnarp
@@ -1,3 +1,13 @@
# Sweden - Gnarp
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Gnesta b/dvb-t/se-Gnesta
index 3f1b75c..5baf70e 100644
--- a/dvb-t/se-Gnesta
+++ b/dvb-t/se-Gnesta
@@ -1,4 +1,25 @@
# Sweden - Gnesta
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Gnosjo_Marieholm b/dvb-t/se-Gnosjo_Marieholm
index ed789ab..654c5ac 100644
--- a/dvb-t/se-Gnosjo_Marieholm
+++ b/dvb-t/se-Gnosjo_Marieholm
@@ -1,3 +1,13 @@
# Sweden - Gnosjö/Marieholm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Gordalen b/dvb-t/se-Gordalen
new file mode 100644
index 0000000..e47263f
--- /dev/null
+++ b/dvb-t/se-Gordalen
@@ -0,0 +1,5 @@
+# Sweden - Gördalen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Goteborg_Brudaremossen b/dvb-t/se-Goteborg_Brudaremossen
index 80d57a7..51d7b65 100644
--- a/dvb-t/se-Goteborg_Brudaremossen
+++ b/dvb-t/se-Goteborg_Brudaremossen
@@ -1,7 +1,36 @@
# Sweden - Göteborg/Brudaremossen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Goteborg_Slattadamm b/dvb-t/se-Goteborg_Slattadamm
index 11ccd75..4f499e9 100644
--- a/dvb-t/se-Goteborg_Slattadamm
+++ b/dvb-t/se-Goteborg_Slattadamm
@@ -1,7 +1,31 @@
# Sweden - Göteborg/Slättadamm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Graninge b/dvb-t/se-Graninge
new file mode 100644
index 0000000..191e14d
--- /dev/null
+++ b/dvb-t/se-Graninge
@@ -0,0 +1,5 @@
+# Sweden - Graninge
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Grasmark b/dvb-t/se-Grasmark
new file mode 100644
index 0000000..3c0cd6f
--- /dev/null
+++ b/dvb-t/se-Grasmark
@@ -0,0 +1,5 @@
+# Sweden - Gräsmark
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Grasmyr b/dvb-t/se-Grasmyr
new file mode 100644
index 0000000..1767f52
--- /dev/null
+++ b/dvb-t/se-Grasmyr
@@ -0,0 +1,5 @@
+# Sweden - Gräsmyr
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Grebbestad b/dvb-t/se-Grebbestad
new file mode 100644
index 0000000..41b6ba8
--- /dev/null
+++ b/dvb-t/se-Grebbestad
@@ -0,0 +1,35 @@
+# Sweden - Grebbestad
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Grevie b/dvb-t/se-Grevie
new file mode 100644
index 0000000..4c2a98a
--- /dev/null
+++ b/dvb-t/se-Grevie
@@ -0,0 +1,5 @@
+# Sweden - Grevie
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Grovelsjon b/dvb-t/se-Grovelsjon
new file mode 100644
index 0000000..04f7916
--- /dev/null
+++ b/dvb-t/se-Grovelsjon
@@ -0,0 +1,5 @@
+# Sweden - Grövelsjön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Grums b/dvb-t/se-Grums
new file mode 100644
index 0000000..d7e9976
--- /dev/null
+++ b/dvb-t/se-Grums
@@ -0,0 +1,5 @@
+# Sweden - Grums
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Guliksberg b/dvb-t/se-Guliksberg
new file mode 100644
index 0000000..050f864
--- /dev/null
+++ b/dvb-t/se-Guliksberg
@@ -0,0 +1,5 @@
+# Sweden - Guliksberg
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Guliksberg_Rodvattnet b/dvb-t/se-Guliksberg_Rodvattnet
new file mode 100644
index 0000000..c55b80a
--- /dev/null
+++ b/dvb-t/se-Guliksberg_Rodvattnet
@@ -0,0 +1,5 @@
+# Sweden - Guliksberg/Rödvattnet
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gullbrandstorp b/dvb-t/se-Gullbrandstorp
index c407b0d..f917134 100644
--- a/dvb-t/se-Gullbrandstorp
+++ b/dvb-t/se-Gullbrandstorp
@@ -1,3 +1,13 @@
# Sweden - Gullbrandstorp
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Gumhojden b/dvb-t/se-Gumhojden
new file mode 100644
index 0000000..7322820
--- /dev/null
+++ b/dvb-t/se-Gumhojden
@@ -0,0 +1,5 @@
+# Sweden - Gumhöjden
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gunnarn_Sorsjoliden b/dvb-t/se-Gunnarn_Sorsjoliden
new file mode 100644
index 0000000..5aee02f
--- /dev/null
+++ b/dvb-t/se-Gunnarn_Sorsjoliden
@@ -0,0 +1,35 @@
+# Sweden - Gunnarn/Sörsjöliden
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gunnarsbo b/dvb-t/se-Gunnarsbo
index d79b851..e951cde 100644
--- a/dvb-t/se-Gunnarsbo
+++ b/dvb-t/se-Gunnarsbo
@@ -1,3 +1,13 @@
# Sweden - Gunnarsbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Gunnarsbyn b/dvb-t/se-Gunnarsbyn
new file mode 100644
index 0000000..1625739
--- /dev/null
+++ b/dvb-t/se-Gunnarsbyn
@@ -0,0 +1,5 @@
+# Sweden - Gunnarsbyn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gunnarskog b/dvb-t/se-Gunnarskog
new file mode 100644
index 0000000..9600c92
--- /dev/null
+++ b/dvb-t/se-Gunnarskog
@@ -0,0 +1,5 @@
+# Sweden - Gunnarskog
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gusum b/dvb-t/se-Gusum
index 21411cf..faeeec6 100644
--- a/dvb-t/se-Gusum
+++ b/dvb-t/se-Gusum
@@ -1,3 +1,13 @@
# Sweden - Gusum
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Hadanberg b/dvb-t/se-Hadanberg
new file mode 100644
index 0000000..8a34887
--- /dev/null
+++ b/dvb-t/se-Hadanberg
@@ -0,0 +1,5 @@
+# Sweden - Hädanberg
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hagfors_Varmullsasen b/dvb-t/se-Hagfors_Varmullsasen
index f013fb3..7b8f932 100644
--- a/dvb-t/se-Hagfors_Varmullsasen
+++ b/dvb-t/se-Hagfors_Varmullsasen
@@ -1,6 +1,36 @@
# Sweden - Hagfors/Värmullsåsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Hakafot b/dvb-t/se-Hakafot
new file mode 100644
index 0000000..1f1b392
--- /dev/null
+++ b/dvb-t/se-Hakafot
@@ -0,0 +1,5 @@
+# Sweden - HÃ¥kafot
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Halaforsen b/dvb-t/se-Halaforsen
new file mode 100644
index 0000000..f9ab849
--- /dev/null
+++ b/dvb-t/se-Halaforsen
@@ -0,0 +1,5 @@
+# Sweden - HÃ¥laforsen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Haljeboda b/dvb-t/se-Haljeboda
new file mode 100644
index 0000000..d56bb1d
--- /dev/null
+++ b/dvb-t/se-Haljeboda
@@ -0,0 +1,5 @@
+# Sweden - Häljeboda
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hallan b/dvb-t/se-Hallan
new file mode 100644
index 0000000..316266c
--- /dev/null
+++ b/dvb-t/se-Hallan
@@ -0,0 +1,5 @@
+# Sweden - HÃ¥llan
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hallaryd b/dvb-t/se-Hallaryd
index 5d21d8a..d388227 100644
--- a/dvb-t/se-Hallaryd
+++ b/dvb-t/se-Hallaryd
@@ -1,3 +1,13 @@
# Sweden - Hallaryd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Hallastrom b/dvb-t/se-Hallastrom
new file mode 100644
index 0000000..3e07de1
--- /dev/null
+++ b/dvb-t/se-Hallastrom
@@ -0,0 +1,5 @@
+# Sweden - Hällaström
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hallbo b/dvb-t/se-Hallbo
index ed0f8da..68e60f4 100644
--- a/dvb-t/se-Hallbo
+++ b/dvb-t/se-Hallbo
@@ -1,3 +1,13 @@
# Sweden - Hällbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Halle b/dvb-t/se-Halle
new file mode 100644
index 0000000..82192fd
--- /dev/null
+++ b/dvb-t/se-Halle
@@ -0,0 +1,5 @@
+# Sweden - Hälle
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Halleviksstrand b/dvb-t/se-Halleviksstrand
new file mode 100644
index 0000000..ce12528
--- /dev/null
+++ b/dvb-t/se-Halleviksstrand
@@ -0,0 +1,5 @@
+# Sweden - Hälleviksstrand
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hallsjo b/dvb-t/se-Hallsjo
new file mode 100644
index 0000000..8ac6646
--- /dev/null
+++ b/dvb-t/se-Hallsjo
@@ -0,0 +1,5 @@
+# Sweden - Hällsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Halmstad_Hamnen b/dvb-t/se-Halmstad_Hamnen
index 50c88f3..344e712 100644
--- a/dvb-t/se-Halmstad_Hamnen
+++ b/dvb-t/se-Halmstad_Hamnen
@@ -1,4 +1,31 @@
# Sweden - Halmstad/Hamnen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Halmstad_Oskarstrom b/dvb-t/se-Halmstad_Oskarstrom
index 9fc5537..bd8b06b 100644
--- a/dvb-t/se-Halmstad_Oskarstrom
+++ b/dvb-t/se-Halmstad_Oskarstrom
@@ -1,6 +1,36 @@
# Sweden - Halmstad/Oskarström
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Hamburgsund b/dvb-t/se-Hamburgsund
new file mode 100644
index 0000000..09aca5f
--- /dev/null
+++ b/dvb-t/se-Hamburgsund
@@ -0,0 +1,5 @@
+# Sweden - Hamburgsund
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Harads b/dvb-t/se-Harads
new file mode 100644
index 0000000..8acae9a
--- /dev/null
+++ b/dvb-t/se-Harads
@@ -0,0 +1,5 @@
+# Sweden - Harads
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Harnosand_Harnon b/dvb-t/se-Harnosand_Harnon
index 242088e..6511fea 100644
--- a/dvb-t/se-Harnosand_Harnon
+++ b/dvb-t/se-Harnosand_Harnon
@@ -1,6 +1,36 @@
# Sweden - Härnösand/Härnön
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Harrsjon b/dvb-t/se-Harrsjon
new file mode 100644
index 0000000..597d9fb
--- /dev/null
+++ b/dvb-t/se-Harrsjon
@@ -0,0 +1,5 @@
+# Sweden - Harrsjön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hassela b/dvb-t/se-Hassela
index 7ce0767..d9ee98a 100644
--- a/dvb-t/se-Hassela
+++ b/dvb-t/se-Hassela
@@ -1,3 +1,13 @@
# Sweden - Hassela
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Havdhem b/dvb-t/se-Havdhem
index 4340063..ba8f198 100644
--- a/dvb-t/se-Havdhem
+++ b/dvb-t/se-Havdhem
@@ -1,7 +1,61 @@
# Sweden - Havdhem
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Hede b/dvb-t/se-Hede
new file mode 100644
index 0000000..e024aa6
--- /dev/null
+++ b/dvb-t/se-Hede
@@ -0,0 +1,35 @@
+# Sweden - Hede
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hedemora b/dvb-t/se-Hedemora
index 94dc5e3..b4c4e55 100644
--- a/dvb-t/se-Hedemora
+++ b/dvb-t/se-Hedemora
@@ -1,3 +1,6 @@
# Sweden - Hedemora
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Hedenaset b/dvb-t/se-Hedenaset
new file mode 100644
index 0000000..c33e6ad
--- /dev/null
+++ b/dvb-t/se-Hedenaset
@@ -0,0 +1,5 @@
+# Sweden - Hedenäset
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Helgum b/dvb-t/se-Helgum
new file mode 100644
index 0000000..57f82a9
--- /dev/null
+++ b/dvb-t/se-Helgum
@@ -0,0 +1,5 @@
+# Sweden - Helgum
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Helsingborg_Olympia b/dvb-t/se-Helsingborg_Olympia
index 4358f61..224840a 100644
--- a/dvb-t/se-Helsingborg_Olympia
+++ b/dvb-t/se-Helsingborg_Olympia
@@ -1,7 +1,36 @@
# Sweden - Helsingborg/Olympia
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Hemavan b/dvb-t/se-Hemavan
new file mode 100644
index 0000000..1af34be
--- /dev/null
+++ b/dvb-t/se-Hemavan
@@ -0,0 +1,35 @@
+# Sweden - Hemavan
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hemson b/dvb-t/se-Hemson
new file mode 100644
index 0000000..6a6e001
--- /dev/null
+++ b/dvb-t/se-Hemson
@@ -0,0 +1,5 @@
+# Sweden - Hemsön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Henan b/dvb-t/se-Henan
new file mode 100644
index 0000000..2fab24c
--- /dev/null
+++ b/dvb-t/se-Henan
@@ -0,0 +1,5 @@
+# Sweden - Henån
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hennan b/dvb-t/se-Hennan
index cd1605a..37e78c7 100644
--- a/dvb-t/se-Hennan
+++ b/dvb-t/se-Hennan
@@ -1,3 +1,13 @@
# Sweden - Hennan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Hestra_Aspas b/dvb-t/se-Hestra_Aspas
index ae955cc..f3a554a 100644
--- a/dvb-t/se-Hestra_Aspas
+++ b/dvb-t/se-Hestra_Aspas
@@ -1,3 +1,13 @@
# Sweden - Hestra/Äspås
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Hjo_Grevback b/dvb-t/se-Hjo_Grevback
index 7045a53..5063c1f 100644
--- a/dvb-t/se-Hjo_Grevback
+++ b/dvb-t/se-Hjo_Grevback
@@ -1,3 +1,13 @@
# Sweden - Hjo/Grevbäck
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Hofors b/dvb-t/se-Hofors
index 9314fc1..a476eb8 100644
--- a/dvb-t/se-Hofors
+++ b/dvb-t/se-Hofors
@@ -1,6 +1,36 @@
# Sweden - Hofors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Hogfors b/dvb-t/se-Hogfors
index 514f1e5..197423f 100644
--- a/dvb-t/se-Hogfors
+++ b/dvb-t/se-Hogfors
@@ -1,3 +1,13 @@
# Sweden - Högfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Hoglunda b/dvb-t/se-Hoglunda
new file mode 100644
index 0000000..86656f5
--- /dev/null
+++ b/dvb-t/se-Hoglunda
@@ -0,0 +1,5 @@
+# Sweden - Höglunda
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hogsby_Virstad b/dvb-t/se-Hogsby_Virstad
index 0cc2ad6..27e3768 100644
--- a/dvb-t/se-Hogsby_Virstad
+++ b/dvb-t/se-Hogsby_Virstad
@@ -1,4 +1,36 @@
# Sweden - Högsby/Virstad
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Hogvalen b/dvb-t/se-Hogvalen
new file mode 100644
index 0000000..f90e01e
--- /dev/null
+++ b/dvb-t/se-Hogvalen
@@ -0,0 +1,5 @@
+# Sweden - Högvålen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Holjes b/dvb-t/se-Holjes
new file mode 100644
index 0000000..feefa84
--- /dev/null
+++ b/dvb-t/se-Holjes
@@ -0,0 +1,5 @@
+# Sweden - Höljes
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hollviken_Stora_Hammar b/dvb-t/se-Hollviken_Stora_Hammar
new file mode 100644
index 0000000..41de99d
--- /dev/null
+++ b/dvb-t/se-Hollviken_Stora_Hammar
@@ -0,0 +1,30 @@
+# Sweden - Höllviken/Stora Hammar
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Holsbybrunn_Holsbyholm b/dvb-t/se-Holsbybrunn_Holsbyholm
index e5a1d7b..d180051 100644
--- a/dvb-t/se-Holsbybrunn_Holsbyholm
+++ b/dvb-t/se-Holsbybrunn_Holsbyholm
@@ -1,3 +1,13 @@
# Sweden - Holsbybrunn/Holsbyholm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Horby_Sallerup b/dvb-t/se-Horby_Sallerup
index ea54db9..7363cbb 100644
--- a/dvb-t/se-Horby_Sallerup
+++ b/dvb-t/se-Horby_Sallerup
@@ -1,9 +1,36 @@
# Sweden - Hörby/Sallerup
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 570000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Horken b/dvb-t/se-Horken
index 6f3fcdb..d58ee6d 100644
--- a/dvb-t/se-Horken
+++ b/dvb-t/se-Horken
@@ -1,3 +1,13 @@
# Sweden - Hörken
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Hornon b/dvb-t/se-Hornon
new file mode 100644
index 0000000..4892c1d
--- /dev/null
+++ b/dvb-t/se-Hornon
@@ -0,0 +1,5 @@
+# Sweden - Hornön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hotagen b/dvb-t/se-Hotagen
new file mode 100644
index 0000000..631a624
--- /dev/null
+++ b/dvb-t/se-Hotagen
@@ -0,0 +1,5 @@
+# Sweden - Hotagen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hoting b/dvb-t/se-Hoting
new file mode 100644
index 0000000..60387c6
--- /dev/null
+++ b/dvb-t/se-Hoting
@@ -0,0 +1,5 @@
+# Sweden - Hoting
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hovfjallet b/dvb-t/se-Hovfjallet
new file mode 100644
index 0000000..3d37947
--- /dev/null
+++ b/dvb-t/se-Hovfjallet
@@ -0,0 +1,5 @@
+# Sweden - Hovfjället
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hudiksvall_Forsa b/dvb-t/se-Hudiksvall_Forsa
index c8bad49..aecf6d5 100644
--- a/dvb-t/se-Hudiksvall_Forsa
+++ b/dvb-t/se-Hudiksvall_Forsa
@@ -1,6 +1,36 @@
# Sweden - Hudiksvall/Forsa
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Hudiksvall_Galgberget b/dvb-t/se-Hudiksvall_Galgberget
index b95873e..836f3c5 100644
--- a/dvb-t/se-Hudiksvall_Galgberget
+++ b/dvb-t/se-Hudiksvall_Galgberget
@@ -1,4 +1,36 @@
# Sweden - Hudiksvall/Galgberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Hummelholm b/dvb-t/se-Hummelholm
new file mode 100644
index 0000000..88638ad
--- /dev/null
+++ b/dvb-t/se-Hummelholm
@@ -0,0 +1,5 @@
+# Sweden - Hummelholm
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hunnebostrand b/dvb-t/se-Hunnebostrand
new file mode 100644
index 0000000..54918df
--- /dev/null
+++ b/dvb-t/se-Hunnebostrand
@@ -0,0 +1,5 @@
+# Sweden - Hunnebostrand
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Huskvarna b/dvb-t/se-Huskvarna
index 2c6a5ca..eb500ab 100644
--- a/dvb-t/se-Huskvarna
+++ b/dvb-t/se-Huskvarna
@@ -1,3 +1,13 @@
# Sweden - Huskvarna
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Husum b/dvb-t/se-Husum
new file mode 100644
index 0000000..d6678a4
--- /dev/null
+++ b/dvb-t/se-Husum
@@ -0,0 +1,5 @@
+# Sweden - Husum
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Idivuoma b/dvb-t/se-Idivuoma
new file mode 100644
index 0000000..d8a3b42
--- /dev/null
+++ b/dvb-t/se-Idivuoma
@@ -0,0 +1,5 @@
+# Sweden - Idivuoma
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Idre b/dvb-t/se-Idre
index 912aa70..341ff8d 100644
--- a/dvb-t/se-Idre
+++ b/dvb-t/se-Idre
@@ -1,3 +1,36 @@
# Sweden - Idre
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Ingatorp b/dvb-t/se-Ingatorp
index 11d37b5..2b11888 100644
--- a/dvb-t/se-Ingatorp
+++ b/dvb-t/se-Ingatorp
@@ -1,3 +1,13 @@
# Sweden - Ingatorp
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Ingvallsbenning b/dvb-t/se-Ingvallsbenning
index 8726759..391cb14 100644
--- a/dvb-t/se-Ingvallsbenning
+++ b/dvb-t/se-Ingvallsbenning
@@ -1,3 +1,6 @@
# Sweden - Ingvallsbenning
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Irevik b/dvb-t/se-Irevik
index 1530771..9fa49d9 100644
--- a/dvb-t/se-Irevik
+++ b/dvb-t/se-Irevik
@@ -1,4 +1,25 @@
# Sweden - Irevik
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Irevik_3195 b/dvb-t/se-Irevik_3195
new file mode 100644
index 0000000..694b756
--- /dev/null
+++ b/dvb-t/se-Irevik_3195
@@ -0,0 +1,30 @@
+# Sweden - Irevik/3195
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ivarsbyn b/dvb-t/se-Ivarsbyn
new file mode 100644
index 0000000..9f5c555
--- /dev/null
+++ b/dvb-t/se-Ivarsbyn
@@ -0,0 +1,5 @@
+# Sweden - Ivarsbyn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jakkvik_Frakenmyren b/dvb-t/se-Jakkvik_Frakenmyren
new file mode 100644
index 0000000..ca2cea1
--- /dev/null
+++ b/dvb-t/se-Jakkvik_Frakenmyren
@@ -0,0 +1,5 @@
+# Sweden - Jäkkvik Fräkenmyren
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jamjo b/dvb-t/se-Jamjo
index 0c14927..dd1446f 100644
--- a/dvb-t/se-Jamjo
+++ b/dvb-t/se-Jamjo
@@ -1,4 +1,25 @@
# Sweden - Jämjö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Jarkvissle b/dvb-t/se-Jarkvissle
new file mode 100644
index 0000000..7cfbaeb
--- /dev/null
+++ b/dvb-t/se-Jarkvissle
@@ -0,0 +1,5 @@
+# Sweden - Järkvissle
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jarnforsen b/dvb-t/se-Jarnforsen
index d129f35..d163be1 100644
--- a/dvb-t/se-Jarnforsen
+++ b/dvb-t/se-Jarnforsen
@@ -1,3 +1,13 @@
# Sweden - Järnforsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Jarpen_Mellangardsberget b/dvb-t/se-Jarpen_Mellangardsberget
new file mode 100644
index 0000000..d4b47c5
--- /dev/null
+++ b/dvb-t/se-Jarpen_Mellangardsberget
@@ -0,0 +1,5 @@
+# Sweden - Järpen Mellangårdsberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jarvso b/dvb-t/se-Jarvso
index c779daf..d5dcf62 100644
--- a/dvb-t/se-Jarvso
+++ b/dvb-t/se-Jarvso
@@ -1,3 +1,13 @@
# Sweden - Järvsö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Jarvtrask b/dvb-t/se-Jarvtrask
new file mode 100644
index 0000000..4e46510
--- /dev/null
+++ b/dvb-t/se-Jarvtrask
@@ -0,0 +1,5 @@
+# Sweden - Järvträsk
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Joestrom b/dvb-t/se-Joestrom
new file mode 100644
index 0000000..9e1bc4a
--- /dev/null
+++ b/dvb-t/se-Joestrom
@@ -0,0 +1,5 @@
+# Sweden - Joeström
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jokkmokk_Nyborg b/dvb-t/se-Jokkmokk_Nyborg
new file mode 100644
index 0000000..4f12cf2
--- /dev/null
+++ b/dvb-t/se-Jokkmokk_Nyborg
@@ -0,0 +1,35 @@
+# Sweden - Jokkmokk/Nyborg
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jokkmokk_Tjalmejaure b/dvb-t/se-Jokkmokk_Tjalmejaure
index 74d4ca3..364ba6d 100644
--- a/dvb-t/se-Jokkmokk_Tjalmejaure
+++ b/dvb-t/se-Jokkmokk_Tjalmejaure
@@ -1,6 +1,36 @@
# Sweden - Jokkmokk/Tjalmejaure
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Jonkoping_Bondberget b/dvb-t/se-Jonkoping_Bondberget
index 5c0d21e..f8ca1d4 100644
--- a/dvb-t/se-Jonkoping_Bondberget
+++ b/dvb-t/se-Jonkoping_Bondberget
@@ -1,6 +1,36 @@
# Sweden - Jönköping/Bondberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Jormvattnet b/dvb-t/se-Jormvattnet
new file mode 100644
index 0000000..0a9b458
--- /dev/null
+++ b/dvb-t/se-Jormvattnet
@@ -0,0 +1,5 @@
+# Sweden - Jormvattnet
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jude b/dvb-t/se-Jude
new file mode 100644
index 0000000..f0a4dfe
--- /dev/null
+++ b/dvb-t/se-Jude
@@ -0,0 +1,5 @@
+# Sweden - Jude
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Junsele_Hamptjarnsberget b/dvb-t/se-Junsele_Hamptjarnsberget
new file mode 100644
index 0000000..a031b71
--- /dev/null
+++ b/dvb-t/se-Junsele_Hamptjarnsberget
@@ -0,0 +1,5 @@
+# Sweden - Junsele Hamptjärnsberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Junsele_Vallen b/dvb-t/se-Junsele_Vallen
new file mode 100644
index 0000000..af1fe14
--- /dev/null
+++ b/dvb-t/se-Junsele_Vallen
@@ -0,0 +1,5 @@
+# Sweden - Junsele/Vallen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kagerod_Mollarp b/dvb-t/se-Kagerod_Mollarp
new file mode 100644
index 0000000..665b195
--- /dev/null
+++ b/dvb-t/se-Kagerod_Mollarp
@@ -0,0 +1,5 @@
+# Sweden - Kågeröd/Möllarp
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kalarne b/dvb-t/se-Kalarne
new file mode 100644
index 0000000..3ed4c70
--- /dev/null
+++ b/dvb-t/se-Kalarne
@@ -0,0 +1,5 @@
+# Sweden - Kälarne
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kalen b/dvb-t/se-Kalen
new file mode 100644
index 0000000..c26d776
--- /dev/null
+++ b/dvb-t/se-Kalen
@@ -0,0 +1,5 @@
+# Sweden - Kälen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kalix b/dvb-t/se-Kalix
index 21a29a8..fe4e1d2 100644
--- a/dvb-t/se-Kalix
+++ b/dvb-t/se-Kalix
@@ -1,6 +1,36 @@
# Sweden - Kalix
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Kallered b/dvb-t/se-Kallered
new file mode 100644
index 0000000..9bad036
--- /dev/null
+++ b/dvb-t/se-Kallered
@@ -0,0 +1,5 @@
+# Sweden - KÃ¥llered
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kallinge_Kalleberga b/dvb-t/se-Kallinge_Kalleberga
new file mode 100644
index 0000000..4079c6b
--- /dev/null
+++ b/dvb-t/se-Kallinge_Kalleberga
@@ -0,0 +1,35 @@
+# Sweden - Kallinge/Kalleberga
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Kallror b/dvb-t/se-Kallror
new file mode 100644
index 0000000..9c05f41
--- /dev/null
+++ b/dvb-t/se-Kallror
@@ -0,0 +1,5 @@
+# Sweden - Kallrör
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kampersvik_Ekeberget b/dvb-t/se-Kampersvik_Ekeberget
new file mode 100644
index 0000000..37394ca
--- /dev/null
+++ b/dvb-t/se-Kampersvik_Ekeberget
@@ -0,0 +1,5 @@
+# Sweden - Kämpersvik/Ekeberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Karbole b/dvb-t/se-Karbole
index 9f28422..f7340cc 100644
--- a/dvb-t/se-Karbole
+++ b/dvb-t/se-Karbole
@@ -1,3 +1,13 @@
# Sweden - Kårböle
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Karesuando b/dvb-t/se-Karesuando
new file mode 100644
index 0000000..ac8e934
--- /dev/null
+++ b/dvb-t/se-Karesuando
@@ -0,0 +1,5 @@
+# Sweden - Karesuando
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Karlanda b/dvb-t/se-Karlanda
new file mode 100644
index 0000000..3c455a1
--- /dev/null
+++ b/dvb-t/se-Karlanda
@@ -0,0 +1,5 @@
+# Sweden - Karlanda
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Karlsborg_Vaberget b/dvb-t/se-Karlsborg_Vaberget
index b84b8e8..dc1a6af 100644
--- a/dvb-t/se-Karlsborg_Vaberget
+++ b/dvb-t/se-Karlsborg_Vaberget
@@ -1,3 +1,13 @@
# Sweden - Karlsborg/Vaberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Karlshamn b/dvb-t/se-Karlshamn
index ed3a7cd..948e5d0 100644
--- a/dvb-t/se-Karlshamn
+++ b/dvb-t/se-Karlshamn
@@ -1,6 +1,36 @@
# Sweden - Karlshamn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Karlskrona_Jamjo b/dvb-t/se-Karlskrona_Jamjo
new file mode 100644
index 0000000..d7c2bf9
--- /dev/null
+++ b/dvb-t/se-Karlskrona_Jamjo
@@ -0,0 +1,35 @@
+# Sweden - Karlskrona/Jämjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Karlskrona_Vamo b/dvb-t/se-Karlskrona_Vamo
index 68e38ae..56195f4 100644
--- a/dvb-t/se-Karlskrona_Vamo
+++ b/dvb-t/se-Karlskrona_Vamo
@@ -1,6 +1,36 @@
# Sweden - Karlskrona/Vämö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Karlstad_Sormon b/dvb-t/se-Karlstad_Sormon
index 658bc70..0173e42 100644
--- a/dvb-t/se-Karlstad_Sormon
+++ b/dvb-t/se-Karlstad_Sormon
@@ -1,9 +1,36 @@
-# Sweden - Karlstad Sörmon Valid from 2007 09 26. Ver. 2 Correct FEC
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# Channels
-# Mux3=30
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-# Mux4=42
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-# Mux1=43
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+# Sweden - Karlstad Sörmon
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Kasta_Ringkallen b/dvb-t/se-Kasta_Ringkallen
new file mode 100644
index 0000000..6288d41
--- /dev/null
+++ b/dvb-t/se-Kasta_Ringkallen
@@ -0,0 +1,5 @@
+# Sweden - KÃ¥sta Ringkallen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kaxas b/dvb-t/se-Kaxas
new file mode 100644
index 0000000..e4e67c8
--- /dev/null
+++ b/dvb-t/se-Kaxas
@@ -0,0 +1,5 @@
+# Sweden - Kaxås
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kaxholmen_Vistakulle b/dvb-t/se-Kaxholmen_Vistakulle
index ede8ad9..e3f04e3 100644
--- a/dvb-t/se-Kaxholmen_Vistakulle
+++ b/dvb-t/se-Kaxholmen_Vistakulle
@@ -1,3 +1,13 @@
# Sweden - Kaxholmen/Vistakulle
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Kinnastrom b/dvb-t/se-Kinnastrom
index 61256eb..a612d36 100644
--- a/dvb-t/se-Kinnastrom
+++ b/dvb-t/se-Kinnastrom
@@ -1,3 +1,13 @@
# Sweden - Kinnaström
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Kiruna_Kirunavaara b/dvb-t/se-Kiruna_Kirunavaara
index dac4c24..91ee463 100644
--- a/dvb-t/se-Kiruna_Kirunavaara
+++ b/dvb-t/se-Kiruna_Kirunavaara
@@ -1,6 +1,63 @@
# Sweden - Kiruna/Kirunavaara
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Kisa b/dvb-t/se-Kisa
index 21d4bc3..590111d 100644
--- a/dvb-t/se-Kisa
+++ b/dvb-t/se-Kisa
@@ -1,7 +1,70 @@
# Sweden - Kisa
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Klingsta b/dvb-t/se-Klingsta
new file mode 100644
index 0000000..41b9669
--- /dev/null
+++ b/dvb-t/se-Klingsta
@@ -0,0 +1,5 @@
+# Sweden - Klingsta
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Klovsjo b/dvb-t/se-Klovsjo
new file mode 100644
index 0000000..2cbf2e4
--- /dev/null
+++ b/dvb-t/se-Klovsjo
@@ -0,0 +1,5 @@
+# Sweden - Klövsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Knared b/dvb-t/se-Knared
index 2feda10..04db854 100644
--- a/dvb-t/se-Knared
+++ b/dvb-t/se-Knared
@@ -1,3 +1,13 @@
# Sweden - Knäred
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Knavland b/dvb-t/se-Knavland
new file mode 100644
index 0000000..9a09224
--- /dev/null
+++ b/dvb-t/se-Knavland
@@ -0,0 +1,5 @@
+# Sweden - Knävland
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kopmanholmen b/dvb-t/se-Kopmanholmen
index f9f9541..bbe55a6 100644
--- a/dvb-t/se-Kopmanholmen
+++ b/dvb-t/se-Kopmanholmen
@@ -1,6 +1,63 @@
# Sweden - Köpmanholmen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Kopparberg b/dvb-t/se-Kopparberg
index af84cfe..b684445 100644
--- a/dvb-t/se-Kopparberg
+++ b/dvb-t/se-Kopparberg
@@ -1,4 +1,35 @@
# Sweden - Kopparberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Koppom b/dvb-t/se-Koppom
new file mode 100644
index 0000000..e600153
--- /dev/null
+++ b/dvb-t/se-Koppom
@@ -0,0 +1,35 @@
+# Sweden - Koppom
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Korstrask b/dvb-t/se-Korstrask
new file mode 100644
index 0000000..b854cc2
--- /dev/null
+++ b/dvb-t/se-Korstrask
@@ -0,0 +1,5 @@
+# Sweden - Korsträsk
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kottsjon b/dvb-t/se-Kottsjon
new file mode 100644
index 0000000..a3b0cde
--- /dev/null
+++ b/dvb-t/se-Kottsjon
@@ -0,0 +1,5 @@
+# Sweden - Köttsjön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kovland b/dvb-t/se-Kovland
new file mode 100644
index 0000000..9f5d97c
--- /dev/null
+++ b/dvb-t/se-Kovland
@@ -0,0 +1,5 @@
+# Sweden - Kovland
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kramfors_Lugnvik b/dvb-t/se-Kramfors_Lugnvik
index f17f8c1..67bab9a 100644
--- a/dvb-t/se-Kramfors_Lugnvik
+++ b/dvb-t/se-Kramfors_Lugnvik
@@ -1,6 +1,36 @@
# Sweden - Kramfors/Lugnvik
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Kramfors_Ostby b/dvb-t/se-Kramfors_Ostby
new file mode 100644
index 0000000..9cd0d78
--- /dev/null
+++ b/dvb-t/se-Kramfors_Ostby
@@ -0,0 +1,5 @@
+# Sweden - Kramfors/Östby
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Krangede b/dvb-t/se-Krangede
new file mode 100644
index 0000000..ac6ff0b
--- /dev/null
+++ b/dvb-t/se-Krangede
@@ -0,0 +1,5 @@
+# Sweden - Krångede
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kristineberg b/dvb-t/se-Kristineberg
new file mode 100644
index 0000000..f8c00a4
--- /dev/null
+++ b/dvb-t/se-Kristineberg
@@ -0,0 +1,5 @@
+# Sweden - Kristineberg
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kristinehamn_Utsiktsberget b/dvb-t/se-Kristinehamn_Utsiktsberget
index 71c465d..a4d5392 100644
--- a/dvb-t/se-Kristinehamn_Utsiktsberget
+++ b/dvb-t/se-Kristinehamn_Utsiktsberget
@@ -1,6 +1,36 @@
# Sweden - Kristinehamn/Utsiktsberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Krokstrand b/dvb-t/se-Krokstrand
new file mode 100644
index 0000000..b999d34
--- /dev/null
+++ b/dvb-t/se-Krokstrand
@@ -0,0 +1,5 @@
+# Sweden - Krokstrand
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kultsjon b/dvb-t/se-Kultsjon
new file mode 100644
index 0000000..a79ca58
--- /dev/null
+++ b/dvb-t/se-Kultsjon
@@ -0,0 +1,5 @@
+# Sweden - Kultsjön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kungalv b/dvb-t/se-Kungalv
new file mode 100644
index 0000000..ea51882
--- /dev/null
+++ b/dvb-t/se-Kungalv
@@ -0,0 +1,35 @@
+# Sweden - Kungälv
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Kungsater b/dvb-t/se-Kungsater
index 0876dba..26026b6 100644
--- a/dvb-t/se-Kungsater
+++ b/dvb-t/se-Kungsater
@@ -1,3 +1,13 @@
# Sweden - Kungsäter
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Kungsbacka_Ojersbo b/dvb-t/se-Kungsbacka_Ojersbo
new file mode 100644
index 0000000..17fbda1
--- /dev/null
+++ b/dvb-t/se-Kungsbacka_Ojersbo
@@ -0,0 +1,5 @@
+# Sweden - Kungsbacka/Öjersbo
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kungsberget_GI b/dvb-t/se-Kungsberget_GI
index 0c4eeb3..8d34e20 100644
--- a/dvb-t/se-Kungsberget_GI
+++ b/dvb-t/se-Kungsberget_GI
@@ -1,3 +1,13 @@
# Sweden - Kungsberget/GI
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Kungsberget_Gl b/dvb-t/se-Kungsberget_Gl
new file mode 100644
index 0000000..f3e5c2f
--- /dev/null
+++ b/dvb-t/se-Kungsberget_Gl
@@ -0,0 +1,5 @@
+# Sweden - Kungsberget/Gl
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kungshamn b/dvb-t/se-Kungshamn
new file mode 100644
index 0000000..adb5989
--- /dev/null
+++ b/dvb-t/se-Kungshamn
@@ -0,0 +1,35 @@
+# Sweden - Kungshamn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Kurravaara b/dvb-t/se-Kurravaara
new file mode 100644
index 0000000..06abf2b
--- /dev/null
+++ b/dvb-t/se-Kurravaara
@@ -0,0 +1,5 @@
+# Sweden - Kurravaara
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kvarnsvedjan b/dvb-t/se-Kvarnsvedjan
new file mode 100644
index 0000000..c2d9f6e
--- /dev/null
+++ b/dvb-t/se-Kvarnsvedjan
@@ -0,0 +1,5 @@
+# Sweden - Kvarnsvedjan
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kvikkjokk_Arrevare b/dvb-t/se-Kvikkjokk_Arrevare
new file mode 100644
index 0000000..b4606ac
--- /dev/null
+++ b/dvb-t/se-Kvikkjokk_Arrevare
@@ -0,0 +1,5 @@
+# Sweden - Kvikkjokk/Ã…rrevare
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kvikkjokk_Tavvevare b/dvb-t/se-Kvikkjokk_Tavvevare
new file mode 100644
index 0000000..d15e9a5
--- /dev/null
+++ b/dvb-t/se-Kvikkjokk_Tavvevare
@@ -0,0 +1,5 @@
+# Sweden - Kvikkjokk/Tavvevare
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kyrkesund b/dvb-t/se-Kyrkesund
new file mode 100644
index 0000000..935a300
--- /dev/null
+++ b/dvb-t/se-Kyrkesund
@@ -0,0 +1,5 @@
+# Sweden - Kyrkesund
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lagfors b/dvb-t/se-Lagfors
new file mode 100644
index 0000000..c4f530c
--- /dev/null
+++ b/dvb-t/se-Lagfors
@@ -0,0 +1,5 @@
+# Sweden - Lagfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Laggarberg b/dvb-t/se-Laggarberg
new file mode 100644
index 0000000..0c96875
--- /dev/null
+++ b/dvb-t/se-Laggarberg
@@ -0,0 +1,5 @@
+# Sweden - Laggarberg
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Laisvall b/dvb-t/se-Laisvall
new file mode 100644
index 0000000..36d1b0a
--- /dev/null
+++ b/dvb-t/se-Laisvall
@@ -0,0 +1,5 @@
+# Sweden - Laisvall
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Langa b/dvb-t/se-Langa
new file mode 100644
index 0000000..f083532
--- /dev/null
+++ b/dvb-t/se-Langa
@@ -0,0 +1,5 @@
+# Sweden - Långå
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Langsele b/dvb-t/se-Langsele
new file mode 100644
index 0000000..15bddfc
--- /dev/null
+++ b/dvb-t/se-Langsele
@@ -0,0 +1,5 @@
+# Sweden - LÃ¥ngsele
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Langshyttan b/dvb-t/se-Langshyttan
index bbba370..158f8b1 100644
--- a/dvb-t/se-Langshyttan
+++ b/dvb-t/se-Langshyttan
@@ -1,3 +1,13 @@
# Sweden - LÃ¥ngshyttan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Langshyttan_Engelsfors b/dvb-t/se-Langshyttan_Engelsfors
index 373446a..420d18b 100644
--- a/dvb-t/se-Langshyttan_Engelsfors
+++ b/dvb-t/se-Langshyttan_Engelsfors
@@ -1,3 +1,6 @@
# Sweden - LÃ¥ngshyttan/Engelsfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Laxsjo b/dvb-t/se-Laxsjo
new file mode 100644
index 0000000..655b28a
--- /dev/null
+++ b/dvb-t/se-Laxsjo
@@ -0,0 +1,5 @@
+# Sweden - Laxsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Laxviken b/dvb-t/se-Laxviken
new file mode 100644
index 0000000..4bd6bd9
--- /dev/null
+++ b/dvb-t/se-Laxviken
@@ -0,0 +1,5 @@
+# Sweden - Laxviken
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Leksand_Asledsberget b/dvb-t/se-Leksand_Asledsberget
new file mode 100644
index 0000000..f7a0d8a
--- /dev/null
+++ b/dvb-t/se-Leksand_Asledsberget
@@ -0,0 +1,35 @@
+# Sweden - Leksand/Ã…sledsberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Leksand_Karingberget b/dvb-t/se-Leksand_Karingberget
index 2d15561..431233b 100644
--- a/dvb-t/se-Leksand_Karingberget
+++ b/dvb-t/se-Leksand_Karingberget
@@ -1,3 +1,13 @@
# Sweden - Leksand/Käringberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Lekvattnet b/dvb-t/se-Lekvattnet
new file mode 100644
index 0000000..e052924
--- /dev/null
+++ b/dvb-t/se-Lekvattnet
@@ -0,0 +1,5 @@
+# Sweden - Lekvattnet
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lerdala b/dvb-t/se-Lerdala
index 2428c69..3e9750f 100644
--- a/dvb-t/se-Lerdala
+++ b/dvb-t/se-Lerdala
@@ -1,3 +1,13 @@
# Sweden - Lerdala
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Lesjofors b/dvb-t/se-Lesjofors
new file mode 100644
index 0000000..47ec104
--- /dev/null
+++ b/dvb-t/se-Lesjofors
@@ -0,0 +1,35 @@
+# Sweden - Lesjöfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Liden b/dvb-t/se-Liden
new file mode 100644
index 0000000..7e0e844
--- /dev/null
+++ b/dvb-t/se-Liden
@@ -0,0 +1,5 @@
+# Sweden - Liden
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Liden_Osterstrom b/dvb-t/se-Liden_Osterstrom
new file mode 100644
index 0000000..37120a1
--- /dev/null
+++ b/dvb-t/se-Liden_Osterstrom
@@ -0,0 +1,5 @@
+# Sweden - Liden/Österström
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lilla_Edet b/dvb-t/se-Lilla_Edet
new file mode 100644
index 0000000..edaf906
--- /dev/null
+++ b/dvb-t/se-Lilla_Edet
@@ -0,0 +1,35 @@
+# Sweden - Lilla Edet
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Lillogda b/dvb-t/se-Lillogda
new file mode 100644
index 0000000..8ceaea1
--- /dev/null
+++ b/dvb-t/se-Lillogda
@@ -0,0 +1,5 @@
+# Sweden - Lillögda
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lillpite_Bastaberget b/dvb-t/se-Lillpite_Bastaberget
new file mode 100644
index 0000000..a296c0c
--- /dev/null
+++ b/dvb-t/se-Lillpite_Bastaberget
@@ -0,0 +1,5 @@
+# Sweden - Lillpite Bastaberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lilltjara_Digerberget b/dvb-t/se-Lilltjara_Digerberget
index f2cee9f..cd9197b 100644
--- a/dvb-t/se-Lilltjara_Digerberget
+++ b/dvb-t/se-Lilltjara_Digerberget
@@ -1,3 +1,13 @@
# Sweden - Lilltjära/Digerberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Limedsforsen b/dvb-t/se-Limedsforsen
index 12b36ef..64c4d25 100644
--- a/dvb-t/se-Limedsforsen
+++ b/dvb-t/se-Limedsforsen
@@ -1,3 +1,13 @@
# Sweden - Limedsforsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Lindshammar_Ramkvilla b/dvb-t/se-Lindshammar_Ramkvilla
index 9a03b1e..e736d0d 100644
--- a/dvb-t/se-Lindshammar_Ramkvilla
+++ b/dvb-t/se-Lindshammar_Ramkvilla
@@ -1,3 +1,13 @@
# Sweden - Lindshammar/Ramkvilla
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Linkoping_Vattentornet b/dvb-t/se-Linkoping_Vattentornet
index 31adae8..ecc44e8 100644
--- a/dvb-t/se-Linkoping_Vattentornet
+++ b/dvb-t/se-Linkoping_Vattentornet
@@ -1,7 +1,36 @@
# Sweden - Linköping/Vattentornet
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Linsell b/dvb-t/se-Linsell
new file mode 100644
index 0000000..679209b
--- /dev/null
+++ b/dvb-t/se-Linsell
@@ -0,0 +1,5 @@
+# Sweden - Linsell
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lit b/dvb-t/se-Lit
new file mode 100644
index 0000000..abe24ec
--- /dev/null
+++ b/dvb-t/se-Lit
@@ -0,0 +1,5 @@
+# Sweden - Lit
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ljugarn b/dvb-t/se-Ljugarn
index 6474a15..c256ce2 100644
--- a/dvb-t/se-Ljugarn
+++ b/dvb-t/se-Ljugarn
@@ -1,4 +1,25 @@
# Sweden - Ljugarn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Ljugarn_3193 b/dvb-t/se-Ljugarn_3193
new file mode 100644
index 0000000..d248cec
--- /dev/null
+++ b/dvb-t/se-Ljugarn_3193
@@ -0,0 +1,30 @@
+# Sweden - Ljugarn/3193
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ljungaverk b/dvb-t/se-Ljungaverk
new file mode 100644
index 0000000..9b8144d
--- /dev/null
+++ b/dvb-t/se-Ljungaverk
@@ -0,0 +1,5 @@
+# Sweden - Ljungaverk
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ljungdalen b/dvb-t/se-Ljungdalen
new file mode 100644
index 0000000..993efd0
--- /dev/null
+++ b/dvb-t/se-Ljungdalen
@@ -0,0 +1,35 @@
+# Sweden - Ljungdalen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ljustorp b/dvb-t/se-Ljustorp
new file mode 100644
index 0000000..1444dc9
--- /dev/null
+++ b/dvb-t/se-Ljustorp
@@ -0,0 +1,5 @@
+# Sweden - Ljustorp
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ljusvattnet b/dvb-t/se-Ljusvattnet
new file mode 100644
index 0000000..25026ca
--- /dev/null
+++ b/dvb-t/se-Ljusvattnet
@@ -0,0 +1,5 @@
+# Sweden - Ljusvattnet
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Loderups_Strandbad b/dvb-t/se-Loderups_Strandbad
new file mode 100644
index 0000000..a9b4073
--- /dev/null
+++ b/dvb-t/se-Loderups_Strandbad
@@ -0,0 +1,5 @@
+# Sweden - Löderups Strandbad
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Loffstrand b/dvb-t/se-Loffstrand
index f95de05..440ac0a 100644
--- a/dvb-t/se-Loffstrand
+++ b/dvb-t/se-Loffstrand
@@ -1,6 +1,36 @@
# Sweden - Loffstrand
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Lofsdalen b/dvb-t/se-Lofsdalen
new file mode 100644
index 0000000..dcae230
--- /dev/null
+++ b/dvb-t/se-Lofsdalen
@@ -0,0 +1,5 @@
+# Sweden - Lofsdalen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Logdealv b/dvb-t/se-Logdealv
new file mode 100644
index 0000000..b1a7ac9
--- /dev/null
+++ b/dvb-t/se-Logdealv
@@ -0,0 +1,5 @@
+# Sweden - Lögdeälv
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lonneberga b/dvb-t/se-Lonneberga
index 8664ea9..29a8e8f 100644
--- a/dvb-t/se-Lonneberga
+++ b/dvb-t/se-Lonneberga
@@ -1,4 +1,35 @@
# Sweden - Lönneberga
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lorstrand b/dvb-t/se-Lorstrand
index 30867a3..dbbde4a 100644
--- a/dvb-t/se-Lorstrand
+++ b/dvb-t/se-Lorstrand
@@ -1,3 +1,13 @@
# Sweden - Lörstrand
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Lovanger b/dvb-t/se-Lovanger
new file mode 100644
index 0000000..0e05df5
--- /dev/null
+++ b/dvb-t/se-Lovanger
@@ -0,0 +1,5 @@
+# Sweden - Lövånger
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ludvika_Bjorkasen b/dvb-t/se-Ludvika_Bjorkasen
index 07bccd4..8512a0d 100644
--- a/dvb-t/se-Ludvika_Bjorkasen
+++ b/dvb-t/se-Ludvika_Bjorkasen
@@ -1,4 +1,36 @@
# Sweden - Ludvika/Björkåsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Lumsheden_Trekanten b/dvb-t/se-Lumsheden_Trekanten
index c8a1c9d..5b9e0b6 100644
--- a/dvb-t/se-Lumsheden_Trekanten
+++ b/dvb-t/se-Lumsheden_Trekanten
@@ -1,3 +1,13 @@
# Sweden - Lumsheden/Trekanten
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Lycksele_Knaften b/dvb-t/se-Lycksele_Knaften
index 05d6469..b5ec6dd 100644
--- a/dvb-t/se-Lycksele_Knaften
+++ b/dvb-t/se-Lycksele_Knaften
@@ -1,6 +1,36 @@
# Sweden - Lycksele/Knaften
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Mahult b/dvb-t/se-Mahult
index 3c45ffa..d27311d 100644
--- a/dvb-t/se-Mahult
+++ b/dvb-t/se-Mahult
@@ -1,3 +1,13 @@
# Sweden - Mahult
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Mala b/dvb-t/se-Mala
new file mode 100644
index 0000000..96fce5a
--- /dev/null
+++ b/dvb-t/se-Mala
@@ -0,0 +1,5 @@
+# Sweden - Malå
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Malmo_Jagersro b/dvb-t/se-Malmo_Jagersro
index 2d0d845..c8725c9 100644
--- a/dvb-t/se-Malmo_Jagersro
+++ b/dvb-t/se-Malmo_Jagersro
@@ -1,7 +1,36 @@
# Sweden - Malmö/Jägersro
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Malung b/dvb-t/se-Malung
index fe2b08d..4ea6361 100644
--- a/dvb-t/se-Malung
+++ b/dvb-t/se-Malung
@@ -1,4 +1,36 @@
# Sweden - Malung
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Manserud b/dvb-t/se-Manserud
new file mode 100644
index 0000000..a9ee5b0
--- /dev/null
+++ b/dvb-t/se-Manserud
@@ -0,0 +1,5 @@
+# Sweden - MÃ¥nserud
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mardsjo b/dvb-t/se-Mardsjo
new file mode 100644
index 0000000..ddf67ba
--- /dev/null
+++ b/dvb-t/se-Mardsjo
@@ -0,0 +1,5 @@
+# Sweden - Mårdsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mariannelund b/dvb-t/se-Mariannelund
index 2ec7cd6..21b5100 100644
--- a/dvb-t/se-Mariannelund
+++ b/dvb-t/se-Mariannelund
@@ -1,3 +1,6 @@
# Sweden - Mariannelund
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Markaryd_Hualtet b/dvb-t/se-Markaryd_Hualtet
index 941f30c..453807e 100644
--- a/dvb-t/se-Markaryd_Hualtet
+++ b/dvb-t/se-Markaryd_Hualtet
@@ -1,4 +1,49 @@
# Sweden - Markaryd/Hualtet
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000 \ No newline at end of file
diff --git a/dvb-t/se-Matfors b/dvb-t/se-Matfors
index d956929..4f0b82b 100644
--- a/dvb-t/se-Matfors
+++ b/dvb-t/se-Matfors
@@ -1,6 +1,35 @@
# Sweden - Matfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Matsdal b/dvb-t/se-Matsdal
new file mode 100644
index 0000000..a06ec36
--- /dev/null
+++ b/dvb-t/se-Matsdal
@@ -0,0 +1,5 @@
+# Sweden - Matsdal
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Medstugan b/dvb-t/se-Medstugan
new file mode 100644
index 0000000..2ca7194
--- /dev/null
+++ b/dvb-t/se-Medstugan
@@ -0,0 +1,5 @@
+# Sweden - Medstugan
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mittadalen b/dvb-t/se-Mittadalen
new file mode 100644
index 0000000..ddbc60a
--- /dev/null
+++ b/dvb-t/se-Mittadalen
@@ -0,0 +1,5 @@
+# Sweden - Mittådalen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mjallom b/dvb-t/se-Mjallom
new file mode 100644
index 0000000..8f0ea29
--- /dev/null
+++ b/dvb-t/se-Mjallom
@@ -0,0 +1,35 @@
+# Sweden - Mjällom
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mjosjo b/dvb-t/se-Mjosjo
new file mode 100644
index 0000000..ea339fd
--- /dev/null
+++ b/dvb-t/se-Mjosjo
@@ -0,0 +1,5 @@
+# Sweden - Mjösjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Moliden b/dvb-t/se-Moliden
new file mode 100644
index 0000000..6067827
--- /dev/null
+++ b/dvb-t/se-Moliden
@@ -0,0 +1,5 @@
+# Sweden - Moliden
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Molnbo_Tallstugan b/dvb-t/se-Molnbo_Tallstugan
new file mode 100644
index 0000000..5aa6176
--- /dev/null
+++ b/dvb-t/se-Molnbo_Tallstugan
@@ -0,0 +1,35 @@
+# Sweden - Mölnbo/Tallstugan
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Molndal_Vasterberget b/dvb-t/se-Molndal_Vasterberget
index 8f38e4c..8bc3122 100644
--- a/dvb-t/se-Molndal_Vasterberget
+++ b/dvb-t/se-Molndal_Vasterberget
@@ -1,7 +1,30 @@
# Sweden - Mölndal/Västerberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mora_Eldris b/dvb-t/se-Mora_Eldris
index 9b7253c..322331b 100644
--- a/dvb-t/se-Mora_Eldris
+++ b/dvb-t/se-Mora_Eldris
@@ -1,6 +1,63 @@
# Sweden - Mora/Eldris
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Morkret b/dvb-t/se-Morkret
new file mode 100644
index 0000000..cac8286
--- /dev/null
+++ b/dvb-t/se-Morkret
@@ -0,0 +1,5 @@
+# Sweden - Mörkret
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Moskosel b/dvb-t/se-Moskosel
new file mode 100644
index 0000000..7c20752
--- /dev/null
+++ b/dvb-t/se-Moskosel
@@ -0,0 +1,5 @@
+# Sweden - Moskosel
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Motala_Ervasteby b/dvb-t/se-Motala_Ervasteby
index 4d673f4..eb46976 100644
--- a/dvb-t/se-Motala_Ervasteby
+++ b/dvb-t/se-Motala_Ervasteby
@@ -1,7 +1,70 @@
# Sweden - Motala/Ervasteby
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Mullsjo_Torestorp b/dvb-t/se-Mullsjo_Torestorp
index 264c443..af676e5 100644
--- a/dvb-t/se-Mullsjo_Torestorp
+++ b/dvb-t/se-Mullsjo_Torestorp
@@ -1,4 +1,35 @@
# Sweden - Mullsjö/Torestorp
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Munkedal b/dvb-t/se-Munkedal
new file mode 100644
index 0000000..bc022c3
--- /dev/null
+++ b/dvb-t/se-Munkedal
@@ -0,0 +1,35 @@
+# Sweden - Munkedal
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Munkfors b/dvb-t/se-Munkfors
new file mode 100644
index 0000000..5dcc656
--- /dev/null
+++ b/dvb-t/se-Munkfors
@@ -0,0 +1,35 @@
+# Sweden - Munkfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Muodoslompolo b/dvb-t/se-Muodoslompolo
new file mode 100644
index 0000000..b10d741
--- /dev/null
+++ b/dvb-t/se-Muodoslompolo
@@ -0,0 +1,5 @@
+# Sweden - Muodoslompolo
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nalden b/dvb-t/se-Nalden
new file mode 100644
index 0000000..42e4ebe
--- /dev/null
+++ b/dvb-t/se-Nalden
@@ -0,0 +1,5 @@
+# Sweden - Nälden
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nasaker b/dvb-t/se-Nasaker
new file mode 100644
index 0000000..5df6e2c
--- /dev/null
+++ b/dvb-t/se-Nasaker
@@ -0,0 +1,5 @@
+# Sweden - Näsåker
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nasanget b/dvb-t/se-Nasanget
new file mode 100644
index 0000000..381ac65
--- /dev/null
+++ b/dvb-t/se-Nasanget
@@ -0,0 +1,5 @@
+# Sweden - Näsänget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nassjo b/dvb-t/se-Nassjo
index 9fe7769..7b16284 100644
--- a/dvb-t/se-Nassjo
+++ b/dvb-t/se-Nassjo
@@ -1,6 +1,63 @@
# Sweden - Nässjö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Nasteln b/dvb-t/se-Nasteln
new file mode 100644
index 0000000..e47ade6
--- /dev/null
+++ b/dvb-t/se-Nasteln
@@ -0,0 +1,5 @@
+# Sweden - Nästeln
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Navekvarn b/dvb-t/se-Navekvarn
index 1016800..cccc63e 100644
--- a/dvb-t/se-Navekvarn
+++ b/dvb-t/se-Navekvarn
@@ -1,3 +1,6 @@
# Sweden - Nävekvarn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Naverede_Oberget b/dvb-t/se-Naverede_Oberget
new file mode 100644
index 0000000..b6e6fb6
--- /dev/null
+++ b/dvb-t/se-Naverede_Oberget
@@ -0,0 +1,5 @@
+# Sweden - Näverede Öberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Niemisel b/dvb-t/se-Niemisel
new file mode 100644
index 0000000..eee6be7
--- /dev/null
+++ b/dvb-t/se-Niemisel
@@ -0,0 +1,5 @@
+# Sweden - Niemisel
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nordanede b/dvb-t/se-Nordanede
new file mode 100644
index 0000000..3a2ad29
--- /dev/null
+++ b/dvb-t/se-Nordanede
@@ -0,0 +1,5 @@
+# Sweden - Nordanede
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nordmaling b/dvb-t/se-Nordmaling
new file mode 100644
index 0000000..9d02cd5
--- /dev/null
+++ b/dvb-t/se-Nordmaling
@@ -0,0 +1,5 @@
+# Sweden - Nordmaling
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norra_Rorum b/dvb-t/se-Norra_Rorum
new file mode 100644
index 0000000..a08dfd8
--- /dev/null
+++ b/dvb-t/se-Norra_Rorum
@@ -0,0 +1,5 @@
+# Sweden - Norra Rörum
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norrahammar b/dvb-t/se-Norrahammar
index f6ae37d..d276059 100644
--- a/dvb-t/se-Norrahammar
+++ b/dvb-t/se-Norrahammar
@@ -1,3 +1,13 @@
# Sweden - Norrahammar
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Norraker b/dvb-t/se-Norraker
new file mode 100644
index 0000000..cfea43f
--- /dev/null
+++ b/dvb-t/se-Norraker
@@ -0,0 +1,5 @@
+# Sweden - Norråker
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norrfors b/dvb-t/se-Norrfors
new file mode 100644
index 0000000..d9a0cbe
--- /dev/null
+++ b/dvb-t/se-Norrfors
@@ -0,0 +1,5 @@
+# Sweden - Norrfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norrhassel b/dvb-t/se-Norrhassel
new file mode 100644
index 0000000..69b698e
--- /dev/null
+++ b/dvb-t/se-Norrhassel
@@ -0,0 +1,5 @@
+# Sweden - Norrhassel
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norrkoping_Krokek b/dvb-t/se-Norrkoping_Krokek
index 24fed0c..f6e6e48 100644
--- a/dvb-t/se-Norrkoping_Krokek
+++ b/dvb-t/se-Norrkoping_Krokek
@@ -1,7 +1,36 @@
# Sweden - Norrköping/Krokek
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Norrtalje_Sodra b/dvb-t/se-Norrtalje_Sodra
new file mode 100644
index 0000000..33b6c8f
--- /dev/null
+++ b/dvb-t/se-Norrtalje_Sodra
@@ -0,0 +1,30 @@
+# Sweden - Norrtälje Södra
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norrtalje_Sodra_Bergen b/dvb-t/se-Norrtalje_Sodra_Bergen
index 3fb43c6..7c82968 100644
--- a/dvb-t/se-Norrtalje_Sodra_Bergen
+++ b/dvb-t/se-Norrtalje_Sodra_Bergen
@@ -1,7 +1,61 @@
# Sweden - Norrtälje/Södra Bergen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Norsjovallen b/dvb-t/se-Norsjovallen
new file mode 100644
index 0000000..4f3e768
--- /dev/null
+++ b/dvb-t/se-Norsjovallen
@@ -0,0 +1,5 @@
+# Sweden - Norsjövallen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nyhem b/dvb-t/se-Nyhem
new file mode 100644
index 0000000..a7406f4
--- /dev/null
+++ b/dvb-t/se-Nyhem
@@ -0,0 +1,5 @@
+# Sweden - Nyhem
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nykoping b/dvb-t/se-Nykoping
index 848261c..6735148 100644
--- a/dvb-t/se-Nykoping
+++ b/dvb-t/se-Nykoping
@@ -1,3 +1,13 @@
# Sweden - Nyköping
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Nyliden b/dvb-t/se-Nyliden
new file mode 100644
index 0000000..c03bc4c
--- /dev/null
+++ b/dvb-t/se-Nyliden
@@ -0,0 +1,5 @@
+# Sweden - Nyliden
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nynashamn_Vattentornet b/dvb-t/se-Nynashamn_Vattentornet
new file mode 100644
index 0000000..ec118d8
--- /dev/null
+++ b/dvb-t/se-Nynashamn_Vattentornet
@@ -0,0 +1,35 @@
+# Sweden - Nynäshamn/Vattentornet
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Odsmal b/dvb-t/se-Odsmal
new file mode 100644
index 0000000..fff9356
--- /dev/null
+++ b/dvb-t/se-Odsmal
@@ -0,0 +1,5 @@
+# Sweden - Ödsmål
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Olden_Telestation b/dvb-t/se-Olden_Telestation
new file mode 100644
index 0000000..4a65fae
--- /dev/null
+++ b/dvb-t/se-Olden_Telestation
@@ -0,0 +1,5 @@
+# Sweden - Olden/Telestation
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Olkamangi b/dvb-t/se-Olkamangi
new file mode 100644
index 0000000..c76b784
--- /dev/null
+++ b/dvb-t/se-Olkamangi
@@ -0,0 +1,5 @@
+# Sweden - Olkamangi
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Olofstrom b/dvb-t/se-Olofstrom
new file mode 100644
index 0000000..e883dc3
--- /dev/null
+++ b/dvb-t/se-Olofstrom
@@ -0,0 +1,5 @@
+# Sweden - Olofström
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Orebro_Lockhyttan b/dvb-t/se-Orebro_Lockhyttan
index 22a5d51..036d74b 100644
--- a/dvb-t/se-Orebro_Lockhyttan
+++ b/dvb-t/se-Orebro_Lockhyttan
@@ -1,7 +1,70 @@
# Sweden - Örebro/Lockhyttan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Orkelljunga b/dvb-t/se-Orkelljunga
new file mode 100644
index 0000000..2306c7e
--- /dev/null
+++ b/dvb-t/se-Orkelljunga
@@ -0,0 +1,35 @@
+# Sweden - Örkelljunga
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Ornskoldsvik_As b/dvb-t/se-Ornskoldsvik_As
index 8fa6edb..b35452c 100644
--- a/dvb-t/se-Ornskoldsvik_As
+++ b/dvb-t/se-Ornskoldsvik_As
@@ -1,7 +1,70 @@
# Sweden - Örnsköldsvik/Ås
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000 \ No newline at end of file
diff --git a/dvb-t/se-Oskarshamn b/dvb-t/se-Oskarshamn
index 98e8476..8ee04ca 100644
--- a/dvb-t/se-Oskarshamn
+++ b/dvb-t/se-Oskarshamn
@@ -1,6 +1,35 @@
# Sweden - Oskarshamn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Osmo_Bjorsta b/dvb-t/se-Osmo_Bjorsta
new file mode 100644
index 0000000..c5973bf
--- /dev/null
+++ b/dvb-t/se-Osmo_Bjorsta
@@ -0,0 +1,10 @@
+# Sweden - Ösmo/Björsta
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Osterforse b/dvb-t/se-Osterforse
new file mode 100644
index 0000000..ce72b93
--- /dev/null
+++ b/dvb-t/se-Osterforse
@@ -0,0 +1,5 @@
+# Sweden - Österforse
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ostergraninge b/dvb-t/se-Ostergraninge
new file mode 100644
index 0000000..1c0a589
--- /dev/null
+++ b/dvb-t/se-Ostergraninge
@@ -0,0 +1,5 @@
+# Sweden - Östergraninge
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ostersund_Brattasen b/dvb-t/se-Ostersund_Brattasen
index c3828f6..ddb74a5 100644
--- a/dvb-t/se-Ostersund_Brattasen
+++ b/dvb-t/se-Ostersund_Brattasen
@@ -1,7 +1,36 @@
# Sweden - Östersund/Brattåsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Osthammar_Valo b/dvb-t/se-Osthammar_Valo
index d616927..301063d 100644
--- a/dvb-t/se-Osthammar_Valo
+++ b/dvb-t/se-Osthammar_Valo
@@ -1,7 +1,36 @@
# Sweden - Östhammar/Valö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Ostmark b/dvb-t/se-Ostmark
new file mode 100644
index 0000000..40cb1a7
--- /dev/null
+++ b/dvb-t/se-Ostmark
@@ -0,0 +1,5 @@
+# Sweden - Östmark
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overammer b/dvb-t/se-Overammer
new file mode 100644
index 0000000..db3e13b
--- /dev/null
+++ b/dvb-t/se-Overammer
@@ -0,0 +1,5 @@
+# Sweden - Överammer
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overhogdal b/dvb-t/se-Overhogdal
new file mode 100644
index 0000000..4990749
--- /dev/null
+++ b/dvb-t/se-Overhogdal
@@ -0,0 +1,5 @@
+# Sweden - Överhogdal
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overkalix b/dvb-t/se-Overkalix
index 91ec2f5..56612b8 100644
--- a/dvb-t/se-Overkalix
+++ b/dvb-t/se-Overkalix
@@ -1,6 +1,36 @@
# Sweden - Överkalix
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Overklinten b/dvb-t/se-Overklinten
new file mode 100644
index 0000000..5c427ee
--- /dev/null
+++ b/dvb-t/se-Overklinten
@@ -0,0 +1,5 @@
+# Sweden - Överklinten
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overrissjo b/dvb-t/se-Overrissjo
new file mode 100644
index 0000000..030f14f
--- /dev/null
+++ b/dvb-t/se-Overrissjo
@@ -0,0 +1,5 @@
+# Sweden - Överrissjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overtornea_Sarkivaara b/dvb-t/se-Overtornea_Sarkivaara
new file mode 100644
index 0000000..1d9bee0
--- /dev/null
+++ b/dvb-t/se-Overtornea_Sarkivaara
@@ -0,0 +1,35 @@
+# Sweden - Övertorneå Särkivaara
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overturingen b/dvb-t/se-Overturingen
new file mode 100644
index 0000000..1dbac13
--- /dev/null
+++ b/dvb-t/se-Overturingen
@@ -0,0 +1,5 @@
+# Sweden - Överturingen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Oxberg b/dvb-t/se-Oxberg
index 6a61626..3a28be5 100644
--- a/dvb-t/se-Oxberg
+++ b/dvb-t/se-Oxberg
@@ -1,3 +1,13 @@
# Sweden - Oxberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Pajala b/dvb-t/se-Pajala
index 98b564d..a0e7b64 100644
--- a/dvb-t/se-Pajala
+++ b/dvb-t/se-Pajala
@@ -1,6 +1,35 @@
# Sweden - Pajala
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE #Teracom_Mux_2
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE #Teracom_Mux_3
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE #Teracom_Mux_1
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE #Teracom_Mux_4
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Paulistom b/dvb-t/se-Paulistom
index e4abab5..3dd9b50 100644
--- a/dvb-t/se-Paulistom
+++ b/dvb-t/se-Paulistom
@@ -1,3 +1,13 @@
# Sweden - Paulistöm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Paulistrom b/dvb-t/se-Paulistrom
new file mode 100644
index 0000000..60f8253
--- /dev/null
+++ b/dvb-t/se-Paulistrom
@@ -0,0 +1,5 @@
+# Sweden - Pauliström
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Pilgrimstad b/dvb-t/se-Pilgrimstad
new file mode 100644
index 0000000..cbed291
--- /dev/null
+++ b/dvb-t/se-Pilgrimstad
@@ -0,0 +1,5 @@
+# Sweden - Pilgrimstad
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Porjus b/dvb-t/se-Porjus
new file mode 100644
index 0000000..720623d
--- /dev/null
+++ b/dvb-t/se-Porjus
@@ -0,0 +1,35 @@
+# Sweden - Porjus
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Puoltsa b/dvb-t/se-Puoltsa
new file mode 100644
index 0000000..4d3140b
--- /dev/null
+++ b/dvb-t/se-Puoltsa
@@ -0,0 +1,5 @@
+# Sweden - Puoltsa
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ragunda b/dvb-t/se-Ragunda
new file mode 100644
index 0000000..7bd1705
--- /dev/null
+++ b/dvb-t/se-Ragunda
@@ -0,0 +1,35 @@
+# Sweden - Ragunda
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ramsele_Skavasen b/dvb-t/se-Ramsele_Skavasen
new file mode 100644
index 0000000..fbd6e4a
--- /dev/null
+++ b/dvb-t/se-Ramsele_Skavasen
@@ -0,0 +1,35 @@
+# Sweden - Ramsele Skavåsen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ramsjo b/dvb-t/se-Ramsjo
new file mode 100644
index 0000000..8bb3ffe
--- /dev/null
+++ b/dvb-t/se-Ramsjo
@@ -0,0 +1,5 @@
+# Sweden - Ramsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ramundberget b/dvb-t/se-Ramundberget
new file mode 100644
index 0000000..0f8c169
--- /dev/null
+++ b/dvb-t/se-Ramundberget
@@ -0,0 +1,5 @@
+# Sweden - Ramundberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Randalen b/dvb-t/se-Randalen
new file mode 100644
index 0000000..c0f4230
--- /dev/null
+++ b/dvb-t/se-Randalen
@@ -0,0 +1,5 @@
+# Sweden - RÃ¥ndalen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Randijaure b/dvb-t/se-Randijaure
new file mode 100644
index 0000000..ccfa86b
--- /dev/null
+++ b/dvb-t/se-Randijaure
@@ -0,0 +1,5 @@
+# Sweden - Randijaure
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ransater b/dvb-t/se-Ransater
new file mode 100644
index 0000000..8615695
--- /dev/null
+++ b/dvb-t/se-Ransater
@@ -0,0 +1,5 @@
+# Sweden - Ransäter
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Rattvik b/dvb-t/se-Rattvik
index f8ffe5f..725bc8b 100644
--- a/dvb-t/se-Rattvik
+++ b/dvb-t/se-Rattvik
@@ -1,3 +1,6 @@
# Sweden - Rättvik
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Rengsjo b/dvb-t/se-Rengsjo
index 7bb743f..076c45d 100644
--- a/dvb-t/se-Rengsjo
+++ b/dvb-t/se-Rengsjo
@@ -1,3 +1,13 @@
# Sweden - Rengsjö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Renstrom b/dvb-t/se-Renstrom
new file mode 100644
index 0000000..f710ec3
--- /dev/null
+++ b/dvb-t/se-Renstrom
@@ -0,0 +1,5 @@
+# Sweden - Renström
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Resele b/dvb-t/se-Resele
new file mode 100644
index 0000000..b706c87
--- /dev/null
+++ b/dvb-t/se-Resele
@@ -0,0 +1,5 @@
+# Sweden - Resele
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Risback b/dvb-t/se-Risback
new file mode 100644
index 0000000..f27173e
--- /dev/null
+++ b/dvb-t/se-Risback
@@ -0,0 +1,5 @@
+# Sweden - Risbäck
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Rissna b/dvb-t/se-Rissna
new file mode 100644
index 0000000..29efffe
--- /dev/null
+++ b/dvb-t/se-Rissna
@@ -0,0 +1,5 @@
+# Sweden - Rissna
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ritsem b/dvb-t/se-Ritsem
new file mode 100644
index 0000000..4c98209
--- /dev/null
+++ b/dvb-t/se-Ritsem
@@ -0,0 +1,5 @@
+# Sweden - Ritsem
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Robertsfors b/dvb-t/se-Robertsfors
new file mode 100644
index 0000000..01f0cee
--- /dev/null
+++ b/dvb-t/se-Robertsfors
@@ -0,0 +1,5 @@
+# Sweden - Robertsfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Rojdafors b/dvb-t/se-Rojdafors
new file mode 100644
index 0000000..0119dbb
--- /dev/null
+++ b/dvb-t/se-Rojdafors
@@ -0,0 +1,5 @@
+# Sweden - Röjdåfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ronnang b/dvb-t/se-Ronnang
new file mode 100644
index 0000000..5e8607f
--- /dev/null
+++ b/dvb-t/se-Ronnang
@@ -0,0 +1,5 @@
+# Sweden - Rönnäng
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Rorbacksnas b/dvb-t/se-Rorbacksnas
index fb45ce7..24e081e 100644
--- a/dvb-t/se-Rorbacksnas
+++ b/dvb-t/se-Rorbacksnas
@@ -1,3 +1,13 @@
# Sweden - Rörbäcksnäs
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Rosson b/dvb-t/se-Rosson
new file mode 100644
index 0000000..6807bd3
--- /dev/null
+++ b/dvb-t/se-Rosson
@@ -0,0 +1,5 @@
+# Sweden - Rossön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Rusksele b/dvb-t/se-Rusksele
new file mode 100644
index 0000000..75d36e4
--- /dev/null
+++ b/dvb-t/se-Rusksele
@@ -0,0 +1,5 @@
+# Sweden - Rusksele
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sadvaluspen b/dvb-t/se-Sadvaluspen
new file mode 100644
index 0000000..6510a36
--- /dev/null
+++ b/dvb-t/se-Sadvaluspen
@@ -0,0 +1,5 @@
+# Sweden - Sädvaluspen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sagmyra b/dvb-t/se-Sagmyra
index f68169b..a9d67e8 100644
--- a/dvb-t/se-Sagmyra
+++ b/dvb-t/se-Sagmyra
@@ -1,3 +1,13 @@
# Sweden - SÃ¥gmyra
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Saivomuotka b/dvb-t/se-Saivomuotka
new file mode 100644
index 0000000..57b43a6
--- /dev/null
+++ b/dvb-t/se-Saivomuotka
@@ -0,0 +1,5 @@
+# Sweden - Saivomuotka
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Salen b/dvb-t/se-Salen
index 3785059..58bd5a6 100644
--- a/dvb-t/se-Salen
+++ b/dvb-t/se-Salen
@@ -1,3 +1,13 @@
# Sweden - Sälen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Salfjallet b/dvb-t/se-Salfjallet
index d271e62..aa161ac 100644
--- a/dvb-t/se-Salfjallet
+++ b/dvb-t/se-Salfjallet
@@ -1,3 +1,13 @@
# Sweden - Sälfjället
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Sarna_Mickeltemplet b/dvb-t/se-Sarna_Mickeltemplet
index 09f8809..1ae4e26 100644
--- a/dvb-t/se-Sarna_Mickeltemplet
+++ b/dvb-t/se-Sarna_Mickeltemplet
@@ -1,3 +1,13 @@
# Sweden - Särna/Mickeltemplet
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Satila b/dvb-t/se-Satila
index 6f8690f..90eff02 100644
--- a/dvb-t/se-Satila
+++ b/dvb-t/se-Satila
@@ -1,3 +1,13 @@
# Sweden - Sätila
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Savar_Sorbyn b/dvb-t/se-Savar_Sorbyn
new file mode 100644
index 0000000..4c924bd
--- /dev/null
+++ b/dvb-t/se-Savar_Sorbyn
@@ -0,0 +1,5 @@
+# Sweden - Sävar Sörbyn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Savast b/dvb-t/se-Savast
new file mode 100644
index 0000000..ea99007
--- /dev/null
+++ b/dvb-t/se-Savast
@@ -0,0 +1,5 @@
+# Sweden - Sävast
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Saxdalen b/dvb-t/se-Saxdalen
index 0c2db67..cf3f4ad 100644
--- a/dvb-t/se-Saxdalen
+++ b/dvb-t/se-Saxdalen
@@ -1,3 +1,13 @@
# Sweden - Saxdalen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Seitevaare b/dvb-t/se-Seitevaare
new file mode 100644
index 0000000..a02c831
--- /dev/null
+++ b/dvb-t/se-Seitevaare
@@ -0,0 +1,5 @@
+# Sweden - Seitevaare
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Selanger b/dvb-t/se-Selanger
new file mode 100644
index 0000000..8ea3e2a
--- /dev/null
+++ b/dvb-t/se-Selanger
@@ -0,0 +1,5 @@
+# Sweden - Selånger
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Seltjarn b/dvb-t/se-Seltjarn
new file mode 100644
index 0000000..3914c8d
--- /dev/null
+++ b/dvb-t/se-Seltjarn
@@ -0,0 +1,5 @@
+# Sweden - Seltjärn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sidensjo_Aberget b/dvb-t/se-Sidensjo_Aberget
new file mode 100644
index 0000000..1ae9b5b
--- /dev/null
+++ b/dvb-t/se-Sidensjo_Aberget
@@ -0,0 +1,5 @@
+# Sweden - Sidensjö Åberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Siljansnas_Uvberget b/dvb-t/se-Siljansnas_Uvberget
index a087eaf..7f35c51 100644
--- a/dvb-t/se-Siljansnas_Uvberget
+++ b/dvb-t/se-Siljansnas_Uvberget
@@ -1,3 +1,13 @@
# Sweden - Siljansnäs/Uvberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Simrishamn_Fabriksgatan b/dvb-t/se-Simrishamn_Fabriksgatan
new file mode 100644
index 0000000..e5583de
--- /dev/null
+++ b/dvb-t/se-Simrishamn_Fabriksgatan
@@ -0,0 +1,35 @@
+# Sweden - Simrishamn/Fabriksgatan
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Skalan b/dvb-t/se-Skalan
new file mode 100644
index 0000000..71362e5
--- /dev/null
+++ b/dvb-t/se-Skalan
@@ -0,0 +1,5 @@
+# Sweden - Skålan
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skalmsjo b/dvb-t/se-Skalmsjo
new file mode 100644
index 0000000..7f4bd42
--- /dev/null
+++ b/dvb-t/se-Skalmsjo
@@ -0,0 +1,5 @@
+# Sweden - Skalmsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skarstad b/dvb-t/se-Skarstad
index edc1aac..58a7499 100644
--- a/dvb-t/se-Skarstad
+++ b/dvb-t/se-Skarstad
@@ -1,3 +1,13 @@
# Sweden - Skärstad
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Skarvangen b/dvb-t/se-Skarvangen
new file mode 100644
index 0000000..ebe9594
--- /dev/null
+++ b/dvb-t/se-Skarvangen
@@ -0,0 +1,5 @@
+# Sweden - Skärvången
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skattungbyn b/dvb-t/se-Skattungbyn
index d5b0a23..3842b30 100644
--- a/dvb-t/se-Skattungbyn
+++ b/dvb-t/se-Skattungbyn
@@ -1,3 +1,13 @@
# Sweden - Skattungbyn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Skaulo_Pyhakielinen b/dvb-t/se-Skaulo_Pyhakielinen
new file mode 100644
index 0000000..fbfef7b
--- /dev/null
+++ b/dvb-t/se-Skaulo_Pyhakielinen
@@ -0,0 +1,5 @@
+# Sweden - Skaulo Pyhäkielinen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skelleftea b/dvb-t/se-Skelleftea
index d831d9e..6ab1400 100644
--- a/dvb-t/se-Skelleftea
+++ b/dvb-t/se-Skelleftea
@@ -1,7 +1,36 @@
# Sweden - Skellefteå
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Skene_Nycklarberget b/dvb-t/se-Skene_Nycklarberget
index 9070ae8..49347d3 100644
--- a/dvb-t/se-Skene_Nycklarberget
+++ b/dvb-t/se-Skene_Nycklarberget
@@ -1,3 +1,13 @@
# Sweden - Skene/Nycklarberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Skillingsfors b/dvb-t/se-Skillingsfors
new file mode 100644
index 0000000..c635db5
--- /dev/null
+++ b/dvb-t/se-Skillingsfors
@@ -0,0 +1,5 @@
+# Sweden - Skillingsfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skorped b/dvb-t/se-Skorped
new file mode 100644
index 0000000..694e3e3
--- /dev/null
+++ b/dvb-t/se-Skorped
@@ -0,0 +1,5 @@
+# Sweden - Skorped
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skottsund b/dvb-t/se-Skottsund
new file mode 100644
index 0000000..862c044
--- /dev/null
+++ b/dvb-t/se-Skottsund
@@ -0,0 +1,5 @@
+# Sweden - Skottsund
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skovde b/dvb-t/se-Skovde
index b79f179..4a5f8b2 100644
--- a/dvb-t/se-Skovde
+++ b/dvb-t/se-Skovde
@@ -1,7 +1,70 @@
# Sweden - Skövde
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skroven b/dvb-t/se-Skroven
new file mode 100644
index 0000000..98e24f0
--- /dev/null
+++ b/dvb-t/se-Skroven
@@ -0,0 +1,5 @@
+# Sweden - Skröven
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skymnas b/dvb-t/se-Skymnas
new file mode 100644
index 0000000..1658d63
--- /dev/null
+++ b/dvb-t/se-Skymnas
@@ -0,0 +1,5 @@
+# Sweden - Skymnäs
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Slussfors b/dvb-t/se-Slussfors
new file mode 100644
index 0000000..4a6a9b4
--- /dev/null
+++ b/dvb-t/se-Slussfors
@@ -0,0 +1,5 @@
+# Sweden - Slussfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Smedjebacken_Uvberget b/dvb-t/se-Smedjebacken_Uvberget
index abe5f66..01658df 100644
--- a/dvb-t/se-Smedjebacken_Uvberget
+++ b/dvb-t/se-Smedjebacken_Uvberget
@@ -1,6 +1,36 @@
# Sweden - Smedjebacken/Uvberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Soderhamn b/dvb-t/se-Soderhamn
index a7d6fef..6a85f0b 100644
--- a/dvb-t/se-Soderhamn
+++ b/dvb-t/se-Soderhamn
@@ -1,4 +1,36 @@
# Sweden - Söderhamn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Soderkoping b/dvb-t/se-Soderkoping
index 91ceddf..ce55cd4 100644
--- a/dvb-t/se-Soderkoping
+++ b/dvb-t/se-Soderkoping
@@ -1,4 +1,36 @@
# Sweden - Söderköping
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Sodertalje_Ragnhildsborg b/dvb-t/se-Sodertalje_Ragnhildsborg
index a643955..065434e 100644
--- a/dvb-t/se-Sodertalje_Ragnhildsborg
+++ b/dvb-t/se-Sodertalje_Ragnhildsborg
@@ -1,8 +1,36 @@
# Sweden - Södertälje/Ragnhildsborg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Solleftea_Hallsta b/dvb-t/se-Solleftea_Hallsta
index ed48f90..1279be4 100644
--- a/dvb-t/se-Solleftea_Hallsta
+++ b/dvb-t/se-Solleftea_Hallsta
@@ -1,6 +1,63 @@
# Sweden - Sollefteå/Hallsta
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Solleftea_Multra b/dvb-t/se-Solleftea_Multra
index 11ff0a3..8fb8ec3 100644
--- a/dvb-t/se-Solleftea_Multra
+++ b/dvb-t/se-Solleftea_Multra
@@ -1,6 +1,63 @@
# Sweden - Sollefteå/Multrå
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Soraker b/dvb-t/se-Soraker
new file mode 100644
index 0000000..9365215
--- /dev/null
+++ b/dvb-t/se-Soraker
@@ -0,0 +1,5 @@
+# Sweden - Söråker
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sorbygden b/dvb-t/se-Sorbygden
new file mode 100644
index 0000000..20e9d31
--- /dev/null
+++ b/dvb-t/se-Sorbygden
@@ -0,0 +1,5 @@
+# Sweden - Sörbygden
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sorflarke b/dvb-t/se-Sorflarke
new file mode 100644
index 0000000..2e779f4
--- /dev/null
+++ b/dvb-t/se-Sorflarke
@@ -0,0 +1,5 @@
+# Sweden - Sörflärke
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sorsele_Nalovardo b/dvb-t/se-Sorsele_Nalovardo
new file mode 100644
index 0000000..5f8cd7b
--- /dev/null
+++ b/dvb-t/se-Sorsele_Nalovardo
@@ -0,0 +1,5 @@
+# Sweden - Sorsele Nalovardo
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sorsele_Vattentornet b/dvb-t/se-Sorsele_Vattentornet
new file mode 100644
index 0000000..ba7e3c2
--- /dev/null
+++ b/dvb-t/se-Sorsele_Vattentornet
@@ -0,0 +1,5 @@
+# Sweden - Sorsele/Vattentornet
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sorsjon b/dvb-t/se-Sorsjon
index bead4db..84e99e8 100644
--- a/dvb-t/se-Sorsjon
+++ b/dvb-t/se-Sorsjon
@@ -1,3 +1,13 @@
# Sweden - Sörsjön
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Soukolojarvi b/dvb-t/se-Soukolojarvi
new file mode 100644
index 0000000..6d5e247
--- /dev/null
+++ b/dvb-t/se-Soukolojarvi
@@ -0,0 +1,5 @@
+# Sweden - Soukolojärvi
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stalon b/dvb-t/se-Stalon
new file mode 100644
index 0000000..ce88159
--- /dev/null
+++ b/dvb-t/se-Stalon
@@ -0,0 +1,5 @@
+# Sweden - Stalon
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stigsjo b/dvb-t/se-Stigsjo
new file mode 100644
index 0000000..137a59e
--- /dev/null
+++ b/dvb-t/se-Stigsjo
@@ -0,0 +1,5 @@
+# Sweden - Stigsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stockholm_Marieberg b/dvb-t/se-Stockholm_Marieberg
index 1b35b14..0ae30a2 100644
--- a/dvb-t/se-Stockholm_Marieberg
+++ b/dvb-t/se-Stockholm_Marieberg
@@ -1,7 +1,36 @@
# Sweden - Stockholm/Marieberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Stockholm_Nacka b/dvb-t/se-Stockholm_Nacka
index e13a95e..b534504 100644
--- a/dvb-t/se-Stockholm_Nacka
+++ b/dvb-t/se-Stockholm_Nacka
@@ -1,8 +1,71 @@
# Sweden - Stockholm/Nacka
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_1
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_2
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_3
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_4
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_5
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_6
+[Teracom_Mux_1]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Teracom_Mux_2]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Teracom_Mux_3]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Teracom_Mux_4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Teracom_Mux_5]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Stode_Hullsjon b/dvb-t/se-Stode_Hullsjon
new file mode 100644
index 0000000..e46bc80
--- /dev/null
+++ b/dvb-t/se-Stode_Hullsjon
@@ -0,0 +1,5 @@
+# Sweden - Stöde/Hullsjön
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stode_Intaget b/dvb-t/se-Stode_Intaget
new file mode 100644
index 0000000..deb3bab
--- /dev/null
+++ b/dvb-t/se-Stode_Intaget
@@ -0,0 +1,35 @@
+# Sweden - Stöde Intaget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stomne_Skasas b/dvb-t/se-Stomne_Skasas
new file mode 100644
index 0000000..7e293ba
--- /dev/null
+++ b/dvb-t/se-Stomne_Skasas
@@ -0,0 +1,5 @@
+# Sweden - Stömne/Skasås
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stora_Skedvi b/dvb-t/se-Stora_Skedvi
index 2bcd965..f00c793 100644
--- a/dvb-t/se-Stora_Skedvi
+++ b/dvb-t/se-Stora_Skedvi
@@ -1,3 +1,13 @@
# Sweden - Stora Skedvi
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Stordalen b/dvb-t/se-Stordalen
new file mode 100644
index 0000000..75656dd
--- /dev/null
+++ b/dvb-t/se-Stordalen
@@ -0,0 +1,5 @@
+# Sweden - Stordalen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Storfjaten b/dvb-t/se-Storfjaten
index 9c9a73b..93b898e 100644
--- a/dvb-t/se-Storfjaten
+++ b/dvb-t/se-Storfjaten
@@ -1,3 +1,13 @@
# Sweden - Storfjäten
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Storlien b/dvb-t/se-Storlien
new file mode 100644
index 0000000..10e2522
--- /dev/null
+++ b/dvb-t/se-Storlien
@@ -0,0 +1,5 @@
+# Sweden - Storlien
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Storuman b/dvb-t/se-Storuman
index 28092f0..9fe23fc 100644
--- a/dvb-t/se-Storuman
+++ b/dvb-t/se-Storuman
@@ -1,6 +1,36 @@
# Sweden - Storuman
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Stromstad b/dvb-t/se-Stromstad
index 27a2f75..f2609f6 100644
--- a/dvb-t/se-Stromstad
+++ b/dvb-t/se-Stromstad
@@ -1,7 +1,36 @@
# Sweden - Strömstad
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Stromsund_Grelsgard b/dvb-t/se-Stromsund_Grelsgard
new file mode 100644
index 0000000..a126552
--- /dev/null
+++ b/dvb-t/se-Stromsund_Grelsgard
@@ -0,0 +1,35 @@
+# Sweden - Strömsund/Grelsgård
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stugun b/dvb-t/se-Stugun
new file mode 100644
index 0000000..e4b6218
--- /dev/null
+++ b/dvb-t/se-Stugun
@@ -0,0 +1,5 @@
+# Sweden - Stugun
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Styrsjobo b/dvb-t/se-Styrsjobo
index 2970f41..1ccce04 100644
--- a/dvb-t/se-Styrsjobo
+++ b/dvb-t/se-Styrsjobo
@@ -1,3 +1,13 @@
# Sweden - Styrsjöbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Suddesjaur b/dvb-t/se-Suddesjaur
new file mode 100644
index 0000000..36a53dc
--- /dev/null
+++ b/dvb-t/se-Suddesjaur
@@ -0,0 +1,5 @@
+# Sweden - Suddesjaur
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Suijavaara b/dvb-t/se-Suijavaara
new file mode 100644
index 0000000..1f0371b
--- /dev/null
+++ b/dvb-t/se-Suijavaara
@@ -0,0 +1,5 @@
+# Sweden - Suijavaara
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sulvik b/dvb-t/se-Sulvik
new file mode 100644
index 0000000..d26f593
--- /dev/null
+++ b/dvb-t/se-Sulvik
@@ -0,0 +1,5 @@
+# Sweden - Sulvik
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sundborn b/dvb-t/se-Sundborn
index 182158b..b423757 100644
--- a/dvb-t/se-Sundborn
+++ b/dvb-t/se-Sundborn
@@ -1,3 +1,13 @@
# Sweden - Sundborn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Sundsbruk b/dvb-t/se-Sundsbruk
index 6680751..9c7a7fd 100644
--- a/dvb-t/se-Sundsbruk
+++ b/dvb-t/se-Sundsbruk
@@ -1,6 +1,36 @@
# Sweden - Sundsbruk
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Sundsvall_S_Stadsberget b/dvb-t/se-Sundsvall_S_Stadsberget
index 14a4a73..cf6bbdc 100644
--- a/dvb-t/se-Sundsvall_S_Stadsberget
+++ b/dvb-t/se-Sundsvall_S_Stadsberget
@@ -1,7 +1,36 @@
# Sweden - Sundsvall/S Stadsberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Sunne_As b/dvb-t/se-Sunne_As
new file mode 100644
index 0000000..c94500e
--- /dev/null
+++ b/dvb-t/se-Sunne_As
@@ -0,0 +1,5 @@
+# Sweden - Sunne/Ã…s
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sunne_Blabarskullen b/dvb-t/se-Sunne_Blabarskullen
index 02f8436..c0f29a9 100644
--- a/dvb-t/se-Sunne_Blabarskullen
+++ b/dvb-t/se-Sunne_Blabarskullen
@@ -1,6 +1,36 @@
# Sweden - Sunne/Blåbärskullen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Sunnemo b/dvb-t/se-Sunnemo
new file mode 100644
index 0000000..18beec2
--- /dev/null
+++ b/dvb-t/se-Sunnemo
@@ -0,0 +1,5 @@
+# Sweden - Sunnemo
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svaneholm b/dvb-t/se-Svaneholm
new file mode 100644
index 0000000..9b32d44
--- /dev/null
+++ b/dvb-t/se-Svaneholm
@@ -0,0 +1,5 @@
+# Sweden - Svaneholm
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svanstein b/dvb-t/se-Svanstein
new file mode 100644
index 0000000..97e1d3e
--- /dev/null
+++ b/dvb-t/se-Svanstein
@@ -0,0 +1,5 @@
+# Sweden - Svanstein
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svardsosund_Svardso b/dvb-t/se-Svardsosund_Svardso
new file mode 100644
index 0000000..233c10e
--- /dev/null
+++ b/dvb-t/se-Svardsosund_Svardso
@@ -0,0 +1,5 @@
+# Sweden - Svärdsösund/Svärdsö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svartnas b/dvb-t/se-Svartnas
index afcb44c..ac37690 100644
--- a/dvb-t/se-Svartnas
+++ b/dvb-t/se-Svartnas
@@ -1,3 +1,13 @@
# Sweden - Svartnäs
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Sveg_Brickan b/dvb-t/se-Sveg_Brickan
index ad2683b..b385b98 100644
--- a/dvb-t/se-Sveg_Brickan
+++ b/dvb-t/se-Sveg_Brickan
@@ -1,6 +1,36 @@
# Sweden - Sveg/Brickan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Sveg_Ransjo b/dvb-t/se-Sveg_Ransjo
new file mode 100644
index 0000000..fb503d9
--- /dev/null
+++ b/dvb-t/se-Sveg_Ransjo
@@ -0,0 +1,5 @@
+# Sweden - Sveg/Ransjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svenstavik b/dvb-t/se-Svenstavik
new file mode 100644
index 0000000..551e33f
--- /dev/null
+++ b/dvb-t/se-Svenstavik
@@ -0,0 +1,5 @@
+# Sweden - Svenstavik
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svinesund b/dvb-t/se-Svinesund
new file mode 100644
index 0000000..32c5098
--- /dev/null
+++ b/dvb-t/se-Svinesund
@@ -0,0 +1,5 @@
+# Sweden - Svinesund
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Syssleback b/dvb-t/se-Syssleback
new file mode 100644
index 0000000..b2be682
--- /dev/null
+++ b/dvb-t/se-Syssleback
@@ -0,0 +1,35 @@
+# Sweden - Sysslebäck
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Taberg b/dvb-t/se-Taberg
index 45a752a..7ee8530 100644
--- a/dvb-t/se-Taberg
+++ b/dvb-t/se-Taberg
@@ -1,3 +1,13 @@
# Sweden - Taberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Tandadalen b/dvb-t/se-Tandadalen
index 8468db5..e726d3a 100644
--- a/dvb-t/se-Tandadalen
+++ b/dvb-t/se-Tandadalen
@@ -1,3 +1,6 @@
# Sweden - Tandådalen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Tannas_Vastra b/dvb-t/se-Tannas_Vastra
new file mode 100644
index 0000000..9e1799c
--- /dev/null
+++ b/dvb-t/se-Tannas_Vastra
@@ -0,0 +1,5 @@
+# Sweden - Tännäs Västra
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tanndalen b/dvb-t/se-Tanndalen
new file mode 100644
index 0000000..ca4b668
--- /dev/null
+++ b/dvb-t/se-Tanndalen
@@ -0,0 +1,5 @@
+# Sweden - Tänndalen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tarnaby_Ryfjallet b/dvb-t/se-Tarnaby_Ryfjallet
new file mode 100644
index 0000000..62720a9
--- /dev/null
+++ b/dvb-t/se-Tarnaby_Ryfjallet
@@ -0,0 +1,35 @@
+# Sweden - Tärnaby Ryfjället
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tarnamo b/dvb-t/se-Tarnamo
new file mode 100644
index 0000000..0fd4e93
--- /dev/null
+++ b/dvb-t/se-Tarnamo
@@ -0,0 +1,5 @@
+# Sweden - Tärnamo
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tasjo b/dvb-t/se-Tasjo
index 5783f73..b195854 100644
--- a/dvb-t/se-Tasjo
+++ b/dvb-t/se-Tasjo
@@ -1,6 +1,36 @@
# Sweden - Tåsjö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Tavelsjo b/dvb-t/se-Tavelsjo
new file mode 100644
index 0000000..f300992
--- /dev/null
+++ b/dvb-t/se-Tavelsjo
@@ -0,0 +1,5 @@
+# Sweden - Tavelsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tocksfors b/dvb-t/se-Tocksfors
new file mode 100644
index 0000000..2c08794
--- /dev/null
+++ b/dvb-t/se-Tocksfors
@@ -0,0 +1,35 @@
+# Sweden - Töcksfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Tollsjo b/dvb-t/se-Tollsjo
index 97389e5..3f18527 100644
--- a/dvb-t/se-Tollsjo
+++ b/dvb-t/se-Tollsjo
@@ -1,3 +1,13 @@
# Sweden - Töllsjö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Tormestorp b/dvb-t/se-Tormestorp
new file mode 100644
index 0000000..d4bf449
--- /dev/null
+++ b/dvb-t/se-Tormestorp
@@ -0,0 +1,5 @@
+# Sweden - Tormestorp
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tornetrask b/dvb-t/se-Tornetrask
new file mode 100644
index 0000000..c97b3d6
--- /dev/null
+++ b/dvb-t/se-Tornetrask
@@ -0,0 +1,5 @@
+# Sweden - Torneträsk
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Torpshammar b/dvb-t/se-Torpshammar
new file mode 100644
index 0000000..2510268
--- /dev/null
+++ b/dvb-t/se-Torpshammar
@@ -0,0 +1,35 @@
+# Sweden - Torpshammar
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Torsby_Bada b/dvb-t/se-Torsby_Bada
index 72ef507..fc3e506 100644
--- a/dvb-t/se-Torsby_Bada
+++ b/dvb-t/se-Torsby_Bada
@@ -1,6 +1,36 @@
# Sweden - Torsby/Bada
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Tranas_Bredkarr b/dvb-t/se-Tranas_Bredkarr
index bf32792..7e88588 100644
--- a/dvb-t/se-Tranas_Bredkarr
+++ b/dvb-t/se-Tranas_Bredkarr
@@ -1,4 +1,35 @@
# Sweden - Tranås/Bredkärr
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Tranemo b/dvb-t/se-Tranemo
index d3bebfd..eca9304 100644
--- a/dvb-t/se-Tranemo
+++ b/dvb-t/se-Tranemo
@@ -1,3 +1,13 @@
# Sweden - Tranemo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Transtrand_Bolheden b/dvb-t/se-Transtrand_Bolheden
index 9682a69..2d140a9 100644
--- a/dvb-t/se-Transtrand_Bolheden
+++ b/dvb-t/se-Transtrand_Bolheden
@@ -1,4 +1,36 @@
# Sweden - Transtrand/Bolheden
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Traryd_Betas b/dvb-t/se-Traryd_Betas
index 72bb264..6a7bcdf 100644
--- a/dvb-t/se-Traryd_Betas
+++ b/dvb-t/se-Traryd_Betas
@@ -1,4 +1,36 @@
# Sweden - Traryd/Betås
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Trehorningsjo b/dvb-t/se-Trehorningsjo
new file mode 100644
index 0000000..e14d48d
--- /dev/null
+++ b/dvb-t/se-Trehorningsjo
@@ -0,0 +1,5 @@
+# Sweden - Trehörningsjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Trelleborg_Gylle b/dvb-t/se-Trelleborg_Gylle
new file mode 100644
index 0000000..d127f66
--- /dev/null
+++ b/dvb-t/se-Trelleborg_Gylle
@@ -0,0 +1,35 @@
+# Sweden - Trelleborg/Gylle
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Trollhattan b/dvb-t/se-Trollhattan
index 790963e..72ca060 100644
--- a/dvb-t/se-Trollhattan
+++ b/dvb-t/se-Trollhattan
@@ -1,7 +1,36 @@
# Sweden - Trollhättan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Trosa b/dvb-t/se-Trosa
index 6b11b6a..2d6b963 100644
--- a/dvb-t/se-Trosa
+++ b/dvb-t/se-Trosa
@@ -1,4 +1,25 @@
# Sweden - Trosa
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Tullinge_Hamra b/dvb-t/se-Tullinge_Hamra
new file mode 100644
index 0000000..b1b15aa
--- /dev/null
+++ b/dvb-t/se-Tullinge_Hamra
@@ -0,0 +1,35 @@
+# Sweden - Tullinge/Hamra
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tyringe b/dvb-t/se-Tyringe
new file mode 100644
index 0000000..1222e5c
--- /dev/null
+++ b/dvb-t/se-Tyringe
@@ -0,0 +1,5 @@
+# Sweden - Tyringe
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tystberga b/dvb-t/se-Tystberga
index 3179648..ef240a3 100644
--- a/dvb-t/se-Tystberga
+++ b/dvb-t/se-Tystberga
@@ -1,3 +1,6 @@
# Sweden - Tystberga
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Uddevalla_Herrestad b/dvb-t/se-Uddevalla_Herrestad
index aae5e17..bc1992b 100644
--- a/dvb-t/se-Uddevalla_Herrestad
+++ b/dvb-t/se-Uddevalla_Herrestad
@@ -1,7 +1,36 @@
# Sweden - Uddevalla/Herrestad
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Uddevalla_Kapelle b/dvb-t/se-Uddevalla_Kapelle
new file mode 100644
index 0000000..7a2668e
--- /dev/null
+++ b/dvb-t/se-Uddevalla_Kapelle
@@ -0,0 +1,5 @@
+# Sweden - Uddevalla/Kapelle
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Uggleheden b/dvb-t/se-Uggleheden
new file mode 100644
index 0000000..afbfc68
--- /dev/null
+++ b/dvb-t/se-Uggleheden
@@ -0,0 +1,5 @@
+# Sweden - Uggleheden
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ullanger_Skidsta b/dvb-t/se-Ullanger_Skidsta
new file mode 100644
index 0000000..8f5a54f
--- /dev/null
+++ b/dvb-t/se-Ullanger_Skidsta
@@ -0,0 +1,5 @@
+# Sweden - Ullånger Skidsta
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ullared b/dvb-t/se-Ullared
index 7f5956c..29d4a02 100644
--- a/dvb-t/se-Ullared
+++ b/dvb-t/se-Ullared
@@ -1,3 +1,13 @@
# Sweden - Ullared
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Ulricehamn b/dvb-t/se-Ulricehamn
index 06413e9..759c62f 100644
--- a/dvb-t/se-Ulricehamn
+++ b/dvb-t/se-Ulricehamn
@@ -1,4 +1,36 @@
# Sweden - Ulricehamn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Ulvohamn b/dvb-t/se-Ulvohamn
new file mode 100644
index 0000000..57ae731
--- /dev/null
+++ b/dvb-t/se-Ulvohamn
@@ -0,0 +1,5 @@
+# Sweden - Ulvöhamn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ulvshyttan_Porjus b/dvb-t/se-Ulvshyttan_Porjus
index f69dbfd..08f0234 100644
--- a/dvb-t/se-Ulvshyttan_Porjus
+++ b/dvb-t/se-Ulvshyttan_Porjus
@@ -1,3 +1,13 @@
# Sweden - Ulvshyttan/Porjus
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Umea_Mariehem b/dvb-t/se-Umea_Mariehem
new file mode 100644
index 0000000..70f7360
--- /dev/null
+++ b/dvb-t/se-Umea_Mariehem
@@ -0,0 +1,5 @@
+# Sweden - Umeå/Mariehem
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Umfors b/dvb-t/se-Umfors
new file mode 100644
index 0000000..51a1e49
--- /dev/null
+++ b/dvb-t/se-Umfors
@@ -0,0 +1,5 @@
+# Sweden - Umfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Umgransele_Granselelund b/dvb-t/se-Umgransele_Granselelund
new file mode 100644
index 0000000..8fef12a
--- /dev/null
+++ b/dvb-t/se-Umgransele_Granselelund
@@ -0,0 +1,5 @@
+# Sweden - Umgransele/Granselelund
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Undersaker b/dvb-t/se-Undersaker
new file mode 100644
index 0000000..95e816e
--- /dev/null
+++ b/dvb-t/se-Undersaker
@@ -0,0 +1,5 @@
+# Sweden - Undersåker
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Uppsala_Rickomberga b/dvb-t/se-Uppsala_Rickomberga
index a771e5d..2c0ac8f 100644
--- a/dvb-t/se-Uppsala_Rickomberga
+++ b/dvb-t/se-Uppsala_Rickomberga
@@ -1,3 +1,13 @@
# Sweden - Uppsala/Rickomberga
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Uppsala_Vedyxa b/dvb-t/se-Uppsala_Vedyxa
index 6bd4db8..55f99a8 100644
--- a/dvb-t/se-Uppsala_Vedyxa
+++ b/dvb-t/se-Uppsala_Vedyxa
@@ -1,7 +1,36 @@
# Sweden - Uppsala/Vedyxa
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Utansjo b/dvb-t/se-Utansjo
new file mode 100644
index 0000000..9504400
--- /dev/null
+++ b/dvb-t/se-Utansjo
@@ -0,0 +1,5 @@
+# Sweden - Utansjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Utanskog b/dvb-t/se-Utanskog
new file mode 100644
index 0000000..799d850
--- /dev/null
+++ b/dvb-t/se-Utanskog
@@ -0,0 +1,5 @@
+# Sweden - Utanskog
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vaddo_Elmsta b/dvb-t/se-Vaddo_Elmsta
index aabc9d6..310a1da 100644
--- a/dvb-t/se-Vaddo_Elmsta
+++ b/dvb-t/se-Vaddo_Elmsta
@@ -1,4 +1,36 @@
# Sweden - Väddö/Elmsta
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 184500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Valadalen b/dvb-t/se-Valadalen
new file mode 100644
index 0000000..9aeed88
--- /dev/null
+++ b/dvb-t/se-Valadalen
@@ -0,0 +1,5 @@
+# Sweden - Vålådalen
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Valanger b/dvb-t/se-Valanger
new file mode 100644
index 0000000..64e33f1
--- /dev/null
+++ b/dvb-t/se-Valanger
@@ -0,0 +1,5 @@
+# Sweden - Vålånger
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Valdemarsvik b/dvb-t/se-Valdemarsvik
index 20b8a8e..0d7c740 100644
--- a/dvb-t/se-Valdemarsvik
+++ b/dvb-t/se-Valdemarsvik
@@ -1,4 +1,36 @@
# Sweden - Valdemarsvik
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 177500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Valsjobyn b/dvb-t/se-Valsjobyn
new file mode 100644
index 0000000..dc158b9
--- /dev/null
+++ b/dvb-t/se-Valsjobyn
@@ -0,0 +1,5 @@
+# Sweden - Valsjöbyn
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vannas_Granlundsberget b/dvb-t/se-Vannas_Granlundsberget
index 2ef81d1..53e7df0 100644
--- a/dvb-t/se-Vannas_Granlundsberget
+++ b/dvb-t/se-Vannas_Granlundsberget
@@ -1,6 +1,36 @@
# Sweden - Vännäs/Granlundsberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Vansbro_Hummelberget b/dvb-t/se-Vansbro_Hummelberget
index 1280490..0b4263d 100644
--- a/dvb-t/se-Vansbro_Hummelberget
+++ b/dvb-t/se-Vansbro_Hummelberget
@@ -1,3 +1,13 @@
# Sweden - Vansbro/Hummelberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Varberg_Grimeton b/dvb-t/se-Varberg_Grimeton
index abfdd54..6c85acd 100644
--- a/dvb-t/se-Varberg_Grimeton
+++ b/dvb-t/se-Varberg_Grimeton
@@ -1,6 +1,63 @@
# Sweden - Varberg/Grimeton
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 191500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Varmvattnet b/dvb-t/se-Varmvattnet
new file mode 100644
index 0000000..9e56091
--- /dev/null
+++ b/dvb-t/se-Varmvattnet
@@ -0,0 +1,5 @@
+# Sweden - Varmvattnet
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Varnamo_Alandsryd b/dvb-t/se-Varnamo_Alandsryd
new file mode 100644
index 0000000..f9f6414
--- /dev/null
+++ b/dvb-t/se-Varnamo_Alandsryd
@@ -0,0 +1,5 @@
+# Sweden - Värnamo/Alandsryd -
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vassbotten b/dvb-t/se-Vassbotten
new file mode 100644
index 0000000..5aac5e9
--- /dev/null
+++ b/dvb-t/se-Vassbotten
@@ -0,0 +1,5 @@
+# Sweden - Vassbotten
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vassijaure b/dvb-t/se-Vassijaure
new file mode 100644
index 0000000..8d6ebf7
--- /dev/null
+++ b/dvb-t/se-Vassijaure
@@ -0,0 +1,5 @@
+# Sweden - Vassijaure
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vastansjo b/dvb-t/se-Vastansjo
new file mode 100644
index 0000000..dafa88f
--- /dev/null
+++ b/dvb-t/se-Vastansjo
@@ -0,0 +1,5 @@
+# Sweden - Västansjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vasteras_Lillharad b/dvb-t/se-Vasteras_Lillharad
index 976bff7..0c50190 100644
--- a/dvb-t/se-Vasteras_Lillharad
+++ b/dvb-t/se-Vasteras_Lillharad
@@ -1,7 +1,82 @@
# Sweden - Västerås/Lillhärad
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vastervik_Farhult b/dvb-t/se-Vastervik_Farhult
index b57a9d3..6b17d38 100644
--- a/dvb-t/se-Vastervik_Farhult
+++ b/dvb-t/se-Vastervik_Farhult
@@ -1,6 +1,36 @@
# Sweden - Västervik/Fårhult
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/se-Vato b/dvb-t/se-Vato
new file mode 100644
index 0000000..94721d0
--- /dev/null
+++ b/dvb-t/se-Vato
@@ -0,0 +1,5 @@
+# Sweden - Vätö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vaxbo b/dvb-t/se-Vaxbo
index 4214412..116483f 100644
--- a/dvb-t/se-Vaxbo
+++ b/dvb-t/se-Vaxbo
@@ -1,3 +1,13 @@
# Sweden - Växbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Vemdalsskalet b/dvb-t/se-Vemdalsskalet
new file mode 100644
index 0000000..2447887
--- /dev/null
+++ b/dvb-t/se-Vemdalsskalet
@@ -0,0 +1,5 @@
+# Sweden - Vemdalsskalet
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vessigebro b/dvb-t/se-Vessigebro
index 56a7e16..2cd921e 100644
--- a/dvb-t/se-Vessigebro
+++ b/dvb-t/se-Vessigebro
@@ -1,3 +1,13 @@
# Sweden - Vessigebro
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Vetlanda_Nye b/dvb-t/se-Vetlanda_Nye
index 540e225..7cd1f5c 100644
--- a/dvb-t/se-Vetlanda_Nye
+++ b/dvb-t/se-Vetlanda_Nye
@@ -1,3 +1,13 @@
# Sweden - Vetlanda/Nye
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Vidsel b/dvb-t/se-Vidsel
new file mode 100644
index 0000000..0351783
--- /dev/null
+++ b/dvb-t/se-Vidsel
@@ -0,0 +1,5 @@
+# Sweden - Vidsel
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vietas b/dvb-t/se-Vietas
new file mode 100644
index 0000000..668657b
--- /dev/null
+++ b/dvb-t/se-Vietas
@@ -0,0 +1,5 @@
+# Sweden - Vietas
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vikmanshyttan b/dvb-t/se-Vikmanshyttan
index 1def8f3..6b24d6e 100644
--- a/dvb-t/se-Vikmanshyttan
+++ b/dvb-t/se-Vikmanshyttan
@@ -1,3 +1,13 @@
# Sweden - Vikmanshyttan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Viksjo b/dvb-t/se-Viksjo
new file mode 100644
index 0000000..d004252
--- /dev/null
+++ b/dvb-t/se-Viksjo
@@ -0,0 +1,5 @@
+# Sweden - Viksjö
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vilhelmina b/dvb-t/se-Vilhelmina
new file mode 100644
index 0000000..1adb2a0
--- /dev/null
+++ b/dvb-t/se-Vilhelmina
@@ -0,0 +1,35 @@
+# Sweden - Vilhelmina
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Villands_Vanga b/dvb-t/se-Villands_Vanga
new file mode 100644
index 0000000..431ec0c
--- /dev/null
+++ b/dvb-t/se-Villands_Vanga
@@ -0,0 +1,5 @@
+# Sweden - Villands VÃ¥nga
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vindelgransele b/dvb-t/se-Vindelgransele
new file mode 100644
index 0000000..d31e682
--- /dev/null
+++ b/dvb-t/se-Vindelgransele
@@ -0,0 +1,5 @@
+# Sweden - Vindelgransele
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vindeln_Renfors b/dvb-t/se-Vindeln_Renfors
new file mode 100644
index 0000000..d34c836
--- /dev/null
+++ b/dvb-t/se-Vindeln_Renfors
@@ -0,0 +1,35 @@
+# Sweden - Vindeln/Renfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Virserum b/dvb-t/se-Virserum
index 601a573..32c79bc 100644
--- a/dvb-t/se-Virserum
+++ b/dvb-t/se-Virserum
@@ -1,6 +1,63 @@
# Sweden - Virserum
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Visby_Follingbo b/dvb-t/se-Visby_Follingbo
index f5ec59d..33b14fa 100644
--- a/dvb-t/se-Visby_Follingbo
+++ b/dvb-t/se-Visby_Follingbo
@@ -1,7 +1,36 @@
# Sweden - Visby/Follingbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Visby_Hamnen b/dvb-t/se-Visby_Hamnen
index 374bcb4..1c839f1 100644
--- a/dvb-t/se-Visby_Hamnen
+++ b/dvb-t/se-Visby_Hamnen
@@ -1,7 +1,65 @@
# Sweden - Visby/Hamnen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Visby_Havdhem b/dvb-t/se-Visby_Havdhem
new file mode 100644
index 0000000..c376217
--- /dev/null
+++ b/dvb-t/se-Visby_Havdhem
@@ -0,0 +1,35 @@
+# Sweden - Visby/Havdhem
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 205500000
+ BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Visingso b/dvb-t/se-Visingso
index 6be33bd..0dcc4f4 100644
--- a/dvb-t/se-Visingso
+++ b/dvb-t/se-Visingso
@@ -1,3 +1,13 @@
# Sweden - Visingsö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Vislanda_Nydala b/dvb-t/se-Vislanda_Nydala
index 5611323..1aaf3ef 100644
--- a/dvb-t/se-Vislanda_Nydala
+++ b/dvb-t/se-Vislanda_Nydala
@@ -1,6 +1,36 @@
# Sweden - Vislanda/Nydala
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 198500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Vitberget b/dvb-t/se-Vitberget
new file mode 100644
index 0000000..7053f5a
--- /dev/null
+++ b/dvb-t/se-Vitberget
@@ -0,0 +1,5 @@
+# Sweden - Vitberget
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vitsand b/dvb-t/se-Vitsand
new file mode 100644
index 0000000..a1b4dc9
--- /dev/null
+++ b/dvb-t/se-Vitsand
@@ -0,0 +1,5 @@
+# Sweden - Vitsand
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vitsand_Vagsjofors b/dvb-t/se-Vitsand_Vagsjofors
new file mode 100644
index 0000000..c07c012
--- /dev/null
+++ b/dvb-t/se-Vitsand_Vagsjofors
@@ -0,0 +1,5 @@
+# Sweden - Vitsand/Vägsjöfors
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Voxna b/dvb-t/se-Voxna
index 8a37481..a14cba7 100644
--- a/dvb-t/se-Voxna
+++ b/dvb-t/se-Voxna
@@ -1,3 +1,13 @@
# Sweden - Voxna
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Vuollerim b/dvb-t/se-Vuollerim
new file mode 100644
index 0000000..a034ca8
--- /dev/null
+++ b/dvb-t/se-Vuollerim
@@ -0,0 +1,35 @@
+# Sweden - Vuollerim
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ystad_Metallgatan b/dvb-t/se-Ystad_Metallgatan
index c93c995..5c250b5 100644
--- a/dvb-t/se-Ystad_Metallgatan
+++ b/dvb-t/se-Ystad_Metallgatan
@@ -1,7 +1,36 @@
# Sweden - Ystad/Metallgatan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 212500000
+ BANDWIDTH_HZ = 7000000
+
diff --git a/dvb-t/se-Yttermalung b/dvb-t/se-Yttermalung
index 5262080..7473b30 100644
--- a/dvb-t/se-Yttermalung
+++ b/dvb-t/se-Yttermalung
@@ -1,3 +1,13 @@
# Sweden - Yttermalung
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/si-Ljubljana b/dvb-t/si-Ljubljana
index 3825669..e1d3e8b 100644
--- a/dvb-t/si-Ljubljana
+++ b/dvb-t/si-Ljubljana
@@ -1,5 +1,27 @@
# Slovenia / Ljubljana
# MULTIPLEX A
#------------------------------------------
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-BanskaBystrica b/dvb-t/sk-BanskaBystrica
index 1f8b0de..340164a 100644
--- a/dvb-t/sk-BanskaBystrica
+++ b/dvb-t/sk-BanskaBystrica
@@ -1,9 +1,30 @@
# DVB-T Banska Bystrica (Banska Bystrica, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 51
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 33
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-BanskaStiavnica b/dvb-t/sk-BanskaStiavnica
index c70c048..0afc471 100644
--- a/dvb-t/sk-BanskaStiavnica
+++ b/dvb-t/sk-BanskaStiavnica
@@ -1,9 +1,30 @@
# DVB-T Banska Stiavnica (Banska Stiavnica, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 21
-T 306000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 306000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 48
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Bardejov b/dvb-t/sk-Bardejov
index e8b6bf0..a481bdf 100644
--- a/dvb-t/sk-Bardejov
+++ b/dvb-t/sk-Bardejov
@@ -1,9 +1,30 @@
# DVB-T Bardejov (Bardejov, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 40
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 54
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Bratislava b/dvb-t/sk-Bratislava
index ded67d0..cd46162 100644
--- a/dvb-t/sk-Bratislava
+++ b/dvb-t/sk-Bratislava
@@ -1,16 +1,48 @@
# DVB-T Bratislava (Bratislava, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 56
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 27
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
#
# T- Video Agency
# (TODO: http://www.zive.sk/bratislava-sa-dockala-novych-programov-v-dvb-t-divaci-si-naladia-uz-aj-ta3/sc-4-a-298830/default.aspx)
#
# regional multiplex - on channel 55
-T 746000000 8MHz 2/1 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Cadca b/dvb-t/sk-Cadca
index 14481bb..abd0e5b 100644
--- a/dvb-t/sk-Cadca
+++ b/dvb-t/sk-Cadca
@@ -1,9 +1,30 @@
# DVB-T Cadca (Cadca, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 32
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Detva b/dvb-t/sk-Detva
index 83824e7..44cf2a6 100644
--- a/dvb-t/sk-Detva
+++ b/dvb-t/sk-Detva
@@ -1,9 +1,30 @@
# DVB-T Detva (Detva, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 60
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 33
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Hnusta b/dvb-t/sk-Hnusta
index b716e92..d0b41ee 100644
--- a/dvb-t/sk-Hnusta
+++ b/dvb-t/sk-Hnusta
@@ -1,9 +1,30 @@
# DVB-T Hnusta (Hnusta, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 27
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 54
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Kosice b/dvb-t/sk-Kosice
index b9a39c9..7c01b81 100644
--- a/dvb-t/sk-Kosice
+++ b/dvb-t/sk-Kosice
@@ -1,9 +1,30 @@
# DVB-T Kosice (Kosice, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-KralovskyChlmec b/dvb-t/sk-KralovskyChlmec
index 3a9b136..7163e83 100644
--- a/dvb-t/sk-KralovskyChlmec
+++ b/dvb-t/sk-KralovskyChlmec
@@ -1,9 +1,30 @@
# DVB-T Kralovsky Chlmec (Kralovsky Chlmec, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Krompachy b/dvb-t/sk-Krompachy
index b36fb7a..27747cd 100644
--- a/dvb-t/sk-Krompachy
+++ b/dvb-t/sk-Krompachy
@@ -1,9 +1,30 @@
# DVB-T Krompachy (Krompachy, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Lucenec b/dvb-t/sk-Lucenec
index e4d8f93..1225eac 100644
--- a/dvb-t/sk-Lucenec
+++ b/dvb-t/sk-Lucenec
@@ -1,9 +1,30 @@
# DVB-T Lucenec (Lucenec, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 60
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 33
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Medzev b/dvb-t/sk-Medzev
index 6d29a4b..52e19bb 100644
--- a/dvb-t/sk-Medzev
+++ b/dvb-t/sk-Medzev
@@ -1,9 +1,30 @@
# DVB-T Medzev (Medzev, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Namestovo b/dvb-t/sk-Namestovo
index 94d10a3..ea76c10 100644
--- a/dvb-t/sk-Namestovo
+++ b/dvb-t/sk-Namestovo
@@ -1,9 +1,30 @@
# DVB-T Namestovo (Namestovo, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 26
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Nitra b/dvb-t/sk-Nitra
index 9a2290c..a823427 100644
--- a/dvb-t/sk-Nitra
+++ b/dvb-t/sk-Nitra
@@ -1,9 +1,30 @@
# DVB-T Nitra (Nitra, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 21
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 48
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Poprad b/dvb-t/sk-Poprad
index 8096538..ccec350 100644
--- a/dvb-t/sk-Poprad
+++ b/dvb-t/sk-Poprad
@@ -1,10 +1,42 @@
# DVB-T Poprad (Poprad, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 55
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 24/54
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-PovazskaBystrica b/dvb-t/sk-PovazskaBystrica
index 330120c..d32759e 100644
--- a/dvb-t/sk-PovazskaBystrica
+++ b/dvb-t/sk-PovazskaBystrica
@@ -1,9 +1,30 @@
# DVB-T Povazska Bystrica (Povazska Bystrica, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 32
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Presov b/dvb-t/sk-Presov
index 6516cea..0f0a36e 100644
--- a/dvb-t/sk-Presov
+++ b/dvb-t/sk-Presov
@@ -1,9 +1,30 @@
# DVB-T Prešov (Prešov, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# MUX2 - Commercial - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# MUX3 - Public - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Prievidza b/dvb-t/sk-Prievidza
index 2b6e25f..dafbc1e 100644
--- a/dvb-t/sk-Prievidza
+++ b/dvb-t/sk-Prievidza
@@ -1,9 +1,30 @@
# DVB-T Prievidza (Prievidza, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 57
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Revuca b/dvb-t/sk-Revuca
index 75f671b..4f797ce 100644
--- a/dvb-t/sk-Revuca
+++ b/dvb-t/sk-Revuca
@@ -1,9 +1,30 @@
# DVB-T Revuca (Revuca, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 27
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 54
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Roznava b/dvb-t/sk-Roznava
index 01ccc41..fc09aaa 100644
--- a/dvb-t/sk-Roznava
+++ b/dvb-t/sk-Roznava
@@ -1,9 +1,30 @@
# DVB-T Roznava (Roznava, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 27
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 54
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Ruzomberok b/dvb-t/sk-Ruzomberok
index bd7847e..fc2c668 100644
--- a/dvb-t/sk-Ruzomberok
+++ b/dvb-t/sk-Ruzomberok
@@ -1,9 +1,30 @@
# DVB-T Ruzomberok (Ruzomberok, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 26
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Snina b/dvb-t/sk-Snina
index 52c1e2c..f0f1585 100644
--- a/dvb-t/sk-Snina
+++ b/dvb-t/sk-Snina
@@ -1,9 +1,30 @@
# DVB-T Snina (Snina, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-StaraLubovna b/dvb-t/sk-StaraLubovna
index 4738b85..b1cf740 100644
--- a/dvb-t/sk-StaraLubovna
+++ b/dvb-t/sk-StaraLubovna
@@ -1,9 +1,30 @@
# DVB-T Stara Lubovna (Stara Lubovna, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 55
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 24
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Sturovo b/dvb-t/sk-Sturovo
index 41b6486..f54f8df 100644
--- a/dvb-t/sk-Sturovo
+++ b/dvb-t/sk-Sturovo
@@ -1,9 +1,30 @@
# DVB-T Sturovo (Sturovo, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 21
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 48
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Trencin b/dvb-t/sk-Trencin
index 743a99a..805038c 100644
--- a/dvb-t/sk-Trencin
+++ b/dvb-t/sk-Trencin
@@ -1,9 +1,30 @@
# DVB-T Trencin (Trencin, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 57
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/sk-Zilina b/dvb-t/sk-Zilina
index 8e9ba16..e8d486d 100644
--- a/dvb-t/sk-Zilina
+++ b/dvb-t/sk-Zilina
@@ -1,9 +1,30 @@
# DVB-T Zilina (Zilina, Slovak Republic)
# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# 2.st multiplex (commercial) - on channel 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
# 3.st multiplex (public) - on channel 32
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/tw-All b/dvb-t/tw-All
index 8290355..3e18167 100644
--- a/dvb-t/tw-All
+++ b/dvb-t/tw-All
@@ -1,11 +1,132 @@
-T 533000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 539000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 545000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 551000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 557000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 563000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 569000000 6MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 575000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 581000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 587000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 593000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 533000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 539000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 545000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 551000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 557000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 563000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 569000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 575000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 581000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 587000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 593000000
+ BANDWIDTH_HZ = 6000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ua-Kharkov b/dvb-t/ua-Kharkov
index c206c90..38c6b07 100644
--- a/dvb-t/ua-Kharkov
+++ b/dvb-t/ua-Kharkov
@@ -1,6 +1,49 @@
# Ukraine, Kharkov
-# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
-T2 554000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 586000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 690000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 770000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ua-Kiev b/dvb-t/ua-Kiev
deleted file mode 100644
index 6db2d56..0000000
--- a/dvb-t/ua-Kiev
+++ /dev/null
@@ -1,6 +0,0 @@
-# Ukraine, Kiev
-# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
-T2 526000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 538000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 554000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 698000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
diff --git a/dvb-t/ua-Kyiv b/dvb-t/ua-Kyiv
new file mode 100644
index 0000000..52dd12b
--- /dev/null
+++ b/dvb-t/ua-Kyiv
@@ -0,0 +1,62 @@
+# Ukraine, Kyiv
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_LP = NONE
+ HIERARCHY = NONE
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_LP = NONE
+ HIERARCHY = NONE
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
diff --git a/dvb-t/ua-Lozovaya b/dvb-t/ua-Lozovaya
index a0bfc09..be7d9b9 100644
--- a/dvb-t/ua-Lozovaya
+++ b/dvb-t/ua-Lozovaya
@@ -1,6 +1,49 @@
# Ukraine, Lozovaya
-# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
-T2 554000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 746000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 754000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 778000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ua-Odessa b/dvb-t/ua-Odessa
index 2420279..16f00fa 100644
--- a/dvb-t/ua-Odessa
+++ b/dvb-t/ua-Odessa
@@ -1,6 +1,49 @@
# Ukraine, Odessa
-# std freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy plp_id
-T2 490000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 562000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 618000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
-T2 650000000 8MHz 3/5 NONE QAM256 32k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/ua-Shostka b/dvb-t/ua-Shostka
new file mode 100644
index 0000000..696a428
--- /dev/null
+++ b/dvb-t/ua-Shostka
@@ -0,0 +1,55 @@
+# Ukraine, Shostka
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_LP = NONE
+ HIERARCHY = NONE
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = AUTO
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/AUTO
+ TRANSMISSION_MODE = AUTO
+ GUARD_INTERVAL = AUTO
+ HIERARCHY = NONE
+ INVERSION = AUTO
diff --git a/dvb-t/ug-All b/dvb-t/ug-All
index 813f859..2d29959 100644
--- a/dvb-t/ug-All
+++ b/dvb-t/ug-All
@@ -1,16 +1,55 @@
-#------------------------------------------------------------------------------
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20130331 1 0 TERRESTRIAL UG </w_scan>
-#------------------------------------------------------------------------------
# location and provider : Kampala-Uganda
-# date : 2013-11-01
+# date : 2016-10-07
# provided by : Joseph Zikusooka
# : http://joseph.zikusooka.com
-# : joseph@zikusooka.com
+# : josephzik@gmail.com
#
-# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
#------------------------------------------------------------------------------
-T 474000000 8MHz 2/3 NONE QPSK 8k 1/4 NONE # UCC Primary
-T2 1 1 538000000 8MHz AUTO AUTO AUTO 32k 1/16 AUTO
-T2 9 1 586000000 8MHz AUTO AUTO AUTO 32k 1/16 AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 1/2
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
diff --git a/dvb-t/uk-Aberdare b/dvb-t/uk-Aberdare
index 0a3bad0..a0c08b0 100644
--- a/dvb-t/uk-Aberdare
+++ b/dvb-t/uk-Aberdare
@@ -5,11 +5,77 @@
# location and provider: UK, Aberdare
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 497833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24- BBC A
-T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C21+ D3&4
-T 506167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25+ SDN
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22+ ARQ A
-T 530167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28+ ARQ B
-T2 521833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C27- BBC B HD
+[C24- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 497833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22+ ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27- BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 521833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Angus b/dvb-t/uk-Angus
index 5e8be9f..1127e36 100644
--- a/dvb-t/uk-Angus
+++ b/dvb-t/uk-Angus
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/DD4 0RQ/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Angus
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C60- BBC A
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C53 D3&4
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C54 SDN
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C58 ARQ A
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C49 ARQ B
-T2 762000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C57 BBC B HD
+[C60- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C54 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-BeaconHill b/dvb-t/uk-BeaconHill
index 06ea19c..549b3c9 100644
--- a/dvb-t/uk-BeaconHill
+++ b/dvb-t/uk-BeaconHill
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/TQ3 1RT/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Beacon Hill
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C60- BBC A
-T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C53+ D3&4
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42 SDN
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 ARQ A
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C51 ARQ B
-T2 762167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C57+ BBC B HD
+[C60- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C33 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C42 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C51 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Belmont b/dvb-t/uk-Belmont
index 5d83a7b..d17c3ca 100644
--- a/dvb-t/uk-Belmont
+++ b/dvb-t/uk-Belmont
@@ -5,12 +5,90 @@
# location and provider: UK, Belmont
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C22 BBC A
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25 D3&4
-T2 570000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C33 COM7 HD
-T 545833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C30- SDN
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C53 ARQ A
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C60- ARQ B
-T2 530000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C28 BBC B HD
+[C22 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C33 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C30- SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Bilsdale b/dvb-t/uk-Bilsdale
index 4b6dc15..b8164cc 100644
--- a/dvb-t/uk-Bilsdale
+++ b/dvb-t/uk-Bilsdale
@@ -5,12 +5,90 @@
# location and provider: UK, Bilsdale
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26 BBC A
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C29 D3&4
-T2 554000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C31 COM7 HD
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C43 SDN
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C46 ARQ A
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C40 ARQ B
-T2 490000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C23 BBC B HD
+[C26 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C43 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C46 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-BlackHill b/dvb-t/uk-BlackHill
index 5cbd1ab..b97c26f 100644
--- a/dvb-t/uk-BlackHill
+++ b/dvb-t/uk-BlackHill
@@ -5,13 +5,102 @@
# location and provider: UK, Black Hill
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C46 BBC A
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C43 D3&4
-T2 562000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C32 COM7 HD
-T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C41+ SDN
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C44 ARQ A
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C47 ARQ B
-T2 626000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C40 BBC B HD
-T 714000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C51 L-GLW
+[C46 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C43 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C32 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C41+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C51 L-GLW]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Blaenplwyf b/dvb-t/uk-Blaenplwyf
index b33f588..5a569c2 100644
--- a/dvb-t/uk-Blaenplwyf
+++ b/dvb-t/uk-Blaenplwyf
@@ -5,11 +5,77 @@
# location and provider: UK, Blaenplwyf
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27 BBC A
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24 D3&4
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25 SDN
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22 ARQ A
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28 ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C21+ BBC B HD
+[C27 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-BluebellHill b/dvb-t/uk-BluebellHill
index 6543337..630ae75 100644
--- a/dvb-t/uk-BluebellHill
+++ b/dvb-t/uk-BluebellHill
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/ME5 9RD/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Bluebell Hill
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C46 BBC A
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C43 D3&4
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 SDN
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C39+ ARQ A
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C54 ARQ B
-T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C40+ BBC B HD
+[C46 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C43 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C32 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C45 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Bressay b/dvb-t/uk-Bressay
index 785eb51..9c95234 100644
--- a/dvb-t/uk-Bressay
+++ b/dvb-t/uk-Bressay
@@ -5,11 +5,77 @@
# location and provider: UK, Bressay
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C28 BBC A
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25 D3&4
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C27 SDN
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C24 ARQ A
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C21+ ARQ B
-T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C22+ BBC B HD
+[C28 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-BrierleyHill b/dvb-t/uk-BrierleyHill
index 6af2aa0..34fbc90 100644
--- a/dvb-t/uk-BrierleyHill
+++ b/dvb-t/uk-BrierleyHill
@@ -5,12 +5,89 @@
# location and provider: UK, Brierley Hill
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C60- BBC A
-T 762167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C57+ D3&4
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C50 SDN
-T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C59- ARQ A
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C55 ARQ B
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C53 BBC B HD
-T 538000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C29 L-BRM
+[C60- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C50 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59- ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 777833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C29 L-BRM]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-BristolIlchesterCrescent b/dvb-t/uk-BristolIlchesterCrescent
index 103bd09..6a268ff 100644
--- a/dvb-t/uk-BristolIlchesterCrescent
+++ b/dvb-t/uk-BristolIlchesterCrescent
@@ -5,12 +5,89 @@
# location and provider: UK, Bristol Ilchester Crescent
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C41+ BBC A
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C44 D3&4
-T 642167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42+ SDN
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 ARQ A
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C39+ ARQ B
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C47 BBC B HD
-T 546000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C30 L-BSL
+[C41+ BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C30 L-BSL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-BristolKingsWeston b/dvb-t/uk-BristolKingsWeston
index 814f06a..8abd22a 100644
--- a/dvb-t/uk-BristolKingsWeston
+++ b/dvb-t/uk-BristolKingsWeston
@@ -5,12 +5,89 @@
# location and provider: UK, Bristol Kings Weston
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C43 BBC A
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C40 D3&4
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C53 SDN
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C57 ARQ A
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C60- ARQ B
-T2 674000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C46 BBC B HD
-T 546000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C30 L-BSL
+[C43 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C46 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C30 L-BSL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Bromsgrove b/dvb-t/uk-Bromsgrove
index e104a38..8956ede 100644
--- a/dvb-t/uk-Bromsgrove
+++ b/dvb-t/uk-Bromsgrove
@@ -5,11 +5,77 @@
# location and provider: UK, Bromsgrove
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26 BBC A
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C23 D3&4
-T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C41+ SDN
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C44 ARQ A
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C47 ARQ B
-T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C30- BBC B HD
+[C26 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C30- BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-BrougherMountain b/dvb-t/uk-BrougherMountain
index 7fd552e..99c04a4 100644
--- a/dvb-t/uk-BrougherMountain
+++ b/dvb-t/uk-BrougherMountain
@@ -5,12 +5,90 @@
# location and provider: UK, Brougher Mountain
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C28 BBC A
-T 482167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C22+ D3&4
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C21+ SDN
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C24 ARQ A
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C27 ARQ B
-T2 506000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C25 BBC B HD
-T2 545833000 8MHz 2/3 NONE QPSK 32k 1/128 NONE 0 # C30- NI mux
+[C28 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C30- NI mux]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Caldbeck b/dvb-t/uk-Caldbeck
index 647f446..c75c3d2 100644
--- a/dvb-t/uk-Caldbeck
+++ b/dvb-t/uk-Caldbeck
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/CA7 8DW/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Caldbeck
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 505833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25- BBC A
-T 529833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C28- D3&4
-T 489833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C23- SDN
-T 513833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C26- ARQ A
-T 537833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C29- ARQ B
-T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C30- BBC B HD
+[C25- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 505833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C32 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C23- SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 489833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26- ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 513833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 537833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C30- BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-CaradonHill b/dvb-t/uk-CaradonHill
index 13ffc64..e216aa5 100644
--- a/dvb-t/uk-CaradonHill
+++ b/dvb-t/uk-CaradonHill
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/PL14 5LT/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Caradon Hill
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C28+ BBC A
-T 506167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25+ D3&4
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C21+ SDN
-T 497833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C24- ARQ A
-T 521833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C27- ARQ B
-T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C22+ BBC B HD
+[C28+ BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C21+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24- ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 497833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 521833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Carmel b/dvb-t/uk-Carmel
index 61aa3f7..9e78dfd 100644
--- a/dvb-t/uk-Carmel
+++ b/dvb-t/uk-Carmel
@@ -5,11 +5,77 @@
# location and provider: UK, Carmel
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C60- BBC A
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C53 D3&4
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C54 SDN
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C58 ARQ A
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C49 ARQ B
-T2 762000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C57 BBC B HD
+[C60- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Chatton b/dvb-t/uk-Chatton
index e27b284..4d40a46 100644
--- a/dvb-t/uk-Chatton
+++ b/dvb-t/uk-Chatton
@@ -5,11 +5,77 @@
# location and provider: UK, Chatton
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C45 BBC A
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C42 D3&4
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C41 SDN
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C44 ARQ A
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C47 ARQ B
-T2 618167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C39+ BBC B HD
+[C45 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Chesterfield b/dvb-t/uk-Chesterfield
index 9ddc258..38bedb9 100644
--- a/dvb-t/uk-Chesterfield
+++ b/dvb-t/uk-Chesterfield
@@ -5,11 +5,77 @@
# location and provider: UK, Chesterfield
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26 BBC A
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C23 D3&4
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C43 SDN
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C46 ARQ A
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C40 ARQ B
-T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C29 BBC B HD
+[C26 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C43 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C46 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Craigkelly b/dvb-t/uk-Craigkelly
index 0c5ef9f..8249481 100644
--- a/dvb-t/uk-Craigkelly
+++ b/dvb-t/uk-Craigkelly
@@ -5,13 +5,102 @@
# location and provider: UK, Craigkelly
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27 BBC A
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24 D3&4
-T2 570000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C33 COM7 HD
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42 SDN
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 ARQ A
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C39+ ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C21+ BBC B HD
-T 546000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C30 L-EDN
+[C27 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C33 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C42 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C30 L-EDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-CrystalPalace b/dvb-t/uk-CrystalPalace
index 8f0dead..3d17dd8 100644
--- a/dvb-t/uk-CrystalPalace
+++ b/dvb-t/uk-CrystalPalace
@@ -5,12 +5,90 @@
# location and provider: UK, Crystal Palace
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C23 BBC A
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26 D3&4
-T2 570000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C33 COM7 HD
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25 SDN
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22 ARQ A
-T 529833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28- ARQ B
-T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C30- BBC B HD
+[C23 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C33 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C25 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C30- BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Darvel b/dvb-t/uk-Darvel
index 4254a15..015f9ff 100644
--- a/dvb-t/uk-Darvel
+++ b/dvb-t/uk-Darvel
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/KA16 9LS/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Darvel
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 481833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C22- BBC A
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25 D3&4
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C23 SDN
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C26 ARQ A
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C29 ARQ B
-T2 530000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C28 BBC B HD
+[C22- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 481833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C23 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Divis b/dvb-t/uk-Divis
index 5930bbf..4dbc6c5 100644
--- a/dvb-t/uk-Divis
+++ b/dvb-t/uk-Divis
@@ -5,12 +5,90 @@
# location and provider: UK, Divis
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27 BBC A
-T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C21+ D3&4
-T2 570000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C33 COM7 HD
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C23 SDN
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C26 ARQ A
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C29 ARQ B
-T2 498000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C24 BBC B HD
+[C27 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C33 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C23 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Dover b/dvb-t/uk-Dover
index a81f7de..15fd270 100644
--- a/dvb-t/uk-Dover
+++ b/dvb-t/uk-Dover
@@ -5,11 +5,77 @@
# location and provider: UK, Dover
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C50 BBC A
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C51 D3&4
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C55 SDN
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C59 ARQ A
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48 ARQ B
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C53 BBC B HD
+[C50 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C51 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C48 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Durris b/dvb-t/uk-Durris
index 8ef4fb1..7ecdc70 100644
--- a/dvb-t/uk-Durris
+++ b/dvb-t/uk-Durris
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/AB39 3TH/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Durris
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C28 BBC A
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25 D3&4
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C23 SDN
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C26 ARQ A
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C29 ARQ B
-T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C22 BBC B HD
+[C28 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C32 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C23 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Eitshal b/dvb-t/uk-Eitshal
index ea53840..3901c12 100644
--- a/dvb-t/uk-Eitshal
+++ b/dvb-t/uk-Eitshal
@@ -5,11 +5,77 @@
# location and provider: UK, Eitshal
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26 BBC A
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C23 D3&4
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25 SDN
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22 ARQ A
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28 ARQ B
-T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C29 BBC B HD
+[C26 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-EmleyMoor b/dvb-t/uk-EmleyMoor
index 0466df9..c9c01d7 100644
--- a/dvb-t/uk-EmleyMoor
+++ b/dvb-t/uk-EmleyMoor
@@ -5,13 +5,102 @@
# location and provider: UK, Emley Moor
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C47 BBC A
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C44 D3&4
-T2 562000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C32 COM7 HD
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C51 SDN
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C52 ARQ A
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48 ARQ B
-T2 634000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C41 BBC B HD
-T 754000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C56 L-LDS
+[C47 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C32 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C51 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C48 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C56 L-LDS]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Fenham b/dvb-t/uk-Fenham
index 1c72bf4..dd054f5 100644
--- a/dvb-t/uk-Fenham
+++ b/dvb-t/uk-Fenham
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/NE15 6PL/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Fenham
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27 BBC A
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24 D3&4
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25 SDN
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22+ ARQ A
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28 ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C21+ BBC B HD
+[C27 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C25 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22+ ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Fenton b/dvb-t/uk-Fenton
index 7dc27f2..8c0a543 100644
--- a/dvb-t/uk-Fenton
+++ b/dvb-t/uk-Fenton
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/ST4 2NX/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Fenton
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24 BBC A
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27 D3&4
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25 SDN
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22+ ARQ A
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28 ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C21+ BBC B HD
+[C24 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C32 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C25 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22+ ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Ferryside b/dvb-t/uk-Ferryside
index 2c0e5fa..71c2e12 100644
--- a/dvb-t/uk-Ferryside
+++ b/dvb-t/uk-Ferryside
@@ -5,9 +5,53 @@
# location and provider: UK, Ferryside
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C21+ BBC A
-T 545833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C30- D3&4
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C27 SDN
-T2 498000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C24 BBC B HD
+[C21+ BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C30- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Guildford b/dvb-t/uk-Guildford
index 2d4fff8..ab56161 100644
--- a/dvb-t/uk-Guildford
+++ b/dvb-t/uk-Guildford
@@ -5,11 +5,77 @@
# location and provider: UK, Guildford
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C43 BBC A
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C46 D3&4
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48 SDN
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C52 ARQ A
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C49 ARQ B
-T2 626000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C40 BBC B HD
+[C43 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C46 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C48 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Hannington b/dvb-t/uk-Hannington
index 2d87e50..d3bbc75 100644
--- a/dvb-t/uk-Hannington
+++ b/dvb-t/uk-Hannington
@@ -5,12 +5,90 @@
# location and provider: UK, Hannington
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C45 BBC A
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C42 D3&4
-T2 562000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C32 COM7 HD
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C41 SDN
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C44 ARQ A
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C47 ARQ B
-T2 618167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C39+ BBC B HD
+[C45 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C32 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C41 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Hastings b/dvb-t/uk-Hastings
index 521eaa8..520c86a 100644
--- a/dvb-t/uk-Hastings
+++ b/dvb-t/uk-Hastings
@@ -5,11 +5,77 @@
# location and provider: UK, Hastings
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25 BBC A
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C28 D3&4
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C23 SDN
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C26 ARQ A
-T 545833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C30- ARQ B
-T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C22 BBC B HD
+[C25 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C30- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Heathfield b/dvb-t/uk-Heathfield
index 7266ce7..fda6fe0 100644
--- a/dvb-t/uk-Heathfield
+++ b/dvb-t/uk-Heathfield
@@ -5,11 +5,77 @@
# location and provider: UK, Heathfield
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C52 BBC A
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C49 D3&4
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42 SDN
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C44 ARQ A
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C41 ARQ B
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C47 BBC B HD
+[C52 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-HemelHempstead b/dvb-t/uk-HemelHempstead
index 176dd23..0116d4e 100644
--- a/dvb-t/uk-HemelHempstead
+++ b/dvb-t/uk-HemelHempstead
@@ -5,11 +5,77 @@
# location and provider: UK, Hemel Hempstead
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C44 BBC A
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C41 D3&4
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C50 SDN
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C59 ARQ A
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C55 ARQ B
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C47 BBC B HD
+[C44 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C50 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-HuntshawCross b/dvb-t/uk-HuntshawCross
index dc1e104..3b2b964 100644
--- a/dvb-t/uk-HuntshawCross
+++ b/dvb-t/uk-HuntshawCross
@@ -5,11 +5,77 @@
# location and provider: UK, Huntshaw Cross
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C50 BBC A
-T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C59- D3&4
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48 SDN
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C52 ARQ A
-T 754167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C56+ ARQ B
-T2 745833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C55- BBC B HD
+[C50 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 777833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C48 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C56+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55- BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 745833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Idle b/dvb-t/uk-Idle
index 7d69984..e736ca9 100644
--- a/dvb-t/uk-Idle
+++ b/dvb-t/uk-Idle
@@ -5,11 +5,77 @@
# location and provider: UK, Idle
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24 BBC A
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C21 D3&4
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42 SDN
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 ARQ A
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C39 ARQ B
-T2 522000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C27 BBC B HD
+[C24 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-KeelylangHill b/dvb-t/uk-KeelylangHill
index 58149ae..ac90b5d 100644
--- a/dvb-t/uk-KeelylangHill
+++ b/dvb-t/uk-KeelylangHill
@@ -5,11 +5,77 @@
# location and provider: UK, Keelylang Hill
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C46 BBC A
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C43 D3&4
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42 SDN
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 ARQ A
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C39+ ARQ B
-T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C40+ BBC B HD
+[C46 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C43 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Keighley b/dvb-t/uk-Keighley
index 295c663..ab86448 100644
--- a/dvb-t/uk-Keighley
+++ b/dvb-t/uk-Keighley
@@ -5,11 +5,77 @@
# location and provider: UK, Keighley
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C49 BBC A
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C58 D3&4
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C57 SDN
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C53 ARQ A
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C60- ARQ B
-T2 738000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C54 BBC B HD
+[C49 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-KilveyHill b/dvb-t/uk-KilveyHill
index b20dae8..5919ee3 100644
--- a/dvb-t/uk-KilveyHill
+++ b/dvb-t/uk-KilveyHill
@@ -5,11 +5,77 @@
# location and provider: UK, Kilvey Hill
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C23 BBC A
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26 D3&4
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25 SDN
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22 ARQ A
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28 ARQ B
-T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C29 BBC B HD
+[C23 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-KnockMore b/dvb-t/uk-KnockMore
index 0011bf5..3d7e41f 100644
--- a/dvb-t/uk-KnockMore
+++ b/dvb-t/uk-KnockMore
@@ -5,11 +5,77 @@
# location and provider: UK, Knockmore
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26 BBC A
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C23 D3&4
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C53 SDN
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C57 ARQ A
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C60- ARQ B
-T2 538000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C29 BBC B HD
+[C26 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Lancaster b/dvb-t/uk-Lancaster
index c174a08..0694e7a 100644
--- a/dvb-t/uk-Lancaster
+++ b/dvb-t/uk-Lancaster
@@ -5,11 +5,77 @@
# location and provider: UK, Lancaster
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 521833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27- BBC A
-T 497833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24- D3&4
-T 506167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25+ SDN
-T 530167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28+ ARQ A
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22+ ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C21+ BBC B HD
+[C27- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 521833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 497833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28+ ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-LarkStoke b/dvb-t/uk-LarkStoke
index ec9229b..3d7a6fb 100644
--- a/dvb-t/uk-LarkStoke
+++ b/dvb-t/uk-LarkStoke
@@ -5,11 +5,77 @@
# location and provider: UK, Lark Stoke
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26 BBC A
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C23 D3&4
-T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C41+ SDN
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C44 ARQ A
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C47 ARQ B
-T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C30- BBC B HD
+[C26 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C30- BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Limavady b/dvb-t/uk-Limavady
index d62d31b..977b973 100644
--- a/dvb-t/uk-Limavady
+++ b/dvb-t/uk-Limavady
@@ -5,11 +5,77 @@
# location and provider: UK, Limavady
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C50 BBC A
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C59 D3&4
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C54 SDN
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C58 ARQ A
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C49 ARQ B
-T2 746000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C55 BBC B HD
+[C50 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Llanddona b/dvb-t/uk-Llanddona
index 2a6d505..88067ee 100644
--- a/dvb-t/uk-Llanddona
+++ b/dvb-t/uk-Llanddona
@@ -5,11 +5,77 @@
# location and provider: UK, Llanddona
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C57 BBC A
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C60- D3&4
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C43 SDN
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C46 ARQ A
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C40 ARQ B
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C53 BBC B HD
+[C57 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C43 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C46 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Malvern b/dvb-t/uk-Malvern
index a8977c6..66c10e2 100644
--- a/dvb-t/uk-Malvern
+++ b/dvb-t/uk-Malvern
@@ -5,11 +5,77 @@
# location and provider: UK, Malvern
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C53 BBC A
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C57 D3&4
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C50 SDN
-T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C59- ARQ A
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C55 ARQ B
-T2 785833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C60- BBC B HD
+[C53 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C50 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59- ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 777833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Mendip b/dvb-t/uk-Mendip
index 9a736b5..8d3849b 100644
--- a/dvb-t/uk-Mendip
+++ b/dvb-t/uk-Mendip
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/BA5 3LB/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Mendip
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C49 BBC A
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C54 D3&4
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48 SDN
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C56 ARQ A
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C52 ARQ B
-T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C58 BBC B HD
+[C49 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C33 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C48 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C56 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Midhurst b/dvb-t/uk-Midhurst
index ca258bf..37416ad 100644
--- a/dvb-t/uk-Midhurst
+++ b/dvb-t/uk-Midhurst
@@ -5,11 +5,77 @@
# location and provider: UK, Midhurst
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C55 BBC A
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C56 D3&4
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C54 SDN
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C59 ARQ A
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C50 ARQ B
-T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C58 BBC B HD
+[C55 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C56 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C50 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-MoelyParc b/dvb-t/uk-MoelyParc
index afc7277..a2300b7 100644
--- a/dvb-t/uk-MoelyParc
+++ b/dvb-t/uk-MoelyParc
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/CH7 5UU/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Moel y Parc
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C45 BBC A
-T 618167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C39+ D3&4
-T 713833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C51- SDN
-T 722167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C52+ ARQ A
-T 689833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48- ARQ B
-T2 642000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C42 BBC B HD
+[C45 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C32 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C51- SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 713833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52+ ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C48- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 689833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Nottingham b/dvb-t/uk-Nottingham
index 7e13ff7..8112ec7 100644
--- a/dvb-t/uk-Nottingham
+++ b/dvb-t/uk-Nottingham
@@ -5,12 +5,89 @@
# location and provider: UK, Nottingham
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27 BBC A
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24 D3&4
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C51 SDN
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C52 ARQ A
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48 ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C21+ BBC B HD
-T 706000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C50 L-NOT
+[C27 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C51 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C48 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C50 L-NOT]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-OliversMount b/dvb-t/uk-OliversMount
index 54a9bf8..898e29a 100644
--- a/dvb-t/uk-OliversMount
+++ b/dvb-t/uk-OliversMount
@@ -5,11 +5,77 @@
# location and provider: UK, Olivers Mount
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C57 BBC A
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C60- D3&4
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C54 SDN
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C58 ARQ A
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C49 ARQ B
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C53 BBC B HD
+[C57 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Oxford b/dvb-t/uk-Oxford
index 6e14238..1274349 100644
--- a/dvb-t/uk-Oxford
+++ b/dvb-t/uk-Oxford
@@ -3,13 +3,104 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/OX3 9SS/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Oxford
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C53+ BBC A
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C60- D3&4
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C50 SDN
-T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C59- ARQ A
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C55 ARQ B
-T2 762000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C57 BBC B HD
+[C53+ BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C50 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59- ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 777833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C29 L-OFD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-PendleForest b/dvb-t/uk-PendleForest
index 1d210c3..7bcdd5a 100644
--- a/dvb-t/uk-PendleForest
+++ b/dvb-t/uk-PendleForest
@@ -5,11 +5,77 @@
# location and provider: UK, Pendle Forest
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C28+ BBC A
-T 506167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25+ D3&4
-T 521833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C27- SDN
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C21+ ARQ A
-T 497833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C24- ARQ B
-T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C22+ BBC B HD
+[C28+ BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27- SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 521833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 497833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Plympton b/dvb-t/uk-Plympton
index 4537dd3..d3bce92 100644
--- a/dvb-t/uk-Plympton
+++ b/dvb-t/uk-Plympton
@@ -5,11 +5,77 @@
# location and provider: UK, Plympton
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C54 BBC A
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C49 D3&4
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42 SDN
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 ARQ A
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C56 ARQ B
-T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C58 BBC B HD
+[C54 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C56 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-PontopPike b/dvb-t/uk-PontopPike
index c1e2adb..2ceb229 100644
--- a/dvb-t/uk-PontopPike
+++ b/dvb-t/uk-PontopPike
@@ -5,13 +5,102 @@
# location and provider: UK, Pontop Pike
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C58 BBC A
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C54 D3&4
-T2 570000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C33 COM7 HD
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C50 SDN
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C59 ARQ A
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C55 ARQ B
-T2 698000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C49 BBC B HD
-T 754000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C56 L-NCL
+[C58 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C33 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C50 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C56 L-NCL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Pontypool b/dvb-t/uk-Pontypool
index 3d9cc1d..b66c837 100644
--- a/dvb-t/uk-Pontypool
+++ b/dvb-t/uk-Pontypool
@@ -5,11 +5,77 @@
# location and provider: UK, Pontypool
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 490167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C23+ BBC A
-T 514167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26+ D3&4
-T 505833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25- SDN
-T 481833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22- ARQ A
-T 529833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28- ARQ B
-T2 538167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C29+ BBC B HD
+[C23+ BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25- SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 505833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22- ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 481833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 529833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Preseli b/dvb-t/uk-Preseli
index c671975..72e71c2 100644
--- a/dvb-t/uk-Preseli
+++ b/dvb-t/uk-Preseli
@@ -5,11 +5,77 @@
# location and provider: UK, Preseli
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 650167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C43+ BBC A
-T 674167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C46+ D3&4
-T 641833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42- SDN
-T 665833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45- ARQ A
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C39+ ARQ B
-T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C40+ BBC B HD
+[C43+ BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C46+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42- SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 641833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45- ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 665833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Redruth b/dvb-t/uk-Redruth
index 9faf555..650ca61 100644
--- a/dvb-t/uk-Redruth
+++ b/dvb-t/uk-Redruth
@@ -5,11 +5,77 @@
# location and provider: UK, Redruth
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 658167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C44+ BBC A
-T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C41+ D3&4
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48 SDN
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C52 ARQ A
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C51 ARQ B
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C47 BBC B HD
+[C44+ BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C48 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C51 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Reigate b/dvb-t/uk-Reigate
index f4451cd..b845d37 100644
--- a/dvb-t/uk-Reigate
+++ b/dvb-t/uk-Reigate
@@ -5,11 +5,77 @@
# location and provider: UK, Reigate
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C60- BBC A
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C57 D3&4
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C21+ SDN
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C24 ARQ A
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C27 ARQ B
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C53 BBC B HD
+[C60- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-RidgeHill b/dvb-t/uk-RidgeHill
index 17d0db1..abb0971 100644
--- a/dvb-t/uk-RidgeHill
+++ b/dvb-t/uk-RidgeHill
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/HR8 2PG/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Ridge Hill
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C28 BBC A
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25 D3&4
-T 474167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C21+ SDN
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C24 ARQ A
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C27 ARQ B
-T2 482167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C22+ BBC B HD
+[C28 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C32 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C21+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Rosemarkie b/dvb-t/uk-Rosemarkie
index bef8357..7fbd7e3 100644
--- a/dvb-t/uk-Rosemarkie
+++ b/dvb-t/uk-Rosemarkie
@@ -5,11 +5,77 @@
# location and provider: UK, Rosemarkie
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C45 BBC A
-T 618167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C39+ D3&4
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C43 SDN
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C46 ARQ A
-T 626167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C40+ ARQ B
-T2 642000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C42 BBC B HD
+[C45 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C43 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C46 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Rosneath b/dvb-t/uk-Rosneath
index 3b4dd3e..cf006e7 100644
--- a/dvb-t/uk-Rosneath
+++ b/dvb-t/uk-Rosneath
@@ -2,14 +2,80 @@
# Auto-generated from:
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/G84 0LF/NA/0/>
#----------------------------------------------------------------------------------------------
-# location and provider: UK, Rosneath VP
-# date (yyyy-mm-dd) : 2014-03-25
+# location and provider: UK, Rosneath
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C49 BBC A
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C58 D3&4
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C53 SDN
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C57 ARQ A
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C60- ARQ B
-T2 738000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C54 BBC B HD
+[C49 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Rowridge b/dvb-t/uk-Rowridge
index 655174c..16f781d 100644
--- a/dvb-t/uk-Rowridge
+++ b/dvb-t/uk-Rowridge
@@ -5,13 +5,102 @@
# location and provider: UK, Rowridge
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24 BBC A
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27 D3&4
-T2 554000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C31 COM7 HD
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25 SDN
-T 482167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22+ ARQ A
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28 ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C21+ BBC B HD
-T 538000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C29 L-SOT
+[C24 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C27 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C25 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22+ ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C29 L-SOT]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-RumsterForest b/dvb-t/uk-RumsterForest
index dbdf1e5..1f229cd 100644
--- a/dvb-t/uk-RumsterForest
+++ b/dvb-t/uk-RumsterForest
@@ -5,11 +5,77 @@
# location and provider: UK, Rumster Forest
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27 BBC A
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24 D3&4
-T 545833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C30- SDN
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C59 ARQ A
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C55 ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C21+ BBC B HD
+[C27 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C30- SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Saddleworth b/dvb-t/uk-Saddleworth
index b007083..6a4b2d9 100644
--- a/dvb-t/uk-Saddleworth
+++ b/dvb-t/uk-Saddleworth
@@ -5,11 +5,77 @@
# location and provider: UK, Saddleworth
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C45 BBC A
-T 618167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C39+ D3&4
-T 713833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C51- SDN
-T 722167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C52+ ARQ A
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48 ARQ B
-T2 642000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C42 BBC B HD
+[C45 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C51- SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 713833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52+ ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C48 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Salisbury b/dvb-t/uk-Salisbury
index 9baa21c..17f24a9 100644
--- a/dvb-t/uk-Salisbury
+++ b/dvb-t/uk-Salisbury
@@ -5,11 +5,77 @@
# location and provider: UK, Salisbury
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C57 BBC A
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C60- D3&4
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C50 SDN
-T 777833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C59- ARQ A
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C55 ARQ B
-T2 730000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C53 BBC B HD
+[C57 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C50 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59- ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 777833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-SandyHeath b/dvb-t/uk-SandyHeath
index 5999538..5b34230 100644
--- a/dvb-t/uk-SandyHeath
+++ b/dvb-t/uk-SandyHeath
@@ -5,12 +5,90 @@
# location and provider: UK, Sandy Heath
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27 BBC A
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24 D3&4
-T2 562000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C32 COM7 HD
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C51 SDN
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C52 ARQ A
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48 ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C21+ BBC B HD
+[C27 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C32 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C51 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C52 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C48 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Selkirk b/dvb-t/uk-Selkirk
index 8c9e567..ee4d822 100644
--- a/dvb-t/uk-Selkirk
+++ b/dvb-t/uk-Selkirk
@@ -5,11 +5,77 @@
# location and provider: UK, Selkirk
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C50 BBC A
-T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C59- D3&4
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C57 SDN
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C53 ARQ A
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C60- ARQ B
-T2 746000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C55 BBC B HD
+[C50 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 777833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Sheffield b/dvb-t/uk-Sheffield
index ea5fe90..cc31205 100644
--- a/dvb-t/uk-Sheffield
+++ b/dvb-t/uk-Sheffield
@@ -3,13 +3,104 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/S10 5GL/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Sheffield
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C27 BBC A
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C24 D3&4
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42 SDN
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 ARQ A
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C39+ ARQ B
-T2 474167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C21+ BBC B HD
+[C27 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C24 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C42 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C21+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 474167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C55 L-SFD]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-StocklandHill b/dvb-t/uk-StocklandHill
index 0f83c41..8b9ad5a 100644
--- a/dvb-t/uk-StocklandHill
+++ b/dvb-t/uk-StocklandHill
@@ -5,11 +5,77 @@
# location and provider: UK, Stockland Hill
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26+ BBC A
-T 490167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C23+ D3&4
-T 505833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C25- SDN
-T 481833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C22- ARQ A
-T 529833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C28- ARQ B
-T2 538167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C29+ BBC B HD
+[C26+ BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23+ D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25- SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22- ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C28- ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Storeton b/dvb-t/uk-Storeton
index fd002ed..15f8869 100644
--- a/dvb-t/uk-Storeton
+++ b/dvb-t/uk-Storeton
@@ -5,12 +5,89 @@
# location and provider: UK, Storeton
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C28 BBC A
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25 D3&4
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C23 SDN
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C26 ARQ A
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C29 ARQ B
-T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C22 BBC B HD
-T 546000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C30 L-LIV
+[C28 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C30 L-LIV]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Sudbury b/dvb-t/uk-Sudbury
index be273ef..3be0947 100644
--- a/dvb-t/uk-Sudbury
+++ b/dvb-t/uk-Sudbury
@@ -5,11 +5,77 @@
# location and provider: UK, Sudbury
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C44 BBC A
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C41 D3&4
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C58 SDN
-T 785833000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C60- ARQ A
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C56 ARQ B
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C47 BBC B HD
+[C44 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C60- ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C56 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-SuttonColdfield b/dvb-t/uk-SuttonColdfield
index 9af8ca0..ff1deed 100644
--- a/dvb-t/uk-SuttonColdfield
+++ b/dvb-t/uk-SuttonColdfield
@@ -5,13 +5,102 @@
# location and provider: UK, Sutton Coldfield
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C43 BBC A
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C46 D3&4
-T2 570000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C33 COM7 HD
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42 SDN
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 ARQ A
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C39+ ARQ B
-T2 626167000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C40+ BBC B HD
-T 714000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C51 L-BRM
+[C43 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C46 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C33 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C42 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C40+ BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C51 L-BRM]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Tacolneston b/dvb-t/uk-Tacolneston
index 4e5c448..1f664b8 100644
--- a/dvb-t/uk-Tacolneston
+++ b/dvb-t/uk-Tacolneston
@@ -3,13 +3,92 @@
# <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/NR16 1DW/NA/0/>
#----------------------------------------------------------------------------------------------
# location and provider: UK, Tacolneston
-# date (yyyy-mm-dd) : 2014-03-25
+# date (yyyy-mm-dd) : 2015-01-17
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 745833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C55- BBC A
-T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C59- D3&4
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42 SDN
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 ARQ A
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C39+ ARQ B
-T2 706000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C50 BBC B HD
+[C55- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 745833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 777833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C42 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C50 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-TheWrekin b/dvb-t/uk-TheWrekin
index 6ee251d..fe58789 100644
--- a/dvb-t/uk-TheWrekin
+++ b/dvb-t/uk-TheWrekin
@@ -5,11 +5,77 @@
# location and provider: UK, The Wrekin
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C26 BBC A
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C23 D3&4
-T 634167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C41+ SDN
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C44 ARQ A
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C47 ARQ B
-T2 545833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C30- BBC B HD
+[C26 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C30- BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 545833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Torosay b/dvb-t/uk-Torosay
index 9d548c4..74b96e4 100644
--- a/dvb-t/uk-Torosay
+++ b/dvb-t/uk-Torosay
@@ -5,11 +5,77 @@
# location and provider: UK, Torosay
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C28 BBC A
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C25 D3&4
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C23 SDN
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C26 ARQ A
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C29 ARQ B
-T2 482000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C22 BBC B HD
+[C28 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C25 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C23 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C26 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C29 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C22 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-TunbridgeWells b/dvb-t/uk-TunbridgeWells
index ee5b569..47ed282 100644
--- a/dvb-t/uk-TunbridgeWells
+++ b/dvb-t/uk-TunbridgeWells
@@ -5,11 +5,77 @@
# location and provider: UK, Tunbridge Wells
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C52 BBC A
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C49 D3&4
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42 SDN
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C44 ARQ A
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C41 ARQ B
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C47 BBC B HD
+[C52 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C42 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C41 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Waltham b/dvb-t/uk-Waltham
index ce88bcf..789ae68 100644
--- a/dvb-t/uk-Waltham
+++ b/dvb-t/uk-Waltham
@@ -5,13 +5,102 @@
# location and provider: UK, Waltham
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C49 BBC A
-T 737833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C54- D3&4
-T2 554000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C31 COM7 HD
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C29 SDN
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C56 ARQ A
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C57 ARQ B
-T2 770000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C58 BBC B HD
-T 514000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C26 L-NOT
+[C49 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54- D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 737833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C29 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C56 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C58 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C26 L-NOT]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Wenvoe b/dvb-t/uk-Wenvoe
index 9a37496..7d21b7a 100644
--- a/dvb-t/uk-Wenvoe
+++ b/dvb-t/uk-Wenvoe
@@ -5,13 +5,102 @@
# location and provider: UK, Wenvoe
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C41+ BBC A
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C44 D3&4
-T2 554000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C31 COM7 HD
-T 642167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C42+ SDN
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C45 ARQ A
-T 618167000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C39+ ARQ B
-T2 682000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C47 BBC B HD
-T 714000000 8MHz 3/4 NONE QPSK 8k 1/32 NONE # C51 L-CDF
+[C41+ BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C44 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C42+ SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 642167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C45 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C39+ ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618167000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C47 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C51 L-CDF]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QPSK
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-WhitehawkHill b/dvb-t/uk-WhitehawkHill
index 76733b0..3cbabbb 100644
--- a/dvb-t/uk-WhitehawkHill
+++ b/dvb-t/uk-WhitehawkHill
@@ -5,11 +5,77 @@
# location and provider: UK, Whitehawk Hill
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C60- BBC A
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C53 D3&4
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C57 SDN
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C56 ARQ A
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C48 ARQ B
-T2 714000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C51 BBC B HD
+[C60- BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 785833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C53 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C57 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C56 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C48 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C51 BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-WinterHill b/dvb-t/uk-WinterHill
index f2a8497..15546d7 100644
--- a/dvb-t/uk-WinterHill
+++ b/dvb-t/uk-WinterHill
@@ -5,12 +5,90 @@
# location and provider: UK, Winter Hill
# date (yyyy-mm-dd) : 2014-03-25
#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [<plp_id>] [# comment]
#----------------------------------------------------------------------------------------------
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C50 BBC A
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C59 D3&4
-T2 554000000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C31 COM7 HD
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C58 SDN
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C49 ARQ A
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE # C55 ARQ B
-T2 737833000 8MHz 2/3 NONE QAM256 32k 1/128 NONE 0 # C54- BBC B HD
+[C50 BBC A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C59 D3&4]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C31 COM7 HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 554000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
+[C58 SDN]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C49 ARQ A]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C55 ARQ B]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 8K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[C54- BBC B HD]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 737833000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 2/3
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/128
+ HIERARCHY = NONE
+ STREAM_ID = 0
+ INVERSION = AUTO
+
diff --git a/dvb-t/vn-Hanoi b/dvb-t/vn-Hanoi
index 451a07f..abb9695 100644
--- a/dvb-t/vn-Hanoi
+++ b/dvb-t/vn-Hanoi
@@ -1,5 +1,26 @@
# Hanoi - Vietnam - DVB-T by VTC
# contributed by Pham Thanh Nam <phamthanhnam.ptn@gmail.com>
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/vn-Thaibinh b/dvb-t/vn-Thaibinh
index 85f8098..f340948 100644
--- a/dvb-t/vn-Thaibinh
+++ b/dvb-t/vn-Thaibinh
@@ -1,5 +1,26 @@
# Thaibinh - Vietnam - DVB-T by VTC
# contributed by Pham Thanh Nam <phamthanhnam.ptn@gmail.com>
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
-T 634000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/64
+ TRANSMISSION_MODE = 2K
+ GUARD_INTERVAL = 1/32
+ HIERARCHY = NONE
+ INVERSION = AUTO
+