aboutsummaryrefslogtreecommitdiffstats
path: root/dvb-t
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2014-10-15 00:54:11 +0100
committerJonathan McCrohan <jmccrohan@gmail.com>2014-10-15 00:54:11 +0100
commit6a4826f9d965ba04738085602e80a867c78c81f1 (patch)
treebb1db1628dd2d2b68a813fa13288ae4797b6fd92 /dvb-t
parent869756da0627b14a6954f96aa5009d57a5e682c7 (diff)
downloaddtv-scan-tables-6a4826f9d965ba04738085602e80a867c78c81f1.tar.gz
Imported Upstream version 0+git20141009.d26b627upstream/0+git20141009.d26b627
Diffstat (limited to '')
-rw-r--r--dvb-t/ad-Andorra52
-rw-r--r--dvb-t/ar-Argentina63
-rw-r--r--dvb-t/at-All637
-rw-r--r--dvb-t/au-Adelaide78
-rw-r--r--dvb-t/au-AdelaideFoothills65
-rw-r--r--dvb-t/au-Ballarat65
-rw-r--r--dvb-t/au-Bendigo340
-rw-r--r--dvb-t/au-Brisbane78
-rw-r--r--dvb-t/au-Cairns65
-rw-r--r--dvb-t/au-Canberra-Black-Mt65
-rw-r--r--dvb-t/au-Coonabarabran54
-rw-r--r--dvb-t/au-Darwin65
-rw-r--r--dvb-t/au-Devonport91
-rw-r--r--dvb-t/au-FraserCoast-Bundaberg65
-rw-r--r--dvb-t/au-GoldCoast104
-rw-r--r--dvb-t/au-Goulburn-Rocky_Hill65
-rw-r--r--dvb-t/au-Hervey_Bay-Ghost_Hill78
-rw-r--r--dvb-t/au-Hobart65
-rw-r--r--dvb-t/au-Mackay65
-rw-r--r--dvb-t/au-Melbourne101
-rw-r--r--dvb-t/au-Melbourne-Selby64
-rw-r--r--dvb-t/au-Melbourne-Upwey65
-rw-r--r--dvb-t/au-MidNorthCoast130
-rw-r--r--dvb-t/au-Newcastle65
-rw-r--r--dvb-t/au-Perth65
-rw-r--r--dvb-t/au-Perth_Roleystone65
-rw-r--r--dvb-t/au-SpencerGulf39
-rw-r--r--dvb-t/au-SunshineCoast65
-rw-r--r--dvb-t/au-Sutherland52
-rw-r--r--dvb-t/au-Sydney78
-rw-r--r--dvb-t/au-Sydney_Kings_Cross65
-rw-r--r--dvb-t/au-Tamworth195
-rw-r--r--dvb-t/au-Townsville65
-rw-r--r--dvb-t/au-WaggaWagga65
-rw-r--r--dvb-t/au-Wollongong130
-rw-r--r--dvb-t/au-canberra65
-rw-r--r--dvb-t/au-unknown13
-rw-r--r--dvb-t/auto-Australia1300
-rw-r--r--dvb-t/auto-Default741
-rw-r--r--dvb-t/auto-Taiwan169
-rw-r--r--dvb-t/auto-With167kHzOffsets2015
-rw-r--r--dvb-t/ax-Smedsbole26
-rw-r--r--dvb-t/be-All65
-rw-r--r--dvb-t/bg-Sofia53
-rw-r--r--dvb-t/br-Brazil63
-rw-r--r--dvb-t/ca-AB-Calgary45
-rw-r--r--dvb-t/ch-All364
-rw-r--r--dvb-t/ch-Citycable351
-rw-r--r--dvb-t/ch-Geneva156
-rw-r--r--dvb-t/cz-All520
-rw-r--r--dvb-t/de-Baden-Wuerttemberg208
-rw-r--r--dvb-t/de-Bayern247
-rw-r--r--dvb-t/de-Berlin117
-rw-r--r--dvb-t/de-Brandenburg52
-rw-r--r--dvb-t/de-Bremen78
-rw-r--r--dvb-t/de-Hamburg104
-rw-r--r--dvb-t/de-Hessen208
-rw-r--r--dvb-t/de-Mecklenburg-Vorpommern117
-rw-r--r--dvb-t/de-Niedersachsen286
-rw-r--r--dvb-t/de-Nordrhein-Westfalen247
-rw-r--r--dvb-t/de-Rheinland-Pfalz104
-rw-r--r--dvb-t/de-Saarland52
-rw-r--r--dvb-t/de-Sachsen143
-rw-r--r--dvb-t/de-Sachsen-Anhalt130
-rw-r--r--dvb-t/de-Schleswig-Holstein195
-rw-r--r--dvb-t/de-Thueringen91
-rw-r--r--dvb-t/dk-All247
-rw-r--r--dvb-t/ee-All421
-rw-r--r--dvb-t/es-Albacete156
-rw-r--r--dvb-t/es-Alfabia156
-rw-r--r--dvb-t/es-Alicante91
-rw-r--r--dvb-t/es-Alpicat78
-rw-r--r--dvb-t/es-Asturias78
-rw-r--r--dvb-t/es-BaixoMinho78
-rw-r--r--dvb-t/es-Bilbao78
-rw-r--r--dvb-t/es-Cadiz301
-rw-r--r--dvb-t/es-Carceres117
-rw-r--r--dvb-t/es-Collserola130
-rw-r--r--dvb-t/es-Donostia130
-rw-r--r--dvb-t/es-Granada78
-rw-r--r--dvb-t/es-Huesca130
-rw-r--r--dvb-t/es-Las_Palmas156
-rw-r--r--dvb-t/es-Lugo78
-rw-r--r--dvb-t/es-Madrid143
-rw-r--r--dvb-t/es-Malaga79
-rw-r--r--dvb-t/es-Muros-Noia91
-rw-r--r--dvb-t/es-Mussara78
-rw-r--r--dvb-t/es-Pamplona91
-rw-r--r--dvb-t/es-Rocacorba6
-rw-r--r--dvb-t/es-SC_Tenerife156
-rw-r--r--dvb-t/es-Santander52
-rw-r--r--dvb-t/es-Santiago_de_Compostela91
-rw-r--r--dvb-t/es-Sevilla247
-rw-r--r--dvb-t/es-Tenerife156
-rw-r--r--dvb-t/es-Valencia104
-rw-r--r--dvb-t/es-Valladolid65
-rw-r--r--dvb-t/es-Vilamarxant26
-rw-r--r--dvb-t/es-Vitoria-Gasteiz78
-rw-r--r--dvb-t/es-Zaragoza65
-rw-r--r--dvb-t/fi-Aanekoski25
-rw-r--r--dvb-t/fi-Aanekoski_Konginkangas25
-rw-r--r--dvb-t/fi-Ahtari13
-rw-r--r--dvb-t/fi-Alajarvi25
-rw-r--r--dvb-t/fi-Anjalankoski_Ruotila31
-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_Ahovaara13
-rw-r--r--dvb-t/fi-Enontekio_Hetta13
-rw-r--r--dvb-t/fi-Enontekio_Kuttanen13
-rw-r--r--dvb-t/fi-Espoo35
-rw-r--r--dvb-t/fi-Eurajoki31
-rw-r--r--dvb-t/fi-Fiskars25
-rw-r--r--dvb-t/fi-Haapavesi25
-rw-r--r--dvb-t/fi-Hameenkyro_Kyroskoski25
-rw-r--r--dvb-t/fi-Hameenlinna_Painokangas19
-rw-r--r--dvb-t/fi-Hanko25
-rw-r--r--dvb-t/fi-Hartola19
-rw-r--r--dvb-t/fi-Heinavesi19
-rw-r--r--dvb-t/fi-Heinola25
-rw-r--r--dvb-t/fi-Hyrynsalmi19
-rw-r--r--dvb-t/fi-Hyrynsalmi_Kyparavaara19
-rw-r--r--dvb-t/fi-Hyrynsalmi_Paljakka19
-rw-r--r--dvb-t/fi-Hyvinkaa25
-rw-r--r--dvb-t/fi-Ii_Raiskio13
-rw-r--r--dvb-t/fi-Iisalmi13
-rw-r--r--dvb-t/fi-Ikaalinen25
-rw-r--r--dvb-t/fi-Ikaalinen_Riitiala25
-rw-r--r--dvb-t/fi-Inari13
-rw-r--r--dvb-t/fi-Inari_Janispaa13
-rw-r--r--dvb-t/fi-Inari_Naatamo13
-rw-r--r--dvb-t/fi-Ivalo_Saarineitamovaara13
-rw-r--r--dvb-t/fi-Jalasjarvi25
-rw-r--r--dvb-t/fi-Jamsa_Halli25
-rw-r--r--dvb-t/fi-Jamsa_Kaipola25
-rw-r--r--dvb-t/fi-Jamsa_Matkosvuori25
-rw-r--r--dvb-t/fi-Jamsa_Ouninpohja19
-rw-r--r--dvb-t/fi-Jamsankoski25
-rw-r--r--dvb-t/fi-Joensuu_Vestinkallio19
-rw-r--r--dvb-t/fi-Joroinen_Puukkola19
-rw-r--r--dvb-t/fi-Joutsa_Lankia25
-rw-r--r--dvb-t/fi-Joutseno31
-rw-r--r--dvb-t/fi-Juupajoki_Kopsamo19
-rw-r--r--dvb-t/fi-Juva25
-rw-r--r--dvb-t/fi-Jyvaskyla37
-rw-r--r--dvb-t/fi-Jyvaskyla_Vaajakoski19
-rw-r--r--dvb-t/fi-Kaavi_Sivakkavaara19
-rw-r--r--dvb-t/fi-Kajaani_Pollyvaara19
-rw-r--r--dvb-t/fi-Kalajoki19
-rw-r--r--dvb-t/fi-Kangaslampi25
-rw-r--r--dvb-t/fi-Kangasniemi_Turkinmaki25
-rw-r--r--dvb-t/fi-Kankaanpaa25
-rw-r--r--dvb-t/fi-Karigasniemi13
-rw-r--r--dvb-t/fi-Karkkila25
-rw-r--r--dvb-t/fi-Karstula19
-rw-r--r--dvb-t/fi-Karvia19
-rw-r--r--dvb-t/fi-Kaunispaa13
-rw-r--r--dvb-t/fi-Kemijarvi_Suomutunturi13
-rw-r--r--dvb-t/fi-Kerimaki25
-rw-r--r--dvb-t/fi-Keuruu25
-rw-r--r--dvb-t/fi-Keuruu_Haapamaki25
-rw-r--r--dvb-t/fi-Kihnio25
-rw-r--r--dvb-t/fi-Kiihtelysvaara13
-rw-r--r--dvb-t/fi-Kilpisjarvi13
-rw-r--r--dvb-t/fi-Kittila_Levitunturi13
-rw-r--r--dvb-t/fi-Kolari_Vuolittaja13
-rw-r--r--dvb-t/fi-Koli25
-rw-r--r--dvb-t/fi-Korpilahti_Vaarunvuori25
-rw-r--r--dvb-t/fi-Korppoo25
-rw-r--r--dvb-t/fi-Kruunupyy31
-rw-r--r--dvb-t/fi-Kuhmo_Haukela19
-rw-r--r--dvb-t/fi-Kuhmo_Lentiira19
-rw-r--r--dvb-t/fi-Kuhmo_Niva19
-rw-r--r--dvb-t/fi-Kuhmoinen25
-rw-r--r--dvb-t/fi-Kuhmoinen_Harjunsalmi25
-rw-r--r--dvb-t/fi-Kuhmoinen_Puukkoinen19
-rw-r--r--dvb-t/fi-Kuopio31
-rw-r--r--dvb-t/fi-Kurikka_Kesti25
-rw-r--r--dvb-t/fi-Kustavi_Viherlahti25
-rw-r--r--dvb-t/fi-Kuusamo_Hamppulampi13
-rw-r--r--dvb-t/fi-Kyyjarvi_Noposenaho19
-rw-r--r--dvb-t/fi-Lahti37
-rw-r--r--dvb-t/fi-Lapua31
-rw-r--r--dvb-t/fi-Laukaa25
-rw-r--r--dvb-t/fi-Laukaa_Vihtavuori25
-rw-r--r--dvb-t/fi-Lavia19
-rw-r--r--dvb-t/fi-Lohja25
-rw-r--r--dvb-t/fi-Loimaa25
-rw-r--r--dvb-t/fi-Luhanka25
-rw-r--r--dvb-t/fi-Luopioinen25
-rw-r--r--dvb-t/fi-Mantta25
-rw-r--r--dvb-t/fi-Mantyharju19
-rw-r--r--dvb-t/fi-Mikkeli25
-rw-r--r--dvb-t/fi-Muonio_Olostunturi13
-rw-r--r--dvb-t/fi-Nilsia25
-rw-r--r--dvb-t/fi-Nilsia_Keski-Siikajarvi19
-rw-r--r--dvb-t/fi-Nilsia_Pisa19
-rw-r--r--dvb-t/fi-Nokia25
-rw-r--r--dvb-t/fi-Nokia_Siuro25
-rw-r--r--dvb-t/fi-Nummi-Pusula_Hyonola25
-rw-r--r--dvb-t/fi-Nuorgam_Njallavaara13
-rw-r--r--dvb-t/fi-Nuorgam_raja13
-rw-r--r--dvb-t/fi-Nurmes_Konnanvaara25
-rw-r--r--dvb-t/fi-Nurmes_Kortevaara19
-rw-r--r--dvb-t/fi-Orivesi_Talviainen19
-rw-r--r--dvb-t/fi-Oulu37
-rw-r--r--dvb-t/fi-Padasjoki25
-rw-r--r--dvb-t/fi-Padasjoki_Arrakoski25
-rw-r--r--dvb-t/fi-Paltamo_Kivesvaara19
-rw-r--r--dvb-t/fi-Parainen_Houtskari25
-rw-r--r--dvb-t/fi-Parikkala25
-rw-r--r--dvb-t/fi-Parkano_Sopukallio25
-rw-r--r--dvb-t/fi-Pello13
-rw-r--r--dvb-t/fi-Pello_Ratasvaara13
-rw-r--r--dvb-t/fi-Perho25
-rw-r--r--dvb-t/fi-Pernaja19
-rw-r--r--dvb-t/fi-Pieksamaki_Halkokumpu19
-rw-r--r--dvb-t/fi-Pihtipudas19
-rw-r--r--dvb-t/fi-Porvoo_Suomenkyla25
-rw-r--r--dvb-t/fi-Posio13
-rw-r--r--dvb-t/fi-Pudasjarvi19
-rw-r--r--dvb-t/fi-Pudasjarvi_Iso-Syote19
-rw-r--r--dvb-t/fi-Pudasjarvi_Kangasvaara13
-rw-r--r--dvb-t/fi-Puolanka25
-rw-r--r--dvb-t/fi-Pyhatunturi13
-rw-r--r--dvb-t/fi-Pyhavuori19
-rw-r--r--dvb-t/fi-Pylkonmaki_Karankajarvi19
-rw-r--r--dvb-t/fi-Raahe_Mestauskallio25
-rw-r--r--dvb-t/fi-Raahe_Piehinki19
-rw-r--r--dvb-t/fi-Ranua_Haasionmaa13
-rw-r--r--dvb-t/fi-Ranua_Leppiaho13
-rw-r--r--dvb-t/fi-Rautavaara_Angervikko25
-rw-r--r--dvb-t/fi-Rautjarvi_Simpele19
-rw-r--r--dvb-t/fi-Ristijarvi19
-rw-r--r--dvb-t/fi-Rovaniemi19
-rw-r--r--dvb-t/fi-Rovaniemi_Kaihuanvaara13
-rw-r--r--dvb-t/fi-Rovaniemi_Karhuvaara13
-rw-r--r--dvb-t/fi-Rovaniemi_Marasenkallio13
-rw-r--r--dvb-t/fi-Rovaniemi_Rantalaki13
-rw-r--r--dvb-t/fi-Rovaniemi_Sonka13
-rw-r--r--dvb-t/fi-Rovaniemi_Sorviselka13
-rw-r--r--dvb-t/fi-Ruka19
-rw-r--r--dvb-t/fi-Ruovesi_Storminiemi25
-rw-r--r--dvb-t/fi-Saarijarvi25
-rw-r--r--dvb-t/fi-Saarijarvi_Kalmari19
-rw-r--r--dvb-t/fi-Saarijarvi_Mahlu19
-rw-r--r--dvb-t/fi-Salla_Hirvasvaara13
-rw-r--r--dvb-t/fi-Salla_Ihistysjanka13
-rw-r--r--dvb-t/fi-Salla_Naruska13
-rw-r--r--dvb-t/fi-Salla_Sallatunturi13
-rw-r--r--dvb-t/fi-Salla_Sarivaara13
-rw-r--r--dvb-t/fi-Salo_Isokyla25
-rw-r--r--dvb-t/fi-Savukoski_Martti13
-rw-r--r--dvb-t/fi-Savukoski_Tanhua13
-rw-r--r--dvb-t/fi-Siilinjarvi25
-rw-r--r--dvb-t/fi-Simo_Viantie19
-rw-r--r--dvb-t/fi-Sipoo_Norrkulla25
-rw-r--r--dvb-t/fi-Sodankyla_Pittiovaara13
-rw-r--r--dvb-t/fi-Sodankyla_Vuotso13
-rw-r--r--dvb-t/fi-Sulkava_Vaatalanmaki19
-rw-r--r--dvb-t/fi-Suomussalmi_Ala-Vuokki13
-rw-r--r--dvb-t/fi-Suomussalmi_Ammansaari13
-rw-r--r--dvb-t/fi-Suomussalmi_Juntusranta13
-rw-r--r--dvb-t/fi-Suomussalmi_Myllylahti13
-rw-r--r--dvb-t/fi-Sysma_Liikola25
-rw-r--r--dvb-t/fi-Taivalkoski13
-rw-r--r--dvb-t/fi-Taivalkoski_Taivalvaara13
-rw-r--r--dvb-t/fi-Tammela31
-rw-r--r--dvb-t/fi-Tammisaari25
-rw-r--r--dvb-t/fi-Tampere37
-rw-r--r--dvb-t/fi-Tampere_Pyynikki31
-rw-r--r--dvb-t/fi-Tervola19
-rw-r--r--dvb-t/fi-Turku37
-rw-r--r--dvb-t/fi-Utsjoki13
-rw-r--r--dvb-t/fi-Utsjoki_Nuvvus13
-rw-r--r--dvb-t/fi-Utsjoki_Outakoski13
-rw-r--r--dvb-t/fi-Utsjoki_Polvarniemi13
-rw-r--r--dvb-t/fi-Utsjoki_Rovisuvanto13
-rw-r--r--dvb-t/fi-Utsjoki_Tenola13
-rw-r--r--dvb-t/fi-Uusikaupunki_Orivo25
-rw-r--r--dvb-t/fi-Vaala19
-rw-r--r--dvb-t/fi-Vaasa19
-rw-r--r--dvb-t/fi-Valtimo19
-rw-r--r--dvb-t/fi-Vammala_Jyranvuori25
-rw-r--r--dvb-t/fi-Vammala_Roismala19
-rw-r--r--dvb-t/fi-Vammala_Savi19
-rw-r--r--dvb-t/fi-Vantaa_Hakunila25
-rw-r--r--dvb-t/fi-Varpaisjarvi_Honkamaki25
-rw-r--r--dvb-t/fi-Virrat_Lappavuori25
-rw-r--r--dvb-t/fi-Vuokatti25
-rw-r--r--dvb-t/fi-Ylitornio_Ainiovaara19
-rw-r--r--dvb-t/fi-Ylitornio_Raanujarvi13
-rw-r--r--dvb-t/fi-Yllas13
-rw-r--r--dvb-t/fi-Yllasjarvi13
-rw-r--r--dvb-t/fr-All520
-rw-r--r--dvb-t/gr-Athens39
-rw-r--r--dvb-t/hk-HongKong91
-rw-r--r--dvb-t/hr-All338
-rw-r--r--dvb-t/hu-Bekescsaba39
-rw-r--r--dvb-t/hu-Budapest39
-rw-r--r--dvb-t/hu-Csavoly-Kiskoros26
-rw-r--r--dvb-t/hu-Debrecen-Komadi39
-rw-r--r--dvb-t/hu-Fehergyarmat26
-rw-r--r--dvb-t/hu-Gerecse-Dorog-Tatabanya39
-rw-r--r--dvb-t/hu-Gyor39
-rw-r--r--dvb-t/hu-Kabhegy-Kaposvar-Tamasi26
-rw-r--r--dvb-t/hu-Karancs-Nagy-Hideg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac39
-rw-r--r--dvb-t/hu-Karcag39
-rw-r--r--dvb-t/hu-Kecskemet39
-rw-r--r--dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd39
-rw-r--r--dvb-t/hu-Miskolc-Aggtelek-Fony39
-rw-r--r--dvb-t/hu-Mor-Siofok-Veszprem-Zirc39
-rw-r--r--dvb-t/hu-Nagykanizsa-Barcs-Keszthely39
-rw-r--r--dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely39
-rw-r--r--dvb-t/hu-Pecs-Siklos26
-rw-r--r--dvb-t/hu-Sopron-Koszeg39
-rw-r--r--dvb-t/hu-Szeged39
-rw-r--r--dvb-t/hu-Szekesfehervar39
-rw-r--r--dvb-t/hu-Szentes-Battonya26
-rw-r--r--dvb-t/hu-Szolnok39
-rw-r--r--dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg39
-rw-r--r--dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar39
-rw-r--r--dvb-t/ie-CairnHill26
-rw-r--r--dvb-t/ie-ClermontCarn26
-rw-r--r--dvb-t/ie-Dungarvan26
-rw-r--r--dvb-t/ie-HolywellHill26
-rw-r--r--dvb-t/ie-Kippure26
-rw-r--r--dvb-t/ie-Maghera26
-rw-r--r--dvb-t/ie-MountLeinster26
-rw-r--r--dvb-t/ie-Mullaghanish26
-rw-r--r--dvb-t/ie-SpurHill26
-rw-r--r--dvb-t/ie-ThreeRock26
-rw-r--r--dvb-t/ie-Truskmore26
-rw-r--r--dvb-t/ie-WoodcockHill26
-rw-r--r--dvb-t/il-All26
-rw-r--r--dvb-t/ir-Tehran26
-rw-r--r--dvb-t/is-Reykjavik234
-rw-r--r--dvb-t/it-All741
-rw-r--r--dvb-t/lt-All313
-rw-r--r--dvb-t/lu-All52
-rw-r--r--dvb-t/lv-Riga94
-rw-r--r--dvb-t/nl-All522
-rw-r--r--dvb-t/no-Trondelag_Stjordal39
-rw-r--r--dvb-t/nz-AucklandInfill39
-rw-r--r--dvb-t/nz-AucklandWaiatarua39
-rw-r--r--dvb-t/nz-Christchurch39
-rw-r--r--dvb-t/nz-Dunedin39
-rw-r--r--dvb-t/nz-Hamilton39
-rw-r--r--dvb-t/nz-HawkesBayMtErin39
-rw-r--r--dvb-t/nz-HawkesBayNapier39
-rw-r--r--dvb-t/nz-Manawatu39
-rw-r--r--dvb-t/nz-Tauranga39
-rw-r--r--dvb-t/nz-Waikato39
-rw-r--r--dvb-t/nz-WellingtonInfill39
-rw-r--r--dvb-t/nz-WellingtonKaukau39
-rw-r--r--dvb-t/nz-WellingtonNgarara39
-rw-r--r--dvb-t/pl-Czestochowa39
-rw-r--r--dvb-t/pl-Gdansk26
-rw-r--r--dvb-t/pl-Krakow78
-rw-r--r--dvb-t/pl-Rzeszow13
-rw-r--r--dvb-t/pl-Warszawa10
-rw-r--r--dvb-t/pl-Wroclaw13
-rw-r--r--dvb-t/pt-All91
-rw-r--r--dvb-t/ro-Bucharest39
-rw-r--r--dvb-t/ru-Krasnodar56
-rw-r--r--dvb-t/ru-Novosibirsk56
-rw-r--r--dvb-t/ru-Volgodonsk56
-rw-r--r--dvb-t/se-Alvdalen_Brunnsberg13
-rw-r--r--dvb-t/se-Alvdalsasen13
-rw-r--r--dvb-t/se-Alvsbyn65
-rw-r--r--dvb-t/se-Amot13
-rw-r--r--dvb-t/se-Ange_Snoberg52
-rw-r--r--dvb-t/se-Angebo13
-rw-r--r--dvb-t/se-Angelholm_Vegeholm65
-rw-r--r--dvb-t/se-Arvidsjaur_Jultrask52
-rw-r--r--dvb-t/se-Aspeboda13
-rw-r--r--dvb-t/se-Atvidaberg26
-rw-r--r--dvb-t/se-Avesta_Krylbo26
-rw-r--r--dvb-t/se-Backefors65
-rw-r--r--dvb-t/se-Bankeryd26
-rw-r--r--dvb-t/se-Bergsjo_Balleberget13
-rw-r--r--dvb-t/se-Bergvik13
-rw-r--r--dvb-t/se-Bollebygd26
-rw-r--r--dvb-t/se-Bollnas52
-rw-r--r--dvb-t/se-Boras_Dalsjofors65
-rw-r--r--dvb-t/se-Boras_Sjobo26
-rw-r--r--dvb-t/se-Borlange_Idkerberget52
-rw-r--r--dvb-t/se-Borlange_Nygardarna26
-rw-r--r--dvb-t/se-Bottnaryd_Ryd13
-rw-r--r--dvb-t/se-Bromsebro26
-rw-r--r--dvb-t/se-Bruzaholm13
-rw-r--r--dvb-t/se-Byxelkrok26
-rw-r--r--dvb-t/se-Dadran13
-rw-r--r--dvb-t/se-Dalfors13
-rw-r--r--dvb-t/se-Dalstuga13
-rw-r--r--dvb-t/se-Degerfors52
-rw-r--r--dvb-t/se-Delary13
-rw-r--r--dvb-t/se-Djura13
-rw-r--r--dvb-t/se-Drevdagen13
-rw-r--r--dvb-t/se-Duvnas13
-rw-r--r--dvb-t/se-Duvnas_Basna13
-rw-r--r--dvb-t/se-Edsbyn13
-rw-r--r--dvb-t/se-Emmaboda_Balshult52
-rw-r--r--dvb-t/se-Enviken26
-rw-r--r--dvb-t/se-Fagersta26
-rw-r--r--dvb-t/se-Falerum_Centrum13
-rw-r--r--dvb-t/se-Falun_Lovberget52
-rw-r--r--dvb-t/se-Farila13
-rw-r--r--dvb-t/se-Faro_Ajkerstrask26
-rw-r--r--dvb-t/se-Farosund_Bunge65
-rw-r--r--dvb-t/se-Filipstad_Klockarhojden52
-rw-r--r--dvb-t/se-Finnveden52
-rw-r--r--dvb-t/se-Fredriksberg13
-rw-r--r--dvb-t/se-Fritsla13
-rw-r--r--dvb-t/se-Furudal13
-rw-r--r--dvb-t/se-Gallivare52
-rw-r--r--dvb-t/se-Garpenberg_Kuppgarden13
-rw-r--r--dvb-t/se-Gavle_Skogmur52
-rw-r--r--dvb-t/se-Gnarp13
-rw-r--r--dvb-t/se-Gnesta26
-rw-r--r--dvb-t/se-Gnosjo_Marieholm13
-rw-r--r--dvb-t/se-Goteborg_Brudaremossen65
-rw-r--r--dvb-t/se-Goteborg_Slattadamm65
-rw-r--r--dvb-t/se-Gullbrandstorp13
-rw-r--r--dvb-t/se-Gunnarsbo13
-rw-r--r--dvb-t/se-Gusum13
-rw-r--r--dvb-t/se-Hagfors_Varmullsasen52
-rw-r--r--dvb-t/se-Hallaryd13
-rw-r--r--dvb-t/se-Hallbo13
-rw-r--r--dvb-t/se-Halmstad_Hamnen26
-rw-r--r--dvb-t/se-Halmstad_Oskarstrom52
-rw-r--r--dvb-t/se-Harnosand_Harnon52
-rw-r--r--dvb-t/se-Hassela13
-rw-r--r--dvb-t/se-Havdhem65
-rw-r--r--dvb-t/se-Hedemora13
-rw-r--r--dvb-t/se-Helsingborg_Olympia65
-rw-r--r--dvb-t/se-Hennan13
-rw-r--r--dvb-t/se-Hestra_Aspas13
-rw-r--r--dvb-t/se-Hjo_Grevback13
-rw-r--r--dvb-t/se-Hofors52
-rw-r--r--dvb-t/se-Hogfors13
-rw-r--r--dvb-t/se-Hogsby_Virstad26
-rw-r--r--dvb-t/se-Holsbybrunn_Holsbyholm13
-rw-r--r--dvb-t/se-Horby_Sallerup91
-rw-r--r--dvb-t/se-Horken13
-rw-r--r--dvb-t/se-Hudiksvall_Forsa52
-rw-r--r--dvb-t/se-Hudiksvall_Galgberget26
-rw-r--r--dvb-t/se-Huskvarna13
-rw-r--r--dvb-t/se-Idre13
-rw-r--r--dvb-t/se-Ingatorp13
-rw-r--r--dvb-t/se-Ingvallsbenning13
-rw-r--r--dvb-t/se-Irevik26
-rw-r--r--dvb-t/se-Jamjo26
-rw-r--r--dvb-t/se-Jarnforsen13
-rw-r--r--dvb-t/se-Jarvso13
-rw-r--r--dvb-t/se-Jokkmokk_Tjalmejaure52
-rw-r--r--dvb-t/se-Jonkoping_Bondberget52
-rw-r--r--dvb-t/se-Kalix52
-rw-r--r--dvb-t/se-Karbole13
-rw-r--r--dvb-t/se-Karlsborg_Vaberget13
-rw-r--r--dvb-t/se-Karlshamn52
-rw-r--r--dvb-t/se-Karlskrona_Vamo52
-rw-r--r--dvb-t/se-Karlstad_Sormon39
-rw-r--r--dvb-t/se-Kaxholmen_Vistakulle13
-rw-r--r--dvb-t/se-Kinnastrom13
-rw-r--r--dvb-t/se-Kiruna_Kirunavaara52
-rw-r--r--dvb-t/se-Kisa65
-rw-r--r--dvb-t/se-Knared13
-rw-r--r--dvb-t/se-Kopmanholmen52
-rw-r--r--dvb-t/se-Kopparberg26
-rw-r--r--dvb-t/se-Kramfors_Lugnvik52
-rw-r--r--dvb-t/se-Kristinehamn_Utsiktsberget52
-rw-r--r--dvb-t/se-Kungsater13
-rw-r--r--dvb-t/se-Kungsberget_GI13
-rw-r--r--dvb-t/se-Langshyttan13
-rw-r--r--dvb-t/se-Langshyttan_Engelsfors13
-rw-r--r--dvb-t/se-Leksand_Karingberget13
-rw-r--r--dvb-t/se-Lerdala13
-rw-r--r--dvb-t/se-Lilltjara_Digerberget13
-rw-r--r--dvb-t/se-Limedsforsen13
-rw-r--r--dvb-t/se-Lindshammar_Ramkvilla13
-rw-r--r--dvb-t/se-Linkoping_Vattentornet65
-rw-r--r--dvb-t/se-Ljugarn26
-rw-r--r--dvb-t/se-Loffstrand52
-rw-r--r--dvb-t/se-Lonneberga26
-rw-r--r--dvb-t/se-Lorstrand13
-rw-r--r--dvb-t/se-Ludvika_Bjorkasen26
-rw-r--r--dvb-t/se-Lumsheden_Trekanten13
-rw-r--r--dvb-t/se-Lycksele_Knaften52
-rw-r--r--dvb-t/se-Mahult13
-rw-r--r--dvb-t/se-Malmo_Jagersro65
-rw-r--r--dvb-t/se-Malung26
-rw-r--r--dvb-t/se-Mariannelund13
-rw-r--r--dvb-t/se-Markaryd_Hualtet26
-rw-r--r--dvb-t/se-Matfors52
-rw-r--r--dvb-t/se-Molndal_Vasterberget65
-rw-r--r--dvb-t/se-Mora_Eldris52
-rw-r--r--dvb-t/se-Motala_Ervasteby65
-rw-r--r--dvb-t/se-Mullsjo_Torestorp26
-rw-r--r--dvb-t/se-Nassjo52
-rw-r--r--dvb-t/se-Navekvarn13
-rw-r--r--dvb-t/se-Norrahammar13
-rw-r--r--dvb-t/se-Norrkoping_Krokek65
-rw-r--r--dvb-t/se-Norrtalje_Sodra_Bergen65
-rw-r--r--dvb-t/se-Nykoping13
-rw-r--r--dvb-t/se-Orebro_Lockhyttan65
-rw-r--r--dvb-t/se-Ornskoldsvik_As65
-rw-r--r--dvb-t/se-Oskarshamn52
-rw-r--r--dvb-t/se-Ostersund_Brattasen65
-rw-r--r--dvb-t/se-Osthammar_Valo65
-rw-r--r--dvb-t/se-Overkalix52
-rw-r--r--dvb-t/se-Oxberg13
-rw-r--r--dvb-t/se-Pajala6
-rw-r--r--dvb-t/se-Paulistom13
-rw-r--r--dvb-t/se-Rattvik13
-rw-r--r--dvb-t/se-Rengsjo13
-rw-r--r--dvb-t/se-Rorbacksnas13
-rw-r--r--dvb-t/se-Sagmyra13
-rw-r--r--dvb-t/se-Salen13
-rw-r--r--dvb-t/se-Salfjallet13
-rw-r--r--dvb-t/se-Sarna_Mickeltemplet13
-rw-r--r--dvb-t/se-Satila13
-rw-r--r--dvb-t/se-Saxdalen13
-rw-r--r--dvb-t/se-Siljansnas_Uvberget13
-rw-r--r--dvb-t/se-Skarstad13
-rw-r--r--dvb-t/se-Skattungbyn13
-rw-r--r--dvb-t/se-Skelleftea65
-rw-r--r--dvb-t/se-Skene_Nycklarberget13
-rw-r--r--dvb-t/se-Skovde65
-rw-r--r--dvb-t/se-Smedjebacken_Uvberget52
-rw-r--r--dvb-t/se-Soderhamn26
-rw-r--r--dvb-t/se-Soderkoping26
-rw-r--r--dvb-t/se-Sodertalje_Ragnhildsborg78
-rw-r--r--dvb-t/se-Solleftea_Hallsta52
-rw-r--r--dvb-t/se-Solleftea_Multra52
-rw-r--r--dvb-t/se-Sorsjon13
-rw-r--r--dvb-t/se-Stockholm_Marieberg65
-rw-r--r--dvb-t/se-Stockholm_Nacka78
-rw-r--r--dvb-t/se-Stora_Skedvi13
-rw-r--r--dvb-t/se-Storfjaten13
-rw-r--r--dvb-t/se-Storuman52
-rw-r--r--dvb-t/se-Stromstad65
-rw-r--r--dvb-t/se-Styrsjobo13
-rw-r--r--dvb-t/se-Sundborn13
-rw-r--r--dvb-t/se-Sundsbruk52
-rw-r--r--dvb-t/se-Sundsvall_S_Stadsberget65
-rw-r--r--dvb-t/se-Sunne_Blabarskullen52
-rw-r--r--dvb-t/se-Svartnas13
-rw-r--r--dvb-t/se-Sveg_Brickan52
-rw-r--r--dvb-t/se-Taberg13
-rw-r--r--dvb-t/se-Tandadalen13
-rw-r--r--dvb-t/se-Tasjo52
-rw-r--r--dvb-t/se-Tollsjo13
-rw-r--r--dvb-t/se-Torsby_Bada52
-rw-r--r--dvb-t/se-Tranas_Bredkarr26
-rw-r--r--dvb-t/se-Tranemo13
-rw-r--r--dvb-t/se-Transtrand_Bolheden26
-rw-r--r--dvb-t/se-Traryd_Betas26
-rw-r--r--dvb-t/se-Trollhattan65
-rw-r--r--dvb-t/se-Trosa26
-rw-r--r--dvb-t/se-Tystberga13
-rw-r--r--dvb-t/se-Uddevalla_Herrestad65
-rw-r--r--dvb-t/se-Ullared13
-rw-r--r--dvb-t/se-Ulricehamn26
-rw-r--r--dvb-t/se-Ulvshyttan_Porjus13
-rw-r--r--dvb-t/se-Uppsala_Rickomberga13
-rw-r--r--dvb-t/se-Uppsala_Vedyxa65
-rw-r--r--dvb-t/se-Vaddo_Elmsta26
-rw-r--r--dvb-t/se-Valdemarsvik26
-rw-r--r--dvb-t/se-Vannas_Granlundsberget52
-rw-r--r--dvb-t/se-Vansbro_Hummelberget13
-rw-r--r--dvb-t/se-Varberg_Grimeton52
-rw-r--r--dvb-t/se-Vasteras_Lillharad65
-rw-r--r--dvb-t/se-Vastervik_Farhult52
-rw-r--r--dvb-t/se-Vaxbo13
-rw-r--r--dvb-t/se-Vessigebro13
-rw-r--r--dvb-t/se-Vetlanda_Nye13
-rw-r--r--dvb-t/se-Vikmanshyttan13
-rw-r--r--dvb-t/se-Virserum52
-rw-r--r--dvb-t/se-Visby_Follingbo65
-rw-r--r--dvb-t/se-Visby_Hamnen65
-rw-r--r--dvb-t/se-Visingso13
-rw-r--r--dvb-t/se-Vislanda_Nydala52
-rw-r--r--dvb-t/se-Voxna13
-rw-r--r--dvb-t/se-Ystad_Metallgatan65
-rw-r--r--dvb-t/se-Yttermalung13
-rw-r--r--dvb-t/si-Ljubljana26
-rw-r--r--dvb-t/sk-BanskaBystrica26
-rw-r--r--dvb-t/sk-BanskaStiavnica26
-rw-r--r--dvb-t/sk-Bardejov26
-rw-r--r--dvb-t/sk-Bratislava39
-rw-r--r--dvb-t/sk-Cadca26
-rw-r--r--dvb-t/sk-Detva26
-rw-r--r--dvb-t/sk-Hnusta26
-rw-r--r--dvb-t/sk-Kosice26
-rw-r--r--dvb-t/sk-KralovskyChlmec26
-rw-r--r--dvb-t/sk-Krompachy26
-rw-r--r--dvb-t/sk-Lucenec26
-rw-r--r--dvb-t/sk-Medzev26
-rw-r--r--dvb-t/sk-Namestovo26
-rw-r--r--dvb-t/sk-Nitra26
-rw-r--r--dvb-t/sk-Poprad39
-rw-r--r--dvb-t/sk-PovazskaBystrica26
-rw-r--r--dvb-t/sk-Presov26
-rw-r--r--dvb-t/sk-Prievidza26
-rw-r--r--dvb-t/sk-Revuca26
-rw-r--r--dvb-t/sk-Roznava26
-rw-r--r--dvb-t/sk-Ruzomberok26
-rw-r--r--dvb-t/sk-Snina26
-rw-r--r--dvb-t/sk-StaraLubovna26
-rw-r--r--dvb-t/sk-Sturovo26
-rw-r--r--dvb-t/sk-Trencin26
-rw-r--r--dvb-t/sk-Zilina26
-rw-r--r--dvb-t/tw-All143
-rw-r--r--dvb-t/ua-Kharkov56
-rw-r--r--dvb-t/ua-Kiev56
-rw-r--r--dvb-t/ua-Lozovaya56
-rw-r--r--dvb-t/ua-Odessa56
-rw-r--r--dvb-t/ug-All48
-rw-r--r--dvb-t/uk-Aberdare79
-rw-r--r--dvb-t/uk-Angus79
-rw-r--r--dvb-t/uk-BeaconHill79
-rw-r--r--dvb-t/uk-Belmont93
-rw-r--r--dvb-t/uk-Bilsdale93
-rw-r--r--dvb-t/uk-BlackHill106
-rw-r--r--dvb-t/uk-Blaenplwyf79
-rw-r--r--dvb-t/uk-BluebellHill79
-rw-r--r--dvb-t/uk-Bressay79
-rw-r--r--dvb-t/uk-BrierleyHill92
-rw-r--r--dvb-t/uk-BristolIlchesterCrescent92
-rw-r--r--dvb-t/uk-BristolKingsWeston92
-rw-r--r--dvb-t/uk-Bromsgrove79
-rw-r--r--dvb-t/uk-BrougherMountain93
-rw-r--r--dvb-t/uk-Caldbeck79
-rw-r--r--dvb-t/uk-CaradonHill79
-rw-r--r--dvb-t/uk-Carmel79
-rw-r--r--dvb-t/uk-Chatton79
-rw-r--r--dvb-t/uk-Chesterfield79
-rw-r--r--dvb-t/uk-Craigkelly106
-rw-r--r--dvb-t/uk-CrystalPalace93
-rw-r--r--dvb-t/uk-Darvel79
-rw-r--r--dvb-t/uk-Divis93
-rw-r--r--dvb-t/uk-Dover79
-rw-r--r--dvb-t/uk-Durris79
-rw-r--r--dvb-t/uk-Eitshal79
-rw-r--r--dvb-t/uk-EmleyMoor106
-rw-r--r--dvb-t/uk-Fenham79
-rw-r--r--dvb-t/uk-Fenton79
-rw-r--r--dvb-t/uk-Ferryside53
-rw-r--r--dvb-t/uk-Guildford79
-rw-r--r--dvb-t/uk-Hannington93
-rw-r--r--dvb-t/uk-Hastings79
-rw-r--r--dvb-t/uk-Heathfield79
-rw-r--r--dvb-t/uk-HemelHempstead79
-rw-r--r--dvb-t/uk-HuntshawCross79
-rw-r--r--dvb-t/uk-Idle79
-rw-r--r--dvb-t/uk-KeelylangHill79
-rw-r--r--dvb-t/uk-Keighley79
-rw-r--r--dvb-t/uk-KilveyHill79
-rw-r--r--dvb-t/uk-KnockMore79
-rw-r--r--dvb-t/uk-Lancaster79
-rw-r--r--dvb-t/uk-LarkStoke79
-rw-r--r--dvb-t/uk-Limavady79
-rw-r--r--dvb-t/uk-Llanddona79
-rw-r--r--dvb-t/uk-Malvern79
-rw-r--r--dvb-t/uk-Mendip79
-rw-r--r--dvb-t/uk-Midhurst79
-rw-r--r--dvb-t/uk-MoelyParc79
-rw-r--r--dvb-t/uk-Nottingham92
-rw-r--r--dvb-t/uk-OliversMount79
-rw-r--r--dvb-t/uk-Oxford79
-rw-r--r--dvb-t/uk-PendleForest79
-rw-r--r--dvb-t/uk-Plympton79
-rw-r--r--dvb-t/uk-PontopPike106
-rw-r--r--dvb-t/uk-Pontypool79
-rw-r--r--dvb-t/uk-Preseli79
-rw-r--r--dvb-t/uk-Redruth79
-rw-r--r--dvb-t/uk-Reigate79
-rw-r--r--dvb-t/uk-RidgeHill79
-rw-r--r--dvb-t/uk-Rosemarkie79
-rw-r--r--dvb-t/uk-Rosneath79
-rw-r--r--dvb-t/uk-Rowridge106
-rw-r--r--dvb-t/uk-RumsterForest79
-rw-r--r--dvb-t/uk-Saddleworth79
-rw-r--r--dvb-t/uk-Salisbury79
-rw-r--r--dvb-t/uk-SandyHeath93
-rw-r--r--dvb-t/uk-Selkirk79
-rw-r--r--dvb-t/uk-Sheffield79
-rw-r--r--dvb-t/uk-StocklandHill79
-rw-r--r--dvb-t/uk-Storeton92
-rw-r--r--dvb-t/uk-Sudbury79
-rw-r--r--dvb-t/uk-SuttonColdfield106
-rw-r--r--dvb-t/uk-Tacolneston79
-rw-r--r--dvb-t/uk-TheWrekin79
-rw-r--r--dvb-t/uk-Torosay79
-rw-r--r--dvb-t/uk-TunbridgeWells79
-rw-r--r--dvb-t/uk-Waltham106
-rw-r--r--dvb-t/uk-Wenvoe106
-rw-r--r--dvb-t/uk-WhitehawkHill79
-rw-r--r--dvb-t/uk-WinterHill93
-rw-r--r--dvb-t/vn-Hanoi26
-rw-r--r--dvb-t/vn-Thaibinh26
733 files changed, 37549 insertions, 3642 deletions
diff --git a/dvb-t/ad-Andorra b/dvb-t/ad-Andorra
index 7c63c82..979b7bb 100644
--- a/dvb-t/ad-Andorra
+++ b/dvb-t/ad-Andorra
@@ -1,6 +1,50 @@
# 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..9fb2508 100644
--- a/dvb-t/at-All
+++ b/dvb-t/at-All
@@ -2,52 +2,591 @@
# 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 = DVBT
+ FREQUENCY = 474000000
+ 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 = 482000000
+ 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 = 490000000
+ 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 = 498000000
+ 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 = 506000000
+ 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 = 514000000
+ 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 = 522000000
+ 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 = 530000000
+ 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 = 538000000
+ 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 = 546000000
+ 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 = 554000000
+ 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 = 562000000
+ 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 = 570000000
+ 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 = 578000000
+ 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 = 578000000
+ 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
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ 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 = 594000000
+ 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 = 602000000
+ 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 = 610000000
+ 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 = 618000000
+ 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 = 626000000
+ 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 = 634000000
+ 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 = 642000000
+ 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 = 650000000
+ 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 = 658000000
+ 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 = 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 = 674000000
+ 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 = 682000000
+ 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 = 690000000
+ 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 = 698000000
+ 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 = 706000000
+ 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 = 714000000
+ 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 = 722000000
+ 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 = 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
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ 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 = 746000000
+ 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 = 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
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ 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 = 778000000
+ 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 = 786000000
+ 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 = 794000000
+ 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 = 802000000
+ 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 = 810000000
+ 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 = 826000000
+ 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
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 842000000
+ 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 = 850000000
+ 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 = 858000000
+ 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/au-Adelaide b/dvb-t/au-Adelaide
index 923e701..58e8ca0 100644
--- a/dvb-t/au-Adelaide
+++ b/dvb-t/au-Adelaide
@@ -1,14 +1,80 @@
# 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
+[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 564500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 564500000
+ 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
+
# 3D Trial Australia
-T 536625000 7MHz 3/4 NONE QAM16 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 536625000
+ BANDWIDTH_HZ = 7000000
+ CODE_RATE_HP = 3/4
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/16
+ 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..dbd6bfd 100644
--- a/dvb-t/au-AdelaideFoothills
+++ b/dvb-t/au-AdelaideFoothills
@@ -1,12 +1,67 @@
# 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..77c83c2 100644
--- a/dvb-t/au-Ballarat
+++ b/dvb-t/au-Ballarat
@@ -1,12 +1,67 @@
# 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..161a742 100644
--- a/dvb-t/au-Bendigo
+++ b/dvb-t/au-Bendigo
@@ -1,41 +1,327 @@
# 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..2cdbfdc 100644
--- a/dvb-t/au-Brisbane
+++ b/dvb-t/au-Brisbane
@@ -1,14 +1,80 @@
# 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 = 585625000
+ 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 = 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
+
diff --git a/dvb-t/au-Cairns b/dvb-t/au-Cairns
index 430045d..cea948a 100644
--- a/dvb-t/au-Cairns
+++ b/dvb-t/au-Cairns
@@ -1,12 +1,67 @@
# 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..ac52d0f 100644
--- a/dvb-t/au-Canberra-Black-Mt
+++ b/dvb-t/au-Canberra-Black-Mt
@@ -1,12 +1,67 @@
# 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
+[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
+
# Prime
-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
+
# WIN
-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
+
# Ten
-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
-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-Coonabarabran b/dvb-t/au-Coonabarabran
index 8596ba5..12300f9 100644
--- a/dvb-t/au-Coonabarabran
+++ b/dvb-t/au-Coonabarabran
@@ -3,14 +3,56 @@
# 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..243d98a 100644
--- a/dvb-t/au-Darwin
+++ b/dvb-t/au-Darwin
@@ -1,11 +1,66 @@
# 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..6ec1c7a 100644
--- a/dvb-t/au-Devonport
+++ b/dvb-t/au-Devonport
@@ -4,16 +4,93 @@
# 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..f862fee 100644
--- a/dvb-t/au-FraserCoast-Bundaberg
+++ b/dvb-t/au-FraserCoast-Bundaberg
@@ -1,12 +1,67 @@
# 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..e2aefac 100644
--- a/dvb-t/au-GoldCoast
+++ b/dvb-t/au-GoldCoast
@@ -4,18 +4,106 @@
#
# 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..de8d13b 100644
--- a/dvb-t/au-Goulburn-Rocky_Hill
+++ b/dvb-t/au-Goulburn-Rocky_Hill
@@ -4,16 +4,71 @@
# 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
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 725625000
+ 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 - netid (12802) tid (848) offset (+125Khz)
-T 746625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746625000
+ 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 - netid (12915) tid (12922) offset (+125Khz)
-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
+
# Prime - netid (12929) tid (2462) offset (+125Khz)
-T 788625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 788625000
+ 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 - netid (12812) tid (2055) offset (0Khz)
-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
+
diff --git a/dvb-t/au-Hervey_Bay-Ghost_Hill b/dvb-t/au-Hervey_Bay-Ghost_Hill
index 04dee51..866a855 100644
--- a/dvb-t/au-Hervey_Bay-Ghost_Hill
+++ b/dvb-t/au-Hervey_Bay-Ghost_Hill
@@ -3,14 +3,80 @@
# 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..cdfca66 100644
--- a/dvb-t/au-Hobart
+++ b/dvb-t/au-Hobart
@@ -1,12 +1,67 @@
# 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..76f1a5a 100644
--- a/dvb-t/au-Mackay
+++ b/dvb-t/au-Mackay
@@ -3,12 +3,67 @@
# 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..e3963b1 100644
--- a/dvb-t/au-Melbourne
+++ b/dvb-t/au-Melbourne
@@ -1,12 +1,89 @@
-# 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>
+#
+# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+# 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..ec346ff 100644
--- a/dvb-t/au-Melbourne-Selby
+++ b/dvb-t/au-Melbourne-Selby
@@ -1,13 +1,67 @@
# 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..20c55e2 100644
--- a/dvb-t/au-Melbourne-Upwey
+++ b/dvb-t/au-Melbourne-Upwey
@@ -1,12 +1,67 @@
# 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..66b3cd5 100644
--- a/dvb-t/au-MidNorthCoast
+++ b/dvb-t/au-MidNorthCoast
@@ -1,22 +1,132 @@
# 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..00b87b5 100644
--- a/dvb-t/au-Newcastle
+++ b/dvb-t/au-Newcastle
@@ -1,12 +1,67 @@
# 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 = 704500000
+ 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 = 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
+
diff --git a/dvb-t/au-Perth b/dvb-t/au-Perth
index 48c046f..7292697 100644
--- a/dvb-t/au-Perth
+++ b/dvb-t/au-Perth
@@ -1,12 +1,67 @@
# 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..52a4833 100644
--- a/dvb-t/au-Perth_Roleystone
+++ b/dvb-t/au-Perth_Roleystone
@@ -1,12 +1,67 @@
# 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..724bac5 100644
--- a/dvb-t/au-SpencerGulf
+++ b/dvb-t/au-SpencerGulf
@@ -1,8 +1,41 @@
# 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..9826c55 100644
--- a/dvb-t/au-SunshineCoast
+++ b/dvb-t/au-SunshineCoast
@@ -1,12 +1,67 @@
# 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
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 585625000
+ 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
+
# TNQ47 10 ***
-T 662625000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 662625000
+ 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
+
# ABQ62 ABC ***
-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
+
# STQ65 7 ***
-T 788625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 788625000
+ 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
+
# STQ68 WIN ***
-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
+
diff --git a/dvb-t/au-Sutherland b/dvb-t/au-Sutherland
index 6c21a73..b7fb1ac 100644
--- a/dvb-t/au-Sutherland
+++ b/dvb-t/au-Sutherland
@@ -9,12 +9,56 @@
# - 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
index 37cbae8..77db15b 100644
--- a/dvb-t/au-Sydney
+++ b/dvb-t/au-Sydney
@@ -4,14 +4,80 @@
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
#
## ABC - CH12 - ABC
-T 226500000 7MHz AUTO AUTO QAM64 8k 1/16 NONE
+[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
-T 177500000 7MHz AUTO AUTO QAM64 8k 1/16 NONE
+[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
-T 191625000 7MHz AUTO AUTO QAM64 8k 1/16 NONE
+[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
-T 219500000 7MHz AUTO AUTO QAM64 8k 1/16 NONE
+[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
-T 184500000 7MHz AUTO AUTO QAM64 8k 1/8 NONE
+[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
-T 536625000 7MHz AUTO AUTO QPSK 8k 1/8 NONE
+[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..949e1b2 100644
--- a/dvb-t/au-Sydney_Kings_Cross
+++ b/dvb-t/au-Sydney_Kings_Cross
@@ -3,12 +3,67 @@
# 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-Tamworth b/dvb-t/au-Tamworth
index 8d28c42..9e497e4 100644
--- a/dvb-t/au-Tamworth
+++ b/dvb-t/au-Tamworth
@@ -1,38 +1,203 @@
# 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..e2fed41 100644
--- a/dvb-t/au-Townsville
+++ b/dvb-t/au-Townsville
@@ -1,12 +1,67 @@
# 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..e82cfb8 100644
--- a/dvb-t/au-WaggaWagga
+++ b/dvb-t/au-WaggaWagga
@@ -1,12 +1,67 @@
# 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..1f57daf 100644
--- a/dvb-t/au-Wollongong
+++ b/dvb-t/au-Wollongong
@@ -9,27 +9,126 @@
# - 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 +136,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..ab32dff 100644
--- a/dvb-t/au-canberra
+++ b/dvb-t/au-canberra
@@ -1,12 +1,67 @@
# 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..0d89a19 100644
--- a/dvb-t/au-unknown
+++ b/dvb-t/au-unknown
@@ -1,3 +1,14 @@
# 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..c6e1829 100644
--- a/dvb-t/auto-Australia
+++ b/dvb-t/auto-Australia
@@ -8,103 +8,1203 @@
# }
#
# 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..7516c8e 100644
--- a/dvb-t/auto-Default
+++ b/dvb-t/auto-Default
@@ -6,60 +6,687 @@
# }
#
# 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..da1e03a 100644
--- a/dvb-t/auto-Taiwan
+++ b/dvb-t/auto-Taiwan
@@ -3,16 +3,159 @@
# }
#
# 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..be54895 100644
--- a/dvb-t/auto-With167kHzOffsets
+++ b/dvb-t/auto-With167kHzOffsets
@@ -8,158 +8,1863 @@
# }
#
# 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..3e77568 100644
--- a/dvb-t/ax-Smedsbole
+++ b/dvb-t/ax-Smedsbole
@@ -9,5 +9,27 @@
#
# 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..dd949f0 100644
--- a/dvb-t/be-All
+++ b/dvb-t/be-All
@@ -1,8 +1,63 @@
# 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..6f07d5b 100644
--- a/dvb-t/bg-Sofia
+++ b/dvb-t/bg-Sofia
@@ -9,8 +9,51 @@
#
# 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
index 041f38c..4602c2a 100644
--- a/dvb-t/ca-AB-Calgary
+++ b/dvb-t/ca-AB-Calgary
@@ -9,11 +9,40 @@
# 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
+#------------------------------------------------------------------------------
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 515000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 563000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 581000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 617000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 635000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = ATSC
+ FREQUENCY = 683000000
+ MODULATION = VSB/8
+ INVERSION = AUTO
+
diff --git a/dvb-t/ch-All b/dvb-t/ch-All
index 2e2e273..6cb5949 100644
--- a/dvb-t/ch-All
+++ b/dvb-t/ch-All
@@ -2,31 +2,339 @@
# 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 308cedb..d762f33 100644
--- a/dvb-t/ch-Citycable
+++ b/dvb-t/ch-Citycable
@@ -1,29 +1,326 @@
# 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 690000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 698000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 706000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 722000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 730000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 738000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 746000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 754000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 762000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 770000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 778000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 786000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 794000000 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..bd53225 100644
--- a/dvb-t/ch-Geneva
+++ b/dvb-t/ch-Geneva
@@ -2,15 +2,147 @@
# 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/cz-All b/dvb-t/cz-All
index c01c0a1..3559791 100644
--- a/dvb-t/cz-All
+++ b/dvb-t/cz-All
@@ -2,43 +2,483 @@
# 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..45e8391 100644
--- a/dvb-t/de-Baden-Wuerttemberg
+++ b/dvb-t/de-Baden-Wuerttemberg
@@ -1,19 +1,195 @@
# 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..71e312e 100644
--- a/dvb-t/de-Bayern
+++ b/dvb-t/de-Bayern
@@ -1,29 +1,238 @@
# 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, EinsPlus]
+ 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, EinsPlus]
+ 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: 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, EinsPlus]
+ 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
+[CH42: Das Erste, arte, Phoenix, EinsPlus]
+ 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, EinsPlus]
+ 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, EinsPlus]
+ 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, EinsPlus]
+ 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-Berlin b/dvb-t/de-Berlin
index 4881a88..3d2bce8 100644
--- a/dvb-t/de-Berlin
+++ b/dvb-t/de-Berlin
@@ -1,12 +1,111 @@
# 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..64e41dd 100644
--- a/dvb-t/de-Brandenburg
+++ b/dvb-t/de-Brandenburg
@@ -1,7 +1,51 @@
# 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..ecc9a13 100644
--- a/dvb-t/de-Bremen
+++ b/dvb-t/de-Bremen
@@ -1,9 +1,75 @@
# 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-Hamburg b/dvb-t/de-Hamburg
index 806e2d6..6977119 100644
--- a/dvb-t/de-Hamburg
+++ b/dvb-t/de-Hamburg
@@ -1,11 +1,99 @@
# 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..2b60d5f 100644
--- a/dvb-t/de-Hessen
+++ b/dvb-t/de-Hessen
@@ -1,19 +1,195 @@
# 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..ce5cecd 100644
--- a/dvb-t/de-Mecklenburg-Vorpommern
+++ b/dvb-t/de-Mecklenburg-Vorpommern
@@ -1,12 +1,111 @@
# 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..ed3ad49 100644
--- a/dvb-t/de-Niedersachsen
+++ b/dvb-t/de-Niedersachsen
@@ -1,29 +1,271 @@
# 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..49802c4 100644
--- a/dvb-t/de-Nordrhein-Westfalen
+++ b/dvb-t/de-Nordrhein-Westfalen
@@ -1,23 +1,232 @@
# 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..21ba979 100644
--- a/dvb-t/de-Rheinland-Pfalz
+++ b/dvb-t/de-Rheinland-Pfalz
@@ -1,11 +1,99 @@
# 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..ef83d66 100644
--- a/dvb-t/de-Saarland
+++ b/dvb-t/de-Saarland
@@ -1,7 +1,51 @@
# 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..80c1e5e 100644
--- a/dvb-t/de-Sachsen
+++ b/dvb-t/de-Sachsen
@@ -1,14 +1,135 @@
# 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..b2b61a0 100644
--- a/dvb-t/de-Sachsen-Anhalt
+++ b/dvb-t/de-Sachsen-Anhalt
@@ -1,13 +1,123 @@
# 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..9b3c2a7 100644
--- a/dvb-t/de-Schleswig-Holstein
+++ b/dvb-t/de-Schleswig-Holstein
@@ -1,18 +1,183 @@
# 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..6cd9cde 100644
--- a/dvb-t/de-Thueringen
+++ b/dvb-t/de-Thueringen
@@ -1,10 +1,87 @@
# 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..3a792fe 100644
--- a/dvb-t/dk-All
+++ b/dvb-t/dk-All
@@ -2,22 +2,231 @@
# 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
index 8aa9fce..2d2d23d 100644
--- a/dvb-t/ee-All
+++ b/dvb-t/ee-All
@@ -3,35 +3,392 @@
# and http://wiki.wifi.ee/index.php/DVB-T#Tehniline_teave
# Additional MUX info http://www.levira.ee/program.pdf
# 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 QAM16 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T2 586000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QPSK 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T2 642000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T2 674000000 8MHz 2/3 NONE QAM16 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
-T2 698000000 8MHz 2/3 NONE QAM16 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 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
-T2 786000000 8MHz 2/3 NONE QAM16 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/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..9cd548c 100644
--- a/dvb-t/es-Albacete
+++ b/dvb-t/es-Albacete
@@ -1,14 +1,146 @@
# 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..3fea14e 100644
--- a/dvb-t/es-Alfabia
+++ b/dvb-t/es-Alfabia
@@ -1,14 +1,146 @@
# 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..afdcb70 100644
--- a/dvb-t/es-Alicante
+++ b/dvb-t/es-Alicante
@@ -1,9 +1,86 @@
# 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-Alpicat b/dvb-t/es-Alpicat
index fe4f726..65df509 100644
--- a/dvb-t/es-Alpicat
+++ b/dvb-t/es-Alpicat
@@ -1,8 +1,74 @@
# 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..2ad9272 100644
--- a/dvb-t/es-Asturias
+++ b/dvb-t/es-Asturias
@@ -1,8 +1,74 @@
# 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
+[TPA TPA2]
+ 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
+
+[TVE 1, TVE 2, 24H TVE, CLAN/50 TVE, RNE1, RNE CLASICA, 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
+
+[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-BaixoMinho b/dvb-t/es-BaixoMinho
index 6f6fde4..69ae509 100644
--- a/dvb-t/es-BaixoMinho
+++ b/dvb-t/es-BaixoMinho
@@ -8,9 +8,75 @@
#
# 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..7b2d439 100644
--- a/dvb-t/es-Cadiz
+++ b/dvb-t/es-Cadiz
@@ -1,8 +1,295 @@
-# DVB-T Cadiz (Andalucia) by terrex Feb 2009
+# 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>
# 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
+[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..80d8eb3 100644
--- a/dvb-t/es-Carceres
+++ b/dvb-t/es-Carceres
@@ -1,10 +1,109 @@
# 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..16c2d33 100644
--- a/dvb-t/es-Collserola
+++ b/dvb-t/es-Collserola
@@ -1,12 +1,122 @@
# 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..e39f20f 100644
--- a/dvb-t/es-Donostia
+++ b/dvb-t/es-Donostia
@@ -1,13 +1,123 @@
# 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..79ee07d 100644
--- a/dvb-t/es-Granada
+++ b/dvb-t/es-Granada
@@ -1,8 +1,74 @@
# 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..678677d 100644
--- a/dvb-t/es-Huesca
+++ b/dvb-t/es-Huesca
@@ -3,13 +3,123 @@
# 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..a6a766e 100644
--- a/dvb-t/es-Las_Palmas
+++ b/dvb-t/es-Las_Palmas
@@ -4,15 +4,147 @@
# 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..2ae15cd 100644
--- a/dvb-t/es-Lugo
+++ b/dvb-t/es-Lugo
@@ -1,9 +1,75 @@
# 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..025c153 100644
--- a/dvb-t/es-Madrid
+++ b/dvb-t/es-Madrid
@@ -9,14 +9,135 @@
#
# 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..3dfe9a7 100644
--- a/dvb-t/es-Malaga
+++ b/dvb-t/es-Malaga
@@ -1,9 +1,74 @@
# 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..33a189e 100644
--- a/dvb-t/es-Muros-Noia
+++ b/dvb-t/es-Muros-Noia
@@ -1,9 +1,86 @@
# 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..17e6676 100644
--- a/dvb-t/es-Mussara
+++ b/dvb-t/es-Mussara
@@ -1,8 +1,74 @@
# 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..f266bb1 100644
--- a/dvb-t/es-Pamplona
+++ b/dvb-t/es-Pamplona
@@ -1,9 +1,86 @@
# 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..f314f9b 100644
--- a/dvb-t/es-SC_Tenerife
+++ b/dvb-t/es-SC_Tenerife
@@ -4,15 +4,147 @@
# 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..8b9a836 100644
--- a/dvb-t/es-Santander
+++ b/dvb-t/es-Santander
@@ -1,7 +1,51 @@
# 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..3a9f922 100644
--- a/dvb-t/es-Santiago_de_Compostela
+++ b/dvb-t/es-Santiago_de_Compostela
@@ -1,9 +1,86 @@
# 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..fce174c 100644
--- a/dvb-t/es-Sevilla
+++ b/dvb-t/es-Sevilla
@@ -2,22 +2,231 @@
# 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..f8a7b1f 100644
--- a/dvb-t/es-Tenerife
+++ b/dvb-t/es-Tenerife
@@ -1,14 +1,146 @@
# 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..fb77a01 100644
--- a/dvb-t/es-Valladolid
+++ b/dvb-t/es-Valladolid
@@ -1,7 +1,62 @@
# 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..e819dd7 100644
--- a/dvb-t/es-Vilamarxant
+++ b/dvb-t/es-Vilamarxant
@@ -1,4 +1,26 @@
# 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 df29664..7dda326 100644
--- a/dvb-t/fi-Aanekoski
+++ b/dvb-t/fi-Aanekoski
@@ -1,6 +1,23 @@
# 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 d28fec5..ff13741 100644
--- a/dvb-t/fi-Aanekoski_Konginkangas
+++ b/dvb-t/fi-Aanekoski_Konginkangas
@@ -1,6 +1,23 @@
# 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 f4280ef..aa90ea2 100644
--- a/dvb-t/fi-Ahtari
+++ b/dvb-t/fi-Ahtari
@@ -1,4 +1,13 @@
# 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 1b84fcd..712483d 100644
--- a/dvb-t/fi-Alajarvi
+++ b/dvb-t/fi-Alajarvi
@@ -1,6 +1,23 @@
# 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 1b62665..8ae1231 100644
--- a/dvb-t/fi-Anjalankoski_Ruotila
+++ b/dvb-t/fi-Anjalankoski_Ruotila
@@ -1,7 +1,28 @@
# 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_Ruotila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Anjalankoski_Ruotila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Anjalankoski_Ruotila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[Anjalankoski_Ruotila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[Anjalankoski_Ruotila]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-DNA-Espoo b/dvb-t/fi-DNA-Espoo
index d15350b..f29d2f5 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..8466fd3 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..12f5846 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..1098df5 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..12f5846 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f29d2f5 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..12f5846 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f390248 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..593b61c 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..1098df5 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..99904cd 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f29d2f5 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f390248 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f390248 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..6f1beff 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..1098df5 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f4f9b73 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f839fc9 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..6f1beff 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f29d2f5 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f29d2f5 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..6f1beff 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..593b61c 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f29d2f5 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f29d2f5 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..593b61c 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..d020070 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..b55a6aa 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f390248 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..8466fd3 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..b55a6aa 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..99904cd 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..99904cd 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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..f839fc9 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 = DVBT
+ 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 = DVBT
+ 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 = DVBT
+ 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 07b1e99..21abdbc 100644
--- a/dvb-t/fi-Enontekio_Ahovaara
+++ b/dvb-t/fi-Enontekio_Ahovaara
@@ -1,4 +1,13 @@
# 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 045a5f7..6ff6b84 100644
--- a/dvb-t/fi-Enontekio_Hetta
+++ b/dvb-t/fi-Enontekio_Hetta
@@ -1,4 +1,13 @@
# 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 d5cbbcd..f9a6af8 100644
--- a/dvb-t/fi-Enontekio_Kuttanen
+++ b/dvb-t/fi-Enontekio_Kuttanen
@@ -1,4 +1,13 @@
# 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 = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[Enontekio_Kuttanen]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Espoo b/dvb-t/fi-Espoo
index 60b4aed..03296ae 100644
--- a/dvb-t/fi-Espoo
+++ b/dvb-t/fi-Espoo
@@ -1,9 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
-# and addded new mux H
-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
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Espoo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Espoo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Espoo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Espoo]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
+[Espoo]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Eurajoki b/dvb-t/fi-Eurajoki
index daa8251..1d090a5 100644
--- a/dvb-t/fi-Eurajoki
+++ b/dvb-t/fi-Eurajoki
@@ -1,7 +1,28 @@
# 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]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Eurajoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[Eurajoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[Eurajoki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[Eurajoki]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Fiskars b/dvb-t/fi-Fiskars
index c18ed78..0f84bb7 100644
--- a/dvb-t/fi-Fiskars
+++ b/dvb-t/fi-Fiskars
@@ -1,6 +1,23 @@
# 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]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Fiskars]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Fiskars]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Fiskars]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Haapavesi b/dvb-t/fi-Haapavesi
index f586c57..8be1f62 100644
--- a/dvb-t/fi-Haapavesi
+++ b/dvb-t/fi-Haapavesi
@@ -1,6 +1,23 @@
# 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 2fd7f6e..8a98791 100644
--- a/dvb-t/fi-Hameenkyro_Kyroskoski
+++ b/dvb-t/fi-Hameenkyro_Kyroskoski
@@ -1,6 +1,23 @@
# 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 b37c1f7..9a56b2b 100644
--- a/dvb-t/fi-Hameenlinna_Painokangas
+++ b/dvb-t/fi-Hameenlinna_Painokangas
@@ -1,5 +1,18 @@
# 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 58c77f0..ab08a14 100644
--- a/dvb-t/fi-Hanko
+++ b/dvb-t/fi-Hanko
@@ -1,6 +1,23 @@
# 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 8cf7912..d10df22 100644
--- a/dvb-t/fi-Hartola
+++ b/dvb-t/fi-Hartola
@@ -1,5 +1,18 @@
# 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 3aa9fbb..b33bb39 100644
--- a/dvb-t/fi-Heinavesi
+++ b/dvb-t/fi-Heinavesi
@@ -1,5 +1,18 @@
# 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 76871b1..7a6f234 100644
--- a/dvb-t/fi-Heinola
+++ b/dvb-t/fi-Heinola
@@ -1,6 +1,23 @@
# 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 9e79003..e11f89a 100644
--- a/dvb-t/fi-Hyrynsalmi
+++ b/dvb-t/fi-Hyrynsalmi
@@ -1,5 +1,18 @@
# 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 7c339fe..f402d8a 100644
--- a/dvb-t/fi-Hyrynsalmi_Kyparavaara
+++ b/dvb-t/fi-Hyrynsalmi_Kyparavaara
@@ -1,5 +1,18 @@
# 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 04f205d..806a3c0 100644
--- a/dvb-t/fi-Hyrynsalmi_Paljakka
+++ b/dvb-t/fi-Hyrynsalmi_Paljakka
@@ -1,5 +1,18 @@
# 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 530d637..e711b16 100644
--- a/dvb-t/fi-Hyvinkaa
+++ b/dvb-t/fi-Hyvinkaa
@@ -1,6 +1,23 @@
# 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 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[Hyvinkaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyvinkaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyvinkaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 530000000
+ BANDWIDTH_HZ = 8000000
+
+[Hyvinkaa]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Ii_Raiskio b/dvb-t/fi-Ii_Raiskio
index d0bbc29..c5fda67 100644
--- a/dvb-t/fi-Ii_Raiskio
+++ b/dvb-t/fi-Ii_Raiskio
@@ -1,4 +1,13 @@
# 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 0b320a4..d281825 100644
--- a/dvb-t/fi-Iisalmi
+++ b/dvb-t/fi-Iisalmi
@@ -1,4 +1,13 @@
# 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 94e7448..885d44b 100644
--- a/dvb-t/fi-Ikaalinen
+++ b/dvb-t/fi-Ikaalinen
@@ -1,6 +1,23 @@
# 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 0cab46f..55d8202 100644
--- a/dvb-t/fi-Ikaalinen_Riitiala
+++ b/dvb-t/fi-Ikaalinen_Riitiala
@@ -1,6 +1,23 @@
# 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 7719b5d..31deb21 100644
--- a/dvb-t/fi-Inari
+++ b/dvb-t/fi-Inari
@@ -1,4 +1,13 @@
# 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 15eb2f9..37bd31e 100644
--- a/dvb-t/fi-Inari_Janispaa
+++ b/dvb-t/fi-Inari_Janispaa
@@ -1,4 +1,13 @@
# 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 1ccdb25..ba84360 100644
--- a/dvb-t/fi-Inari_Naatamo
+++ b/dvb-t/fi-Inari_Naatamo
@@ -1,4 +1,13 @@
# 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 0b42b76..70181bb 100644
--- a/dvb-t/fi-Ivalo_Saarineitamovaara
+++ b/dvb-t/fi-Ivalo_Saarineitamovaara
@@ -1,4 +1,13 @@
# 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 b61e670..9bc7058 100644
--- a/dvb-t/fi-Jalasjarvi
+++ b/dvb-t/fi-Jalasjarvi
@@ -1,6 +1,23 @@
# 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 539c92a..5d06520 100644
--- a/dvb-t/fi-Jamsa_Halli
+++ b/dvb-t/fi-Jamsa_Halli
@@ -1,6 +1,23 @@
# 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 3d3e334..ca8e563 100644
--- a/dvb-t/fi-Jamsa_Kaipola
+++ b/dvb-t/fi-Jamsa_Kaipola
@@ -1,6 +1,23 @@
# 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 c9a4c58..eacacff 100644
--- a/dvb-t/fi-Jamsa_Matkosvuori
+++ b/dvb-t/fi-Jamsa_Matkosvuori
@@ -1,6 +1,23 @@
# 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 6d5cc4e..70eb8e1 100644
--- a/dvb-t/fi-Jamsa_Ouninpohja
+++ b/dvb-t/fi-Jamsa_Ouninpohja
@@ -1,5 +1,18 @@
# 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 33618cb..142be91 100644
--- a/dvb-t/fi-Jamsankoski
+++ b/dvb-t/fi-Jamsankoski
@@ -1,6 +1,23 @@
# 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 e1b38a3..765ba1c 100644
--- a/dvb-t/fi-Joensuu_Vestinkallio
+++ b/dvb-t/fi-Joensuu_Vestinkallio
@@ -1,5 +1,18 @@
# 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 a4afcc5..5fce8db 100644
--- a/dvb-t/fi-Joroinen_Puukkola
+++ b/dvb-t/fi-Joroinen_Puukkola
@@ -1,5 +1,18 @@
# 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 c1201c5..cc44c81 100644
--- a/dvb-t/fi-Joutsa_Lankia
+++ b/dvb-t/fi-Joutsa_Lankia
@@ -1,6 +1,23 @@
# 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 3c0cce7..80337fc 100644
--- a/dvb-t/fi-Joutseno
+++ b/dvb-t/fi-Joutseno
@@ -1,7 +1,28 @@
# 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]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutseno]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutseno]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutseno]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 562000000
+ BANDWIDTH_HZ = 8000000
+
+[Joutseno]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 514000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Juupajoki_Kopsamo b/dvb-t/fi-Juupajoki_Kopsamo
index 8fb85d4..a99af77 100644
--- a/dvb-t/fi-Juupajoki_Kopsamo
+++ b/dvb-t/fi-Juupajoki_Kopsamo
@@ -1,5 +1,18 @@
# 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 7a93400..ab8a15e 100644
--- a/dvb-t/fi-Juva
+++ b/dvb-t/fi-Juva
@@ -1,6 +1,23 @@
# 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 26ca05d..3e2c51f 100644
--- a/dvb-t/fi-Jyvaskyla
+++ b/dvb-t/fi-Jyvaskyla
@@ -1,9 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-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
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Jyvaskyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
+[Jyvaskyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Jyvaskyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[Jyvaskyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[Jyvaskyla]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 506000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Jyvaskyla_Vaajakoski b/dvb-t/fi-Jyvaskyla_Vaajakoski
index 650dcb0..92b5ac9 100644
--- a/dvb-t/fi-Jyvaskyla_Vaajakoski
+++ b/dvb-t/fi-Jyvaskyla_Vaajakoski
@@ -1,5 +1,18 @@
# 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 467b7c1..7595a39 100644
--- a/dvb-t/fi-Kaavi_Sivakkavaara
+++ b/dvb-t/fi-Kaavi_Sivakkavaara
@@ -1,5 +1,18 @@
# 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 e679fbd..3ea7b90 100644
--- a/dvb-t/fi-Kajaani_Pollyvaara
+++ b/dvb-t/fi-Kajaani_Pollyvaara
@@ -1,5 +1,18 @@
# 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 913de49..cab796d 100644
--- a/dvb-t/fi-Kalajoki
+++ b/dvb-t/fi-Kalajoki
@@ -1,5 +1,18 @@
# 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 612703a..d84b2a9 100644
--- a/dvb-t/fi-Kangaslampi
+++ b/dvb-t/fi-Kangaslampi
@@ -1,6 +1,23 @@
# 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 aacf690..56476e6 100644
--- a/dvb-t/fi-Kangasniemi_Turkinmaki
+++ b/dvb-t/fi-Kangasniemi_Turkinmaki
@@ -1,6 +1,23 @@
# 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 79e4b91..a3df7ba 100644
--- a/dvb-t/fi-Kankaanpaa
+++ b/dvb-t/fi-Kankaanpaa
@@ -1,6 +1,23 @@
# 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 07cdfb6..60548c7 100644
--- a/dvb-t/fi-Karigasniemi
+++ b/dvb-t/fi-Karigasniemi
@@ -1,4 +1,13 @@
# 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 7454f98..d598f47 100644
--- a/dvb-t/fi-Karkkila
+++ b/dvb-t/fi-Karkkila
@@ -1,6 +1,23 @@
# 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]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Karkkila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[Karkkila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Karkkila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Karstula b/dvb-t/fi-Karstula
index 92ef99f..dfd3001 100644
--- a/dvb-t/fi-Karstula
+++ b/dvb-t/fi-Karstula
@@ -1,5 +1,18 @@
# 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 b27e7b2..51e89b7 100644
--- a/dvb-t/fi-Karvia
+++ b/dvb-t/fi-Karvia
@@ -1,5 +1,18 @@
# 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 7719b5d..e9fea9c 100644
--- a/dvb-t/fi-Kaunispaa
+++ b/dvb-t/fi-Kaunispaa
@@ -1,4 +1,13 @@
# 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 61c7c49..dac5d93 100644
--- a/dvb-t/fi-Kemijarvi_Suomutunturi
+++ b/dvb-t/fi-Kemijarvi_Suomutunturi
@@ -1,4 +1,13 @@
# 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 9f35fea..68f45d1 100644
--- a/dvb-t/fi-Kerimaki
+++ b/dvb-t/fi-Kerimaki
@@ -1,6 +1,23 @@
# 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 642000000 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 06f2b06..dd49b5b 100644
--- a/dvb-t/fi-Keuruu
+++ b/dvb-t/fi-Keuruu
@@ -1,6 +1,23 @@
# 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 5c11a58..cfb9b0e 100644
--- a/dvb-t/fi-Keuruu_Haapamaki
+++ b/dvb-t/fi-Keuruu_Haapamaki
@@ -1,6 +1,23 @@
# 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 57d8435..7c5c992 100644
--- a/dvb-t/fi-Kihnio
+++ b/dvb-t/fi-Kihnio
@@ -1,6 +1,23 @@
# 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 ef201aa..52e60b8 100644
--- a/dvb-t/fi-Kiihtelysvaara
+++ b/dvb-t/fi-Kiihtelysvaara
@@ -1,4 +1,13 @@
# 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 d009c9f..9d3435c 100644
--- a/dvb-t/fi-Kilpisjarvi
+++ b/dvb-t/fi-Kilpisjarvi
@@ -1,4 +1,13 @@
# 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 cf9bc63..ae4c1c9 100644
--- a/dvb-t/fi-Kittila_Levitunturi
+++ b/dvb-t/fi-Kittila_Levitunturi
@@ -1,4 +1,13 @@
# 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 b5bfaa3..f507750 100644
--- a/dvb-t/fi-Kolari_Vuolittaja
+++ b/dvb-t/fi-Kolari_Vuolittaja
@@ -1,4 +1,13 @@
# 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 331104a..034bf2d 100644
--- a/dvb-t/fi-Koli
+++ b/dvb-t/fi-Koli
@@ -1,6 +1,23 @@
# 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 33618cb..7fa3ed6 100644
--- a/dvb-t/fi-Korpilahti_Vaarunvuori
+++ b/dvb-t/fi-Korpilahti_Vaarunvuori
@@ -1,6 +1,23 @@
# 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 3a812ca..6c84241 100644
--- a/dvb-t/fi-Korppoo
+++ b/dvb-t/fi-Korppoo
@@ -1,6 +1,23 @@
# 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 80a2ca0..65d86c4 100644
--- a/dvb-t/fi-Kruunupyy
+++ b/dvb-t/fi-Kruunupyy
@@ -1,7 +1,28 @@
# 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]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Kruunupyy]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Kruunupyy]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[Kruunupyy]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Kruunupyy]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kuhmo_Haukela b/dvb-t/fi-Kuhmo_Haukela
index 424751e..c3a3bd8 100644
--- a/dvb-t/fi-Kuhmo_Haukela
+++ b/dvb-t/fi-Kuhmo_Haukela
@@ -1,5 +1,18 @@
# 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 e0e6a7e..1127999 100644
--- a/dvb-t/fi-Kuhmo_Lentiira
+++ b/dvb-t/fi-Kuhmo_Lentiira
@@ -1,5 +1,18 @@
# 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 c855b8f..6f7aa2c 100644
--- a/dvb-t/fi-Kuhmo_Niva
+++ b/dvb-t/fi-Kuhmo_Niva
@@ -1,5 +1,18 @@
# 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 528bd51..53d2de9 100644
--- a/dvb-t/fi-Kuhmoinen
+++ b/dvb-t/fi-Kuhmoinen
@@ -1,6 +1,23 @@
# 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 8c8d514..059df91 100644
--- a/dvb-t/fi-Kuhmoinen_Harjunsalmi
+++ b/dvb-t/fi-Kuhmoinen_Harjunsalmi
@@ -1,6 +1,23 @@
# 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 14bd7f2..113e0f4 100644
--- a/dvb-t/fi-Kuhmoinen_Puukkoinen
+++ b/dvb-t/fi-Kuhmoinen_Puukkoinen
@@ -1,5 +1,18 @@
# 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 1c133dc..eb39e5f 100644
--- a/dvb-t/fi-Kuopio
+++ b/dvb-t/fi-Kuopio
@@ -1,7 +1,28 @@
# 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]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuopio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 594000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuopio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 618000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuopio]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 722000000
+ BANDWIDTH_HZ = 8000000
+
+[Kuopio]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kurikka_Kesti b/dvb-t/fi-Kurikka_Kesti
index af779bb..c34cfe6 100644
--- a/dvb-t/fi-Kurikka_Kesti
+++ b/dvb-t/fi-Kurikka_Kesti
@@ -1,6 +1,23 @@
# 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 546000000 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
+
+[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 65f49ca..ecef74d 100644
--- a/dvb-t/fi-Kustavi_Viherlahti
+++ b/dvb-t/fi-Kustavi_Viherlahti
@@ -1,6 +1,23 @@
# 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 = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Kustavi_Viherlahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[Kustavi_Viherlahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Kustavi_Viherlahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Kuusamo_Hamppulampi b/dvb-t/fi-Kuusamo_Hamppulampi
index f50c275..6ce9243 100644
--- a/dvb-t/fi-Kuusamo_Hamppulampi
+++ b/dvb-t/fi-Kuusamo_Hamppulampi
@@ -1,4 +1,13 @@
# 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 6172d56..d3deab8 100644
--- a/dvb-t/fi-Kyyjarvi_Noposenaho
+++ b/dvb-t/fi-Kyyjarvi_Noposenaho
@@ -1,5 +1,18 @@
# 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 3c57266..d4bf403 100644
--- a/dvb-t/fi-Lahti
+++ b/dvb-t/fi-Lahti
@@ -1,9 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-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
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Lahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
+[Lahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Lahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Lahti]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Lahti]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Lapua b/dvb-t/fi-Lapua
index 82f9275..9084440 100644
--- a/dvb-t/fi-Lapua
+++ b/dvb-t/fi-Lapua
@@ -1,7 +1,28 @@
# 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]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 610000000
+ BANDWIDTH_HZ = 8000000
+
+[Lapua]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Lapua]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[Lapua]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Lapua]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Laukaa b/dvb-t/fi-Laukaa
index 33618cb..3c484ae 100644
--- a/dvb-t/fi-Laukaa
+++ b/dvb-t/fi-Laukaa
@@ -1,6 +1,23 @@
# 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 33618cb..5bc93a7 100644
--- a/dvb-t/fi-Laukaa_Vihtavuori
+++ b/dvb-t/fi-Laukaa_Vihtavuori
@@ -1,6 +1,23 @@
# 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 f6bbd4b..f2f1391 100644
--- a/dvb-t/fi-Lavia
+++ b/dvb-t/fi-Lavia
@@ -1,5 +1,18 @@
# 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 32da823..d040f9b 100644
--- a/dvb-t/fi-Lohja
+++ b/dvb-t/fi-Lohja
@@ -1,6 +1,23 @@
# 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]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 690000000
+ BANDWIDTH_HZ = 8000000
+
+[Lohja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 746000000
+ BANDWIDTH_HZ = 8000000
+
+[Lohja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 754000000
+ BANDWIDTH_HZ = 8000000
+
+[Lohja]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Loimaa b/dvb-t/fi-Loimaa
index 4986fa0..0b6aad8 100644
--- a/dvb-t/fi-Loimaa
+++ b/dvb-t/fi-Loimaa
@@ -1,6 +1,23 @@
# 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 2fbe272..f6407ce 100644
--- a/dvb-t/fi-Luhanka
+++ b/dvb-t/fi-Luhanka
@@ -1,6 +1,23 @@
# 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 64cf51f..9ed4e3f 100644
--- a/dvb-t/fi-Luopioinen
+++ b/dvb-t/fi-Luopioinen
@@ -1,6 +1,23 @@
# 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 138bc5d..e201405 100644
--- a/dvb-t/fi-Mantta
+++ b/dvb-t/fi-Mantta
@@ -1,6 +1,23 @@
# 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 99c20de..3b7f127 100644
--- a/dvb-t/fi-Mantyharju
+++ b/dvb-t/fi-Mantyharju
@@ -1,5 +1,18 @@
# 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 62a731c..f523878 100644
--- a/dvb-t/fi-Mikkeli
+++ b/dvb-t/fi-Mikkeli
@@ -1,6 +1,23 @@
# 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 1e3ca6d..bfdf0c7 100644
--- a/dvb-t/fi-Muonio_Olostunturi
+++ b/dvb-t/fi-Muonio_Olostunturi
@@ -1,4 +1,13 @@
# 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 07715b2..208d1c4 100644
--- a/dvb-t/fi-Nilsia
+++ b/dvb-t/fi-Nilsia
@@ -1,6 +1,23 @@
# 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 b8f04b9..bfbc561 100644
--- a/dvb-t/fi-Nilsia_Keski-Siikajarvi
+++ b/dvb-t/fi-Nilsia_Keski-Siikajarvi
@@ -1,5 +1,18 @@
# 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 9aa9d01..8c8ee34 100644
--- a/dvb-t/fi-Nilsia_Pisa
+++ b/dvb-t/fi-Nilsia_Pisa
@@ -1,5 +1,18 @@
# 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 188bcff..2a2b380 100644
--- a/dvb-t/fi-Nokia
+++ b/dvb-t/fi-Nokia
@@ -1,6 +1,23 @@
# 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 188bcff..1ba3cca 100644
--- a/dvb-t/fi-Nokia_Siuro
+++ b/dvb-t/fi-Nokia_Siuro
@@ -1,6 +1,23 @@
# 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 1a45304..08840cc 100644
--- a/dvb-t/fi-Nummi-Pusula_Hyonola
+++ b/dvb-t/fi-Nummi-Pusula_Hyonola
@@ -1,6 +1,23 @@
# 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 6ac1d3c..e1c1c3e 100644
--- a/dvb-t/fi-Nuorgam_Njallavaara
+++ b/dvb-t/fi-Nuorgam_Njallavaara
@@ -1,4 +1,13 @@
# 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 f65625a..2b2cb3c 100644
--- a/dvb-t/fi-Nuorgam_raja
+++ b/dvb-t/fi-Nuorgam_raja
@@ -1,4 +1,13 @@
# 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
+
+[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 6174c37..7cd3d91 100644
--- a/dvb-t/fi-Nurmes_Konnanvaara
+++ b/dvb-t/fi-Nurmes_Konnanvaara
@@ -1,6 +1,23 @@
# 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 21eef15..3e118ad 100644
--- a/dvb-t/fi-Nurmes_Kortevaara
+++ b/dvb-t/fi-Nurmes_Kortevaara
@@ -1,5 +1,18 @@
# 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 eae855a..149782e 100644
--- a/dvb-t/fi-Orivesi_Talviainen
+++ b/dvb-t/fi-Orivesi_Talviainen
@@ -1,5 +1,18 @@
# 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 8ddd3e9..6d10849 100644
--- a/dvb-t/fi-Oulu
+++ b/dvb-t/fi-Oulu
@@ -1,9 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-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
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Oulu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 634000000
+ BANDWIDTH_HZ = 8000000
+
+[Oulu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Oulu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[Oulu]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 602000000
+ BANDWIDTH_HZ = 8000000
+
+[Oulu]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 498000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Padasjoki b/dvb-t/fi-Padasjoki
index 1a5eabc..47246b4 100644
--- a/dvb-t/fi-Padasjoki
+++ b/dvb-t/fi-Padasjoki
@@ -1,6 +1,23 @@
# 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 ae93adb..c8c1b05 100644
--- a/dvb-t/fi-Padasjoki_Arrakoski
+++ b/dvb-t/fi-Padasjoki_Arrakoski
@@ -1,6 +1,23 @@
# 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 c1de40a..56f8ba0 100644
--- a/dvb-t/fi-Paltamo_Kivesvaara
+++ b/dvb-t/fi-Paltamo_Kivesvaara
@@ -1,5 +1,18 @@
# 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 3a812ca..e187814 100644
--- a/dvb-t/fi-Parainen_Houtskari
+++ b/dvb-t/fi-Parainen_Houtskari
@@ -1,6 +1,23 @@
# 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 d0ecaa2..f0f52f7 100644
--- a/dvb-t/fi-Parikkala
+++ b/dvb-t/fi-Parikkala
@@ -1,6 +1,23 @@
# 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 1a01504..62e8507 100644
--- a/dvb-t/fi-Parkano_Sopukallio
+++ b/dvb-t/fi-Parkano_Sopukallio
@@ -1,6 +1,23 @@
# 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 e48aed0..2cbd28e 100644
--- a/dvb-t/fi-Pello
+++ b/dvb-t/fi-Pello
@@ -1,4 +1,13 @@
# 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 599a241..ff7f660 100644
--- a/dvb-t/fi-Pello_Ratasvaara
+++ b/dvb-t/fi-Pello_Ratasvaara
@@ -1,4 +1,13 @@
# 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 f17f23a..0a7a2dc 100644
--- a/dvb-t/fi-Perho
+++ b/dvb-t/fi-Perho
@@ -1,6 +1,23 @@
# 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 a032ca2..5459e88 100644
--- a/dvb-t/fi-Pernaja
+++ b/dvb-t/fi-Pernaja
@@ -1,5 +1,18 @@
# 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 9f38363..f03f9a0 100644
--- a/dvb-t/fi-Pieksamaki_Halkokumpu
+++ b/dvb-t/fi-Pieksamaki_Halkokumpu
@@ -1,5 +1,18 @@
# 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 b390296..42cdd29 100644
--- a/dvb-t/fi-Pihtipudas
+++ b/dvb-t/fi-Pihtipudas
@@ -1,5 +1,18 @@
# 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 66c87ee..7b5e79d 100644
--- a/dvb-t/fi-Porvoo_Suomenkyla
+++ b/dvb-t/fi-Porvoo_Suomenkyla
@@ -1,6 +1,23 @@
# 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 290acbb..0258647 100644
--- a/dvb-t/fi-Posio
+++ b/dvb-t/fi-Posio
@@ -1,4 +1,13 @@
# 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 49becf6..dc85d9a 100644
--- a/dvb-t/fi-Pudasjarvi
+++ b/dvb-t/fi-Pudasjarvi
@@ -1,5 +1,18 @@
# 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 8325687..24cebdd 100644
--- a/dvb-t/fi-Pudasjarvi_Iso-Syote
+++ b/dvb-t/fi-Pudasjarvi_Iso-Syote
@@ -1,5 +1,18 @@
# 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 e6f402d..cb91163 100644
--- a/dvb-t/fi-Pudasjarvi_Kangasvaara
+++ b/dvb-t/fi-Pudasjarvi_Kangasvaara
@@ -1,4 +1,13 @@
# 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 4498bb5..3370a9a 100644
--- a/dvb-t/fi-Puolanka
+++ b/dvb-t/fi-Puolanka
@@ -1,6 +1,23 @@
# 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 caa90fc..c500576 100644
--- a/dvb-t/fi-Pyhatunturi
+++ b/dvb-t/fi-Pyhatunturi
@@ -1,4 +1,13 @@
# 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 f0e89cb..ad23265 100644
--- a/dvb-t/fi-Pyhavuori
+++ b/dvb-t/fi-Pyhavuori
@@ -1,5 +1,18 @@
# 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 a49cf8d..2d7ef17 100644
--- a/dvb-t/fi-Pylkonmaki_Karankajarvi
+++ b/dvb-t/fi-Pylkonmaki_Karankajarvi
@@ -1,5 +1,18 @@
# 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 7b23e15..e4cc7b1 100644
--- a/dvb-t/fi-Raahe_Mestauskallio
+++ b/dvb-t/fi-Raahe_Mestauskallio
@@ -1,6 +1,23 @@
# 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 8760532..1b3836d 100644
--- a/dvb-t/fi-Raahe_Piehinki
+++ b/dvb-t/fi-Raahe_Piehinki
@@ -1,5 +1,18 @@
# 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 618000000 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 62927cd..837a10f 100644
--- a/dvb-t/fi-Ranua_Haasionmaa
+++ b/dvb-t/fi-Ranua_Haasionmaa
@@ -1,4 +1,13 @@
# 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 72a32c9..94d3eef 100644
--- a/dvb-t/fi-Ranua_Leppiaho
+++ b/dvb-t/fi-Ranua_Leppiaho
@@ -1,4 +1,13 @@
# 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 6720d8b..c89e4bf 100644
--- a/dvb-t/fi-Rautavaara_Angervikko
+++ b/dvb-t/fi-Rautavaara_Angervikko
@@ -1,6 +1,23 @@
# 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 d7efefe..2d4c254 100644
--- a/dvb-t/fi-Rautjarvi_Simpele
+++ b/dvb-t/fi-Rautjarvi_Simpele
@@ -1,5 +1,18 @@
# 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 ef0ea15..79a58c3 100644
--- a/dvb-t/fi-Ristijarvi
+++ b/dvb-t/fi-Ristijarvi
@@ -1,5 +1,18 @@
# 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 c86d368..87a65b1 100644
--- a/dvb-t/fi-Rovaniemi
+++ b/dvb-t/fi-Rovaniemi
@@ -1,5 +1,18 @@
# 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 65e1060..3808ebc 100644
--- a/dvb-t/fi-Rovaniemi_Kaihuanvaara
+++ b/dvb-t/fi-Rovaniemi_Kaihuanvaara
@@ -1,4 +1,13 @@
# 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 b5bfaa3..069ecb4 100644
--- a/dvb-t/fi-Rovaniemi_Karhuvaara
+++ b/dvb-t/fi-Rovaniemi_Karhuvaara
@@ -1,4 +1,13 @@
# 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 2b873f6..6c8d542 100644
--- a/dvb-t/fi-Rovaniemi_Marasenkallio
+++ b/dvb-t/fi-Rovaniemi_Marasenkallio
@@ -1,4 +1,13 @@
# 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 db61425..fe3ea4c 100644
--- a/dvb-t/fi-Rovaniemi_Rantalaki
+++ b/dvb-t/fi-Rovaniemi_Rantalaki
@@ -1,4 +1,13 @@
# 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 2b873f6..932b409 100644
--- a/dvb-t/fi-Rovaniemi_Sonka
+++ b/dvb-t/fi-Rovaniemi_Sonka
@@ -1,4 +1,13 @@
# 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 4679f10..feb3bcf 100644
--- a/dvb-t/fi-Rovaniemi_Sorviselka
+++ b/dvb-t/fi-Rovaniemi_Sorviselka
@@ -1,4 +1,13 @@
# 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 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 b66db0f..de41ddc 100644
--- a/dvb-t/fi-Ruka
+++ b/dvb-t/fi-Ruka
@@ -1,5 +1,18 @@
# 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 2fd7f6e..ac465cb 100644
--- a/dvb-t/fi-Ruovesi_Storminiemi
+++ b/dvb-t/fi-Ruovesi_Storminiemi
@@ -1,6 +1,23 @@
# 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 64c5a71..18c923f 100644
--- a/dvb-t/fi-Saarijarvi
+++ b/dvb-t/fi-Saarijarvi
@@ -1,6 +1,23 @@
# 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 a49cf8d..77d5ade 100644
--- a/dvb-t/fi-Saarijarvi_Kalmari
+++ b/dvb-t/fi-Saarijarvi_Kalmari
@@ -1,5 +1,18 @@
# 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 23dc82d..48324d0 100644
--- a/dvb-t/fi-Saarijarvi_Mahlu
+++ b/dvb-t/fi-Saarijarvi_Mahlu
@@ -1,5 +1,18 @@
# 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 5f15fdf..e1410a0 100644
--- a/dvb-t/fi-Salla_Hirvasvaara
+++ b/dvb-t/fi-Salla_Hirvasvaara
@@ -1,4 +1,13 @@
# 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 d80d5a3..0d857b5 100644
--- a/dvb-t/fi-Salla_Ihistysjanka
+++ b/dvb-t/fi-Salla_Ihistysjanka
@@ -1,4 +1,13 @@
# 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 706000000 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 b6e4ae2..06bc1ba 100644
--- a/dvb-t/fi-Salla_Naruska
+++ b/dvb-t/fi-Salla_Naruska
@@ -1,4 +1,13 @@
# 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 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 0b320a4..54a5554 100644
--- a/dvb-t/fi-Salla_Sallatunturi
+++ b/dvb-t/fi-Salla_Sallatunturi
@@ -1,4 +1,13 @@
# 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 0b320a4..eb9bbc0 100644
--- a/dvb-t/fi-Salla_Sarivaara
+++ b/dvb-t/fi-Salla_Sarivaara
@@ -1,4 +1,13 @@
# 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 1898810..42df3b4 100644
--- a/dvb-t/fi-Salo_Isokyla
+++ b/dvb-t/fi-Salo_Isokyla
@@ -1,6 +1,23 @@
# 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 = 514000000
+ BANDWIDTH_HZ = 8000000
+
+[Salo_Isokyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 666000000
+ BANDWIDTH_HZ = 8000000
+
+[Salo_Isokyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Salo_Isokyla]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 570000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Savukoski_Martti b/dvb-t/fi-Savukoski_Martti
index ea5fade..aafbdcb 100644
--- a/dvb-t/fi-Savukoski_Martti
+++ b/dvb-t/fi-Savukoski_Martti
@@ -1,4 +1,13 @@
# 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 9d018a0..91f5fa7 100644
--- a/dvb-t/fi-Savukoski_Tanhua
+++ b/dvb-t/fi-Savukoski_Tanhua
@@ -1,4 +1,13 @@
# 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 41f7378..7fc1f47 100644
--- a/dvb-t/fi-Siilinjarvi
+++ b/dvb-t/fi-Siilinjarvi
@@ -1,6 +1,23 @@
# 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
index 705ee6a..580c7bd 100644
--- a/dvb-t/fi-Simo_Viantie
+++ b/dvb-t/fi-Simo_Viantie
@@ -1,5 +1,18 @@
# 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 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+[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 78bf7f7..abfb413 100644
--- a/dvb-t/fi-Sipoo_Norrkulla
+++ b/dvb-t/fi-Sipoo_Norrkulla
@@ -1,6 +1,23 @@
# 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 a1b1ea5..a123f64 100644
--- a/dvb-t/fi-Sodankyla_Pittiovaara
+++ b/dvb-t/fi-Sodankyla_Pittiovaara
@@ -1,4 +1,13 @@
# 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 3122c87..9c60b77 100644
--- a/dvb-t/fi-Sodankyla_Vuotso
+++ b/dvb-t/fi-Sodankyla_Vuotso
@@ -1,4 +1,13 @@
# 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 60245bd..31bdd61 100644
--- a/dvb-t/fi-Sulkava_Vaatalanmaki
+++ b/dvb-t/fi-Sulkava_Vaatalanmaki
@@ -1,5 +1,18 @@
# 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 9efc445..0878a88 100644
--- a/dvb-t/fi-Suomussalmi_Ala-Vuokki
+++ b/dvb-t/fi-Suomussalmi_Ala-Vuokki
@@ -1,4 +1,13 @@
# 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 540d52b..9afceff 100644
--- a/dvb-t/fi-Suomussalmi_Ammansaari
+++ b/dvb-t/fi-Suomussalmi_Ammansaari
@@ -1,4 +1,13 @@
# 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 540d52b..66c4e5b 100644
--- a/dvb-t/fi-Suomussalmi_Juntusranta
+++ b/dvb-t/fi-Suomussalmi_Juntusranta
@@ -1,4 +1,13 @@
# 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 4438848..9630977 100644
--- a/dvb-t/fi-Suomussalmi_Myllylahti
+++ b/dvb-t/fi-Suomussalmi_Myllylahti
@@ -1,4 +1,13 @@
# 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 d5d676a..9db4424 100644
--- a/dvb-t/fi-Sysma_Liikola
+++ b/dvb-t/fi-Sysma_Liikola
@@ -1,6 +1,23 @@
# 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 33500d6..c307ae4 100644
--- a/dvb-t/fi-Taivalkoski
+++ b/dvb-t/fi-Taivalkoski
@@ -1,4 +1,13 @@
# 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 532d4b3..ff81bf0 100644
--- a/dvb-t/fi-Taivalkoski_Taivalvaara
+++ b/dvb-t/fi-Taivalkoski_Taivalvaara
@@ -1,4 +1,13 @@
# 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 b1fa332..f537bef 100644
--- a/dvb-t/fi-Tammela
+++ b/dvb-t/fi-Tammela
@@ -1,7 +1,28 @@
# 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]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 482000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammela]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 522000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammela]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 706000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammela]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 650000000
+ BANDWIDTH_HZ = 8000000
+
+[Tammela]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 546000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Tammisaari b/dvb-t/fi-Tammisaari
index 827e46a..5248fd2 100644
--- a/dvb-t/fi-Tammisaari
+++ b/dvb-t/fi-Tammisaari
@@ -1,6 +1,23 @@
# 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 1fe7933..1440032 100644
--- a/dvb-t/fi-Tampere
+++ b/dvb-t/fi-Tampere
@@ -1,9 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-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
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Tampere]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 578000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 490000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 770000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 778000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Tampere_Pyynikki b/dvb-t/fi-Tampere_Pyynikki
index 748e8a0..03e8ecc 100644
--- a/dvb-t/fi-Tampere_Pyynikki
+++ b/dvb-t/fi-Tampere_Pyynikki
@@ -1,7 +1,28 @@
# 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]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 626000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere_Pyynikki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere_Pyynikki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 682000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere_Pyynikki]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 586000000
+ BANDWIDTH_HZ = 8000000
+
+[Tampere_Pyynikki]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 642000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Tervola b/dvb-t/fi-Tervola
index bdd08bf..d2c2d94 100644
--- a/dvb-t/fi-Tervola
+++ b/dvb-t/fi-Tervola
@@ -1,5 +1,18 @@
# 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 407295c..281048d 100644
--- a/dvb-t/fi-Turku
+++ b/dvb-t/fi-Turku
@@ -1,9 +1,28 @@
-# 2014-05-31 Olli Salonen <olli.salonen@iki.fi>
-# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumero$
-# and addded new mux H
-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
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+# 2014-04-18 Antti Palosaari <crope@iki.fi>
+# generated from http://www.digita.fi/kuluttajat/tv/nakyvyysalueet/kanavanumerot_ja_taajuudet
+
+[Turku]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 714000000
+ BANDWIDTH_HZ = 8000000
+
+[Turku]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 738000000
+ BANDWIDTH_HZ = 8000000
+
+[Turku]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 762000000
+ BANDWIDTH_HZ = 8000000
+
+[Turku]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 786000000
+ BANDWIDTH_HZ = 8000000
+
+[Turku]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Utsjoki b/dvb-t/fi-Utsjoki
index 46a9277..b884a17 100644
--- a/dvb-t/fi-Utsjoki
+++ b/dvb-t/fi-Utsjoki
@@ -1,4 +1,13 @@
# 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 d0a768d..66d35a3 100644
--- a/dvb-t/fi-Utsjoki_Nuvvus
+++ b/dvb-t/fi-Utsjoki_Nuvvus
@@ -1,4 +1,13 @@
# 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 07cdfb6..53a75af 100644
--- a/dvb-t/fi-Utsjoki_Outakoski
+++ b/dvb-t/fi-Utsjoki_Outakoski
@@ -1,4 +1,13 @@
# 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 07cdfb6..0ee4ceb 100644
--- a/dvb-t/fi-Utsjoki_Polvarniemi
+++ b/dvb-t/fi-Utsjoki_Polvarniemi
@@ -1,4 +1,13 @@
# 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 97cd05f..7459a8d 100644
--- a/dvb-t/fi-Utsjoki_Rovisuvanto
+++ b/dvb-t/fi-Utsjoki_Rovisuvanto
@@ -1,4 +1,13 @@
# 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 41ed175..9650439 100644
--- a/dvb-t/fi-Utsjoki_Tenola
+++ b/dvb-t/fi-Utsjoki_Tenola
@@ -1,4 +1,13 @@
# 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 640fb25..abe1f7f 100644
--- a/dvb-t/fi-Uusikaupunki_Orivo
+++ b/dvb-t/fi-Uusikaupunki_Orivo
@@ -1,6 +1,23 @@
# 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 1f7fb09..86e8773 100644
--- a/dvb-t/fi-Vaala
+++ b/dvb-t/fi-Vaala
@@ -1,5 +1,18 @@
# 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 396a5a3..7826313 100644
--- a/dvb-t/fi-Vaasa
+++ b/dvb-t/fi-Vaasa
@@ -1,5 +1,18 @@
# 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 64d7d3a..81e8245 100644
--- a/dvb-t/fi-Valtimo
+++ b/dvb-t/fi-Valtimo
@@ -1,5 +1,18 @@
# 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 a4474ae..26582a8 100644
--- a/dvb-t/fi-Vammala_Jyranvuori
+++ b/dvb-t/fi-Vammala_Jyranvuori
@@ -1,6 +1,23 @@
# 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 649c383..53f3793 100644
--- a/dvb-t/fi-Vammala_Roismala
+++ b/dvb-t/fi-Vammala_Roismala
@@ -1,5 +1,18 @@
# 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 fe0102c..189afb4 100644
--- a/dvb-t/fi-Vammala_Savi
+++ b/dvb-t/fi-Vammala_Savi
@@ -1,5 +1,18 @@
# 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 91e721d..af493a1 100644
--- a/dvb-t/fi-Vantaa_Hakunila
+++ b/dvb-t/fi-Vantaa_Hakunila
@@ -1,6 +1,23 @@
# 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 = 658000000
+ BANDWIDTH_HZ = 8000000
+
+[Vantaa_Hakunila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 674000000
+ BANDWIDTH_HZ = 8000000
+
+[Vantaa_Hakunila]
+ DELIVERY_SYSTEM = DVBT
+ FREQUENCY = 730000000
+ BANDWIDTH_HZ = 8000000
+
diff --git a/dvb-t/fi-Varpaisjarvi_Honkamaki b/dvb-t/fi-Varpaisjarvi_Honkamaki
index bca52ed..5bdf974 100644
--- a/dvb-t/fi-Varpaisjarvi_Honkamaki
+++ b/dvb-t/fi-Varpaisjarvi_Honkamaki
@@ -1,6 +1,23 @@
# 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 39992e2..61f12b0 100644
--- a/dvb-t/fi-Virrat_Lappavuori
+++ b/dvb-t/fi-Virrat_Lappavuori
@@ -1,6 +1,23 @@
# 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 bf8b49c..5a78cf3 100644
--- a/dvb-t/fi-Vuokatti
+++ b/dvb-t/fi-Vuokatti
@@ -1,6 +1,23 @@
# 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 34d9e04..ebd72b9 100644
--- a/dvb-t/fi-Ylitornio_Ainiovaara
+++ b/dvb-t/fi-Ylitornio_Ainiovaara
@@ -1,5 +1,18 @@
# 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 2be87c6..885c18f 100644
--- a/dvb-t/fi-Ylitornio_Raanujarvi
+++ b/dvb-t/fi-Ylitornio_Raanujarvi
@@ -1,4 +1,13 @@
# 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 e48aed0..0488cfb 100644
--- a/dvb-t/fi-Yllas
+++ b/dvb-t/fi-Yllas
@@ -1,4 +1,13 @@
# 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 4887a06..6790089 100644
--- a/dvb-t/fi-Yllasjarvi
+++ b/dvb-t/fi-Yllasjarvi
@@ -1,4 +1,13 @@
# 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 ec64c89..d8ed1f5 100644
--- a/dvb-t/fr-All
+++ b/dvb-t/fr-All
@@ -1,42 +1,482 @@
# 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/gr-Athens b/dvb-t/gr-Athens
index f683333..1e6b795 100644
--- a/dvb-t/gr-Athens
+++ b/dvb-t/gr-Athens
@@ -1,5 +1,38 @@
# 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
+[Digea DVB-T]
+ 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/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[Digea DVB-T]
+ 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/8
+ 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/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/hk-HongKong b/dvb-t/hk-HongKong
index 4c332ff..db0b5b4 100644
--- a/dvb-t/hk-HongKong
+++ b/dvb-t/hk-HongKong
@@ -2,17 +2,94 @@
# 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..50c644a 100644
--- a/dvb-t/hr-All
+++ b/dvb-t/hr-All
@@ -2,29 +2,315 @@
# 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..adfb3e7 100644
--- a/dvb-t/hu-Bekescsaba
+++ b/dvb-t/hu-Bekescsaba
@@ -4,13 +4,35 @@
# 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 +40,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..1147daa 100644
--- a/dvb-t/hu-Budapest
+++ b/dvb-t/hu-Budapest
@@ -4,13 +4,35 @@
# 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 +40,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..50eb531 100644
--- a/dvb-t/hu-Csavoly-Kiskoros
+++ b/dvb-t/hu-Csavoly-Kiskoros
@@ -4,7 +4,18 @@
# 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 +29,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..e347c17 100644
--- a/dvb-t/hu-Debrecen-Komadi
+++ b/dvb-t/hu-Debrecen-Komadi
@@ -4,13 +4,35 @@
# 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 +40,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..67c282b 100644
--- a/dvb-t/hu-Fehergyarmat
+++ b/dvb-t/hu-Fehergyarmat
@@ -4,7 +4,18 @@
# 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 +29,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..f68e34e 100644
--- a/dvb-t/hu-Gerecse-Dorog-Tatabanya
+++ b/dvb-t/hu-Gerecse-Dorog-Tatabanya
@@ -4,13 +4,35 @@
# 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 +40,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..76208cd 100644
--- a/dvb-t/hu-Gyor
+++ b/dvb-t/hu-Gyor
@@ -4,13 +4,35 @@
# 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 +40,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..a50563e 100644
--- a/dvb-t/hu-Kabhegy-Kaposvar-Tamasi
+++ b/dvb-t/hu-Kabhegy-Kaposvar-Tamasi
@@ -4,7 +4,18 @@
# 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 +29,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..89fddb8 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
@@ -4,13 +4,35 @@
# 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 +40,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..eeefb7b 100644
--- a/dvb-t/hu-Karcag
+++ b/dvb-t/hu-Karcag
@@ -4,13 +4,35 @@
# 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 +40,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..29b3d5e 100644
--- a/dvb-t/hu-Kecskemet
+++ b/dvb-t/hu-Kecskemet
@@ -4,13 +4,35 @@
# 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 +40,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..c635d67 100644
--- a/dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd
+++ b/dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd
@@ -4,13 +4,35 @@
# 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 +40,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..06a7a0c 100644
--- a/dvb-t/hu-Miskolc-Aggtelek-Fony
+++ b/dvb-t/hu-Miskolc-Aggtelek-Fony
@@ -4,13 +4,35 @@
# 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 +40,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..e6614db 100644
--- a/dvb-t/hu-Mor-Siofok-Veszprem-Zirc
+++ b/dvb-t/hu-Mor-Siofok-Veszprem-Zirc
@@ -4,13 +4,35 @@
# 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 +40,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..093627e 100644
--- a/dvb-t/hu-Nagykanizsa-Barcs-Keszthely
+++ b/dvb-t/hu-Nagykanizsa-Barcs-Keszthely
@@ -4,13 +4,35 @@
# 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 +40,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..38f26ad 100644
--- a/dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely
+++ b/dvb-t/hu-Nyiregyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely
@@ -4,13 +4,35 @@
# 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 +40,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..c36e4b6 100644
--- a/dvb-t/hu-Pecs-Siklos
+++ b/dvb-t/hu-Pecs-Siklos
@@ -4,7 +4,18 @@
# 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 +29,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..a1e6afb 100644
--- a/dvb-t/hu-Sopron-Koszeg
+++ b/dvb-t/hu-Sopron-Koszeg
@@ -4,13 +4,35 @@
# 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 +40,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..8e3d955 100644
--- a/dvb-t/hu-Szeged
+++ b/dvb-t/hu-Szeged
@@ -4,13 +4,35 @@
# 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 +40,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..bdacbba 100644
--- a/dvb-t/hu-Szekesfehervar
+++ b/dvb-t/hu-Szekesfehervar
@@ -4,13 +4,35 @@
# 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 +40,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..f7647e5 100644
--- a/dvb-t/hu-Szentes-Battonya
+++ b/dvb-t/hu-Szentes-Battonya
@@ -4,7 +4,18 @@
# 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 +29,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..1a0f6a1 100644
--- a/dvb-t/hu-Szolnok
+++ b/dvb-t/hu-Szolnok
@@ -4,13 +4,35 @@
# 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 +40,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..12dc414 100644
--- a/dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg
+++ b/dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg
@@ -4,13 +4,35 @@
# 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 +40,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..dfad17d 100644
--- a/dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar
+++ b/dvb-t/hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar
@@ -4,13 +4,35 @@
# 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 +40,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..d8024b4 100644
--- a/dvb-t/ie-CairnHill
+++ b/dvb-t/ie-CairnHill
@@ -1,5 +1,27 @@
# 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..4ff062f 100644
--- a/dvb-t/ie-ClermontCarn
+++ b/dvb-t/ie-ClermontCarn
@@ -1,5 +1,27 @@
# 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..53825b8 100644
--- a/dvb-t/ie-Dungarvan
+++ b/dvb-t/ie-Dungarvan
@@ -1,5 +1,27 @@
# 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..e9f1295 100644
--- a/dvb-t/ie-HolywellHill
+++ b/dvb-t/ie-HolywellHill
@@ -1,5 +1,27 @@
# 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..4d2a94b 100644
--- a/dvb-t/ie-Kippure
+++ b/dvb-t/ie-Kippure
@@ -1,5 +1,27 @@
# 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..6840992 100644
--- a/dvb-t/ie-Maghera
+++ b/dvb-t/ie-Maghera
@@ -1,5 +1,27 @@
# 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..2e53b6c 100644
--- a/dvb-t/ie-MountLeinster
+++ b/dvb-t/ie-MountLeinster
@@ -1,5 +1,27 @@
# 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..64c923f 100644
--- a/dvb-t/ie-Mullaghanish
+++ b/dvb-t/ie-Mullaghanish
@@ -1,5 +1,27 @@
# 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..b195c57 100644
--- a/dvb-t/ie-SpurHill
+++ b/dvb-t/ie-SpurHill
@@ -1,5 +1,27 @@
# 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..4baef48 100644
--- a/dvb-t/ie-ThreeRock
+++ b/dvb-t/ie-ThreeRock
@@ -1,5 +1,27 @@
# 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..c069606 100644
--- a/dvb-t/ie-Truskmore
+++ b/dvb-t/ie-Truskmore
@@ -1,5 +1,27 @@
# 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..18dfc23 100644
--- a/dvb-t/ie-WoodcockHill
+++ b/dvb-t/ie-WoodcockHill
@@ -1,5 +1,27 @@
# 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..99fd432 100644
--- a/dvb-t/il-All
+++ b/dvb-t/il-All
@@ -1,5 +1,27 @@
# 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..357a595 100644
--- a/dvb-t/ir-Tehran
+++ b/dvb-t/ir-Tehran
@@ -1,4 +1,26 @@
# 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..c61f451 100644
--- a/dvb-t/is-Reykjavik
+++ b/dvb-t/is-Reykjavik
@@ -9,21 +9,219 @@
#
# 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..4ded812 100644
--- a/dvb-t/it-All
+++ b/dvb-t/it-All
@@ -16,120 +16,747 @@
### 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/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..dad588b 100644
--- a/dvb-t/lu-All
+++ b/dvb-t/lu-All
@@ -1,6 +1,50 @@
# 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..26aa03a 100644
--- a/dvb-t/lv-Riga
+++ b/dvb-t/lv-Riga
@@ -5,21 +5,89 @@
# 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..612ebdf 100644
--- a/dvb-t/nl-All
+++ b/dvb-t/nl-All
@@ -1,44 +1,484 @@
# 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..c77f43b 100644
--- a/dvb-t/no-Trondelag_Stjordal
+++ b/dvb-t/no-Trondelag_Stjordal
@@ -2,6 +2,39 @@
# 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..5274612 100644
--- a/dvb-t/nz-AucklandInfill
+++ b/dvb-t/nz-AucklandInfill
@@ -5,6 +5,39 @@
#
# 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..6172cb6 100644
--- a/dvb-t/nz-AucklandWaiatarua
+++ b/dvb-t/nz-AucklandWaiatarua
@@ -5,6 +5,39 @@
#
# 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..b569574 100644
--- a/dvb-t/nz-Christchurch
+++ b/dvb-t/nz-Christchurch
@@ -5,6 +5,39 @@
#
# 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..d3f5764 100644
--- a/dvb-t/nz-Dunedin
+++ b/dvb-t/nz-Dunedin
@@ -5,6 +5,39 @@
#
# 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..69cd706 100644
--- a/dvb-t/nz-Hamilton
+++ b/dvb-t/nz-Hamilton
@@ -5,6 +5,39 @@
#
# 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..9afa464 100644
--- a/dvb-t/nz-HawkesBayMtErin
+++ b/dvb-t/nz-HawkesBayMtErin
@@ -5,6 +5,39 @@
#
# 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..edda0e3 100644
--- a/dvb-t/nz-HawkesBayNapier
+++ b/dvb-t/nz-HawkesBayNapier
@@ -5,6 +5,39 @@
#
# 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..91953ca 100644
--- a/dvb-t/nz-Manawatu
+++ b/dvb-t/nz-Manawatu
@@ -5,6 +5,39 @@
#
# 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..063f0d8 100644
--- a/dvb-t/nz-Tauranga
+++ b/dvb-t/nz-Tauranga
@@ -5,6 +5,39 @@
#
# 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..11ddbfb 100644
--- a/dvb-t/nz-Waikato
+++ b/dvb-t/nz-Waikato
@@ -5,6 +5,39 @@
#
# 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..b96bd16 100644
--- a/dvb-t/nz-WellingtonInfill
+++ b/dvb-t/nz-WellingtonInfill
@@ -5,6 +5,39 @@
#
# 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..20d89fd 100644
--- a/dvb-t/nz-WellingtonKaukau
+++ b/dvb-t/nz-WellingtonKaukau
@@ -5,6 +5,39 @@
#
# 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..8dc1c47 100644
--- a/dvb-t/nz-WellingtonNgarara
+++ b/dvb-t/nz-WellingtonNgarara
@@ -5,6 +5,39 @@
#
# 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..06b047b 100644
--- a/dvb-t/pl-Czestochowa
+++ b/dvb-t/pl-Czestochowa
@@ -9,6 +9,39 @@
#
# 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..1f7d3b4 100644
--- a/dvb-t/pl-Gdansk
+++ b/dvb-t/pl-Gdansk
@@ -1,4 +1,26 @@
# 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..461debc 100644
--- a/dvb-t/pl-Krakow
+++ b/dvb-t/pl-Krakow
@@ -9,9 +9,75 @@
#
# 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-Rzeszow b/dvb-t/pl-Rzeszow
index 561705e..d012c7b 100644
--- a/dvb-t/pl-Rzeszow
+++ b/dvb-t/pl-Rzeszow
@@ -1,3 +1,14 @@
# 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-Warszawa b/dvb-t/pl-Warszawa
deleted file mode 100644
index 6ea4bb6..0000000
--- a/dvb-t/pl-Warszawa
+++ /dev/null
@@ -1,10 +0,0 @@
-# location : PL Warszawa mazowieckie
-# date scanned : 2011-11-17
-#
-# 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 #
diff --git a/dvb-t/pl-Wroclaw b/dvb-t/pl-Wroclaw
index d6b0f9b..87abc20 100644
--- a/dvb-t/pl-Wroclaw
+++ b/dvb-t/pl-Wroclaw
@@ -1,3 +1,14 @@
# 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..d8fde37 100644
--- a/dvb-t/pt-All
+++ b/dvb-t/pt-All
@@ -1,9 +1,86 @@
# 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..77d182c 100644
--- a/dvb-t/ro-Bucharest
+++ b/dvb-t/ro-Bucharest
@@ -1,5 +1,38 @@
# 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..c1d6b10 100644
--- a/dvb-t/ru-Krasnodar
+++ b/dvb-t/ru-Krasnodar
@@ -1,6 +1,54 @@
# 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
+
+[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 = 2
+ 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 = 3
+ INVERSION = AUTO
+
diff --git a/dvb-t/ru-Novosibirsk b/dvb-t/ru-Novosibirsk
index 443c7e4..c6d1ca9 100644
--- a/dvb-t/ru-Novosibirsk
+++ b/dvb-t/ru-Novosibirsk
@@ -1,6 +1,54 @@
# 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
+
+[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 = 2
+ 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 = 3
+ INVERSION = AUTO
+
diff --git a/dvb-t/ru-Volgodonsk b/dvb-t/ru-Volgodonsk
index 2089a70..6978e0a 100644
--- a/dvb-t/ru-Volgodonsk
+++ b/dvb-t/ru-Volgodonsk
@@ -1,6 +1,54 @@
# 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
+
+[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 = 2
+ 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 = 3
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Alvdalen_Brunnsberg b/dvb-t/se-Alvdalen_Brunnsberg
index d9e5427..192ceb0 100644
--- a/dvb-t/se-Alvdalen_Brunnsberg
+++ b/dvb-t/se-Alvdalen_Brunnsberg
@@ -1,3 +1,14 @@
# 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..52c89ff 100644
--- a/dvb-t/se-Alvdalsasen
+++ b/dvb-t/se-Alvdalsasen
@@ -1,3 +1,14 @@
# 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-Alvsbyn b/dvb-t/se-Alvsbyn
index 214928d..9040ac5 100644
--- a/dvb-t/se-Alvsbyn
+++ b/dvb-t/se-Alvsbyn
@@ -1,7 +1,62 @@
# 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
+
diff --git a/dvb-t/se-Amot b/dvb-t/se-Amot
index f93453c..240992e 100644
--- a/dvb-t/se-Amot
+++ b/dvb-t/se-Amot
@@ -1,3 +1,14 @@
# 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-Ange_Snoberg b/dvb-t/se-Ange_Snoberg
index 661ec98..25d14c6 100644
--- a/dvb-t/se-Ange_Snoberg
+++ b/dvb-t/se-Ange_Snoberg
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Angebo b/dvb-t/se-Angebo
index ee67956..005f250 100644
--- a/dvb-t/se-Angebo
+++ b/dvb-t/se-Angebo
@@ -1,3 +1,14 @@
# 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 = 802000000
+ BANDWIDTH_HZ = 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-Angelholm_Vegeholm b/dvb-t/se-Angelholm_Vegeholm
index fd79bf7..b5de978 100644
--- a/dvb-t/se-Angelholm_Vegeholm
+++ b/dvb-t/se-Angelholm_Vegeholm
@@ -1,7 +1,62 @@
# 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 = 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
+
+[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
+
+[CHANNEL]
+ 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/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[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
+
+[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/se-Arvidsjaur_Jultrask b/dvb-t/se-Arvidsjaur_Jultrask
index 4b559b8..16d1829 100644
--- a/dvb-t/se-Arvidsjaur_Jultrask
+++ b/dvb-t/se-Arvidsjaur_Jultrask
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Aspeboda b/dvb-t/se-Aspeboda
index 825b96b..b534a08 100644
--- a/dvb-t/se-Aspeboda
+++ b/dvb-t/se-Aspeboda
@@ -1,3 +1,14 @@
# 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..a72b224 100644
--- a/dvb-t/se-Atvidaberg
+++ b/dvb-t/se-Atvidaberg
@@ -1,4 +1,26 @@
# 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 = 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 = 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-Avesta_Krylbo b/dvb-t/se-Avesta_Krylbo
index e454a41..f092d43 100644
--- a/dvb-t/se-Avesta_Krylbo
+++ b/dvb-t/se-Avesta_Krylbo
@@ -1,4 +1,26 @@
# 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 = 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
+
diff --git a/dvb-t/se-Backefors b/dvb-t/se-Backefors
index d681425..2ebbbaf 100644
--- a/dvb-t/se-Backefors
+++ b/dvb-t/se-Backefors
@@ -1,7 +1,62 @@
# 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 = 586000000
+ 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 = 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
+
+[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
+
+[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
+
+[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/se-Bankeryd b/dvb-t/se-Bankeryd
index 06faa37..f4179a3 100644
--- a/dvb-t/se-Bankeryd
+++ b/dvb-t/se-Bankeryd
@@ -1,4 +1,26 @@
# 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 = 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 = 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/se-Bergsjo_Balleberget b/dvb-t/se-Bergsjo_Balleberget
index 0c95297..53a8eae 100644
--- a/dvb-t/se-Bergsjo_Balleberget
+++ b/dvb-t/se-Bergsjo_Balleberget
@@ -1,3 +1,14 @@
# 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..1ae0962 100644
--- a/dvb-t/se-Bergvik
+++ b/dvb-t/se-Bergvik
@@ -1,3 +1,14 @@
# 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-Bollebygd b/dvb-t/se-Bollebygd
index 155df13..ac6ae37 100644
--- a/dvb-t/se-Bollebygd
+++ b/dvb-t/se-Bollebygd
@@ -1,4 +1,26 @@
# 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 = 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 = 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-Bollnas b/dvb-t/se-Bollnas
index 38eaf1b..f7f8f53 100644
--- a/dvb-t/se-Bollnas
+++ b/dvb-t/se-Bollnas
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Boras_Dalsjofors b/dvb-t/se-Boras_Dalsjofors
index ea73212..a53b40c 100644
--- a/dvb-t/se-Boras_Dalsjofors
+++ b/dvb-t/se-Boras_Dalsjofors
@@ -1,7 +1,62 @@
# 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
+ 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 = 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 = 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
+
+[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/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Boras_Sjobo b/dvb-t/se-Boras_Sjobo
index 9e1dfe2..3dd1a5e 100644
--- a/dvb-t/se-Boras_Sjobo
+++ b/dvb-t/se-Boras_Sjobo
@@ -1,4 +1,26 @@
# 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 = 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 = 810000000
+ BANDWIDTH_HZ = 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-Borlange_Idkerberget b/dvb-t/se-Borlange_Idkerberget
index e30e298..5f8ef45 100644
--- a/dvb-t/se-Borlange_Idkerberget
+++ b/dvb-t/se-Borlange_Idkerberget
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Borlange_Nygardarna b/dvb-t/se-Borlange_Nygardarna
index c4caad9..a49f18b 100644
--- a/dvb-t/se-Borlange_Nygardarna
+++ b/dvb-t/se-Borlange_Nygardarna
@@ -1,4 +1,26 @@
# 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
+
diff --git a/dvb-t/se-Bottnaryd_Ryd b/dvb-t/se-Bottnaryd_Ryd
index 88545b4..2bb99ec 100644
--- a/dvb-t/se-Bottnaryd_Ryd
+++ b/dvb-t/se-Bottnaryd_Ryd
@@ -1,3 +1,14 @@
# 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-Bromsebro b/dvb-t/se-Bromsebro
index 7dc23bc..4017ffb 100644
--- a/dvb-t/se-Bromsebro
+++ b/dvb-t/se-Bromsebro
@@ -1,4 +1,26 @@
# 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 = 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 = 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-Bruzaholm b/dvb-t/se-Bruzaholm
index d2d82b4..12ad504 100644
--- a/dvb-t/se-Bruzaholm
+++ b/dvb-t/se-Bruzaholm
@@ -1,3 +1,14 @@
# 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-Byxelkrok b/dvb-t/se-Byxelkrok
index 280accd..894800c 100644
--- a/dvb-t/se-Byxelkrok
+++ b/dvb-t/se-Byxelkrok
@@ -1,4 +1,26 @@
# 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..8550d04 100644
--- a/dvb-t/se-Dadran
+++ b/dvb-t/se-Dadran
@@ -1,3 +1,14 @@
# 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 = 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-Dalfors b/dvb-t/se-Dalfors
index b9f5c76..fd562b9 100644
--- a/dvb-t/se-Dalfors
+++ b/dvb-t/se-Dalfors
@@ -1,3 +1,14 @@
# 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-Dalstuga b/dvb-t/se-Dalstuga
index d7f5374..97ab8ec 100644
--- a/dvb-t/se-Dalstuga
+++ b/dvb-t/se-Dalstuga
@@ -1,3 +1,14 @@
# 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-Degerfors b/dvb-t/se-Degerfors
index c0dc0b9..3675378 100644
--- a/dvb-t/se-Degerfors
+++ b/dvb-t/se-Degerfors
@@ -1,6 +1,50 @@
# 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
+ 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 = 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 = 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-Delary b/dvb-t/se-Delary
index 3c9fdf9..5bf8b6e 100644
--- a/dvb-t/se-Delary
+++ b/dvb-t/se-Delary
@@ -1,3 +1,14 @@
# 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-Djura b/dvb-t/se-Djura
index c532219..c05429c 100644
--- a/dvb-t/se-Djura
+++ b/dvb-t/se-Djura
@@ -1,3 +1,14 @@
# 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-Drevdagen b/dvb-t/se-Drevdagen
index 8b331c9..66fbde9 100644
--- a/dvb-t/se-Drevdagen
+++ b/dvb-t/se-Drevdagen
@@ -1,3 +1,14 @@
# 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-Duvnas b/dvb-t/se-Duvnas
index 4fea089..c5e0edb 100644
--- a/dvb-t/se-Duvnas
+++ b/dvb-t/se-Duvnas
@@ -1,3 +1,14 @@
# 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..b1cde35 100644
--- a/dvb-t/se-Duvnas_Basna
+++ b/dvb-t/se-Duvnas_Basna
@@ -1,3 +1,14 @@
# 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-Edsbyn b/dvb-t/se-Edsbyn
index a8a3eaa..7236176 100644
--- a/dvb-t/se-Edsbyn
+++ b/dvb-t/se-Edsbyn
@@ -1,3 +1,14 @@
# 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-Emmaboda_Balshult b/dvb-t/se-Emmaboda_Balshult
index 0e6a2f8..90dea6d 100644
--- a/dvb-t/se-Emmaboda_Balshult
+++ b/dvb-t/se-Emmaboda_Balshult
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Enviken b/dvb-t/se-Enviken
index 0744d26..d99e211 100644
--- a/dvb-t/se-Enviken
+++ b/dvb-t/se-Enviken
@@ -1,4 +1,26 @@
# 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 = 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 = 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-Fagersta b/dvb-t/se-Fagersta
index 9de6d73..84d2c08 100644
--- a/dvb-t/se-Fagersta
+++ b/dvb-t/se-Fagersta
@@ -1,4 +1,26 @@
# 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-Falerum_Centrum b/dvb-t/se-Falerum_Centrum
index 36d5496..60ce0f8 100644
--- a/dvb-t/se-Falerum_Centrum
+++ b/dvb-t/se-Falerum_Centrum
@@ -1,3 +1,14 @@
# 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-Falun_Lovberget b/dvb-t/se-Falun_Lovberget
index 8b6cd13..94461e0 100644
--- a/dvb-t/se-Falun_Lovberget
+++ b/dvb-t/se-Falun_Lovberget
@@ -1,6 +1,50 @@
# 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
+ 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
+
diff --git a/dvb-t/se-Farila b/dvb-t/se-Farila
index b1c1840..5773cfb 100644
--- a/dvb-t/se-Farila
+++ b/dvb-t/se-Farila
@@ -1,3 +1,14 @@
# 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-Faro_Ajkerstrask b/dvb-t/se-Faro_Ajkerstrask
index 7bdbed7..782c5ec 100644
--- a/dvb-t/se-Faro_Ajkerstrask
+++ b/dvb-t/se-Faro_Ajkerstrask
@@ -1,4 +1,26 @@
# 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-Farosund_Bunge b/dvb-t/se-Farosund_Bunge
index 4148e0b..74b9ca7 100644
--- a/dvb-t/se-Farosund_Bunge
+++ b/dvb-t/se-Farosund_Bunge
@@ -1,7 +1,62 @@
# 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
+ 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-Filipstad_Klockarhojden b/dvb-t/se-Filipstad_Klockarhojden
index a30d2ad..1e50e2f 100644
--- a/dvb-t/se-Filipstad_Klockarhojden
+++ b/dvb-t/se-Filipstad_Klockarhojden
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Finnveden b/dvb-t/se-Finnveden
index f577cfd..e3aa235 100644
--- a/dvb-t/se-Finnveden
+++ b/dvb-t/se-Finnveden
@@ -1,6 +1,50 @@
# 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
+ 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 = 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 = 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/se-Fredriksberg b/dvb-t/se-Fredriksberg
index 3838a7b..d4474c2 100644
--- a/dvb-t/se-Fredriksberg
+++ b/dvb-t/se-Fredriksberg
@@ -1,3 +1,14 @@
# 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-Fritsla b/dvb-t/se-Fritsla
index fd5dc30..32516b3 100644
--- a/dvb-t/se-Fritsla
+++ b/dvb-t/se-Fritsla
@@ -1,3 +1,14 @@
# 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-Furudal b/dvb-t/se-Furudal
index ca847cf..940df8d 100644
--- a/dvb-t/se-Furudal
+++ b/dvb-t/se-Furudal
@@ -1,3 +1,14 @@
# 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-Gallivare b/dvb-t/se-Gallivare
index 27167ea..3945775 100644
--- a/dvb-t/se-Gallivare
+++ b/dvb-t/se-Gallivare
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Garpenberg_Kuppgarden b/dvb-t/se-Garpenberg_Kuppgarden
index bcd7685..cd6ce33 100644
--- a/dvb-t/se-Garpenberg_Kuppgarden
+++ b/dvb-t/se-Garpenberg_Kuppgarden
@@ -1,3 +1,14 @@
# 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..ce4ca34 100644
--- a/dvb-t/se-Gavle_Skogmur
+++ b/dvb-t/se-Gavle_Skogmur
@@ -1,6 +1,50 @@
# 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
+ 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 = 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-Gnarp b/dvb-t/se-Gnarp
index b47e78a..f2ce7c6 100644
--- a/dvb-t/se-Gnarp
+++ b/dvb-t/se-Gnarp
@@ -1,3 +1,14 @@
# 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..6b9f192 100644
--- a/dvb-t/se-Gnesta
+++ b/dvb-t/se-Gnesta
@@ -1,4 +1,26 @@
# 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..ea86a27 100644
--- a/dvb-t/se-Gnosjo_Marieholm
+++ b/dvb-t/se-Gnosjo_Marieholm
@@ -1,3 +1,14 @@
# 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-Goteborg_Brudaremossen b/dvb-t/se-Goteborg_Brudaremossen
index 80d57a7..bc1004d 100644
--- a/dvb-t/se-Goteborg_Brudaremossen
+++ b/dvb-t/se-Goteborg_Brudaremossen
@@ -1,7 +1,62 @@
# 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
+ 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 = 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 = 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
+
+[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/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Goteborg_Slattadamm b/dvb-t/se-Goteborg_Slattadamm
index 11ccd75..4a38249 100644
--- a/dvb-t/se-Goteborg_Slattadamm
+++ b/dvb-t/se-Goteborg_Slattadamm
@@ -1,7 +1,62 @@
# 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 = 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 = 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 = 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 = 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
+
+[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/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Gullbrandstorp b/dvb-t/se-Gullbrandstorp
index c407b0d..27484df 100644
--- a/dvb-t/se-Gullbrandstorp
+++ b/dvb-t/se-Gullbrandstorp
@@ -1,3 +1,14 @@
# 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-Gunnarsbo b/dvb-t/se-Gunnarsbo
index d79b851..0c2b024 100644
--- a/dvb-t/se-Gunnarsbo
+++ b/dvb-t/se-Gunnarsbo
@@ -1,3 +1,14 @@
# 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-Gusum b/dvb-t/se-Gusum
index 21411cf..09917e5 100644
--- a/dvb-t/se-Gusum
+++ b/dvb-t/se-Gusum
@@ -1,3 +1,14 @@
# 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-Hagfors_Varmullsasen b/dvb-t/se-Hagfors_Varmullsasen
index f013fb3..387a4ae 100644
--- a/dvb-t/se-Hagfors_Varmullsasen
+++ b/dvb-t/se-Hagfors_Varmullsasen
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 802000000
+ BANDWIDTH_HZ = 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-Hallaryd b/dvb-t/se-Hallaryd
index 5d21d8a..5d27850 100644
--- a/dvb-t/se-Hallaryd
+++ b/dvb-t/se-Hallaryd
@@ -1,3 +1,14 @@
# 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-Hallbo b/dvb-t/se-Hallbo
index ed0f8da..c56a2a6 100644
--- a/dvb-t/se-Hallbo
+++ b/dvb-t/se-Hallbo
@@ -1,3 +1,14 @@
# 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-Halmstad_Hamnen b/dvb-t/se-Halmstad_Hamnen
index 50c88f3..44caa31 100644
--- a/dvb-t/se-Halmstad_Hamnen
+++ b/dvb-t/se-Halmstad_Hamnen
@@ -1,4 +1,26 @@
# 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 = 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 = 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-Halmstad_Oskarstrom b/dvb-t/se-Halmstad_Oskarstrom
index 9fc5537..5f6407c 100644
--- a/dvb-t/se-Halmstad_Oskarstrom
+++ b/dvb-t/se-Halmstad_Oskarstrom
@@ -1,6 +1,50 @@
# 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
+ 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
+
diff --git a/dvb-t/se-Harnosand_Harnon b/dvb-t/se-Harnosand_Harnon
index 242088e..9820c48 100644
--- a/dvb-t/se-Harnosand_Harnon
+++ b/dvb-t/se-Harnosand_Harnon
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Hassela b/dvb-t/se-Hassela
index 7ce0767..688d90d 100644
--- a/dvb-t/se-Hassela
+++ b/dvb-t/se-Hassela
@@ -1,3 +1,14 @@
# 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..2d0e280 100644
--- a/dvb-t/se-Havdhem
+++ b/dvb-t/se-Havdhem
@@ -1,7 +1,62 @@
# 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-Hedemora b/dvb-t/se-Hedemora
index 94dc5e3..4fd8e0c 100644
--- a/dvb-t/se-Hedemora
+++ b/dvb-t/se-Hedemora
@@ -1,3 +1,14 @@
# 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 = 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-Helsingborg_Olympia b/dvb-t/se-Helsingborg_Olympia
index 4358f61..137dd5a 100644
--- a/dvb-t/se-Helsingborg_Olympia
+++ b/dvb-t/se-Helsingborg_Olympia
@@ -1,7 +1,62 @@
# 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 = 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
+
+[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
+
+[CHANNEL]
+ 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/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[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
+
+[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/se-Hennan b/dvb-t/se-Hennan
index cd1605a..6ba3b61 100644
--- a/dvb-t/se-Hennan
+++ b/dvb-t/se-Hennan
@@ -1,3 +1,14 @@
# 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..1ac2f38 100644
--- a/dvb-t/se-Hestra_Aspas
+++ b/dvb-t/se-Hestra_Aspas
@@ -1,3 +1,14 @@
# 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..1a3645f 100644
--- a/dvb-t/se-Hjo_Grevback
+++ b/dvb-t/se-Hjo_Grevback
@@ -1,3 +1,14 @@
# 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..f1f2948 100644
--- a/dvb-t/se-Hofors
+++ b/dvb-t/se-Hofors
@@ -1,6 +1,50 @@
# 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
+ 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 = 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 = 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-Hogfors b/dvb-t/se-Hogfors
index 514f1e5..6cc4686 100644
--- a/dvb-t/se-Hogfors
+++ b/dvb-t/se-Hogfors
@@ -1,3 +1,14 @@
# 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-Hogsby_Virstad b/dvb-t/se-Hogsby_Virstad
index 0cc2ad6..d1927b9 100644
--- a/dvb-t/se-Hogsby_Virstad
+++ b/dvb-t/se-Hogsby_Virstad
@@ -1,4 +1,26 @@
# 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
+ 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
+
diff --git a/dvb-t/se-Holsbybrunn_Holsbyholm b/dvb-t/se-Holsbybrunn_Holsbyholm
index e5a1d7b..bafa87b 100644
--- a/dvb-t/se-Holsbybrunn_Holsbyholm
+++ b/dvb-t/se-Holsbybrunn_Holsbyholm
@@ -1,3 +1,14 @@
# 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..8f6352f 100644
--- a/dvb-t/se-Horby_Sallerup
+++ b/dvb-t/se-Horby_Sallerup
@@ -1,9 +1,86 @@
# 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 = 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
+
+[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
+
+[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/4
+ 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 = 8K
+ GUARD_INTERVAL = 1/4
+ 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/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[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
+
+[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/se-Horken b/dvb-t/se-Horken
index 6f3fcdb..d43d9a1 100644
--- a/dvb-t/se-Horken
+++ b/dvb-t/se-Horken
@@ -1,3 +1,14 @@
# 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-Hudiksvall_Forsa b/dvb-t/se-Hudiksvall_Forsa
index c8bad49..b667c8b 100644
--- a/dvb-t/se-Hudiksvall_Forsa
+++ b/dvb-t/se-Hudiksvall_Forsa
@@ -1,6 +1,50 @@
# 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
+ 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 = 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
+
diff --git a/dvb-t/se-Hudiksvall_Galgberget b/dvb-t/se-Hudiksvall_Galgberget
index b95873e..a70bcb3 100644
--- a/dvb-t/se-Hudiksvall_Galgberget
+++ b/dvb-t/se-Hudiksvall_Galgberget
@@ -1,4 +1,26 @@
# 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
+ 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
+
diff --git a/dvb-t/se-Huskvarna b/dvb-t/se-Huskvarna
index 2c6a5ca..4357054 100644
--- a/dvb-t/se-Huskvarna
+++ b/dvb-t/se-Huskvarna
@@ -1,3 +1,14 @@
# 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-Idre b/dvb-t/se-Idre
index 912aa70..6156d06 100644
--- a/dvb-t/se-Idre
+++ b/dvb-t/se-Idre
@@ -1,3 +1,14 @@
# 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 = 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-Ingatorp b/dvb-t/se-Ingatorp
index 11d37b5..d075eb8 100644
--- a/dvb-t/se-Ingatorp
+++ b/dvb-t/se-Ingatorp
@@ -1,3 +1,14 @@
# 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..b000302 100644
--- a/dvb-t/se-Ingvallsbenning
+++ b/dvb-t/se-Ingvallsbenning
@@ -1,3 +1,14 @@
# 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 = 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-Irevik b/dvb-t/se-Irevik
index 1530771..47853c9 100644
--- a/dvb-t/se-Irevik
+++ b/dvb-t/se-Irevik
@@ -1,4 +1,26 @@
# 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-Jamjo b/dvb-t/se-Jamjo
index 0c14927..399fe96 100644
--- a/dvb-t/se-Jamjo
+++ b/dvb-t/se-Jamjo
@@ -1,4 +1,26 @@
# 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-Jarnforsen b/dvb-t/se-Jarnforsen
index d129f35..258a47f 100644
--- a/dvb-t/se-Jarnforsen
+++ b/dvb-t/se-Jarnforsen
@@ -1,3 +1,14 @@
# 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-Jarvso b/dvb-t/se-Jarvso
index c779daf..703d120 100644
--- a/dvb-t/se-Jarvso
+++ b/dvb-t/se-Jarvso
@@ -1,3 +1,14 @@
# 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-Jokkmokk_Tjalmejaure b/dvb-t/se-Jokkmokk_Tjalmejaure
index 74d4ca3..57398bf 100644
--- a/dvb-t/se-Jokkmokk_Tjalmejaure
+++ b/dvb-t/se-Jokkmokk_Tjalmejaure
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Jonkoping_Bondberget b/dvb-t/se-Jonkoping_Bondberget
index 5c0d21e..73bccaa 100644
--- a/dvb-t/se-Jonkoping_Bondberget
+++ b/dvb-t/se-Jonkoping_Bondberget
@@ -1,6 +1,50 @@
# 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
+ 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 = 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
+
diff --git a/dvb-t/se-Kalix b/dvb-t/se-Kalix
index 21a29a8..dca9fe5 100644
--- a/dvb-t/se-Kalix
+++ b/dvb-t/se-Kalix
@@ -1,6 +1,50 @@
# 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 = 706000000
+ 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 = 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
+
+[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
+
+[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
+
diff --git a/dvb-t/se-Karbole b/dvb-t/se-Karbole
index 9f28422..2619f75 100644
--- a/dvb-t/se-Karbole
+++ b/dvb-t/se-Karbole
@@ -1,3 +1,14 @@
# 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-Karlsborg_Vaberget b/dvb-t/se-Karlsborg_Vaberget
index b84b8e8..05a38e4 100644
--- a/dvb-t/se-Karlsborg_Vaberget
+++ b/dvb-t/se-Karlsborg_Vaberget
@@ -1,3 +1,14 @@
# 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..b793edd 100644
--- a/dvb-t/se-Karlshamn
+++ b/dvb-t/se-Karlshamn
@@ -1,6 +1,50 @@
# 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 = 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
+
+[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
+
+[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
+
+[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/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Karlskrona_Vamo b/dvb-t/se-Karlskrona_Vamo
index 68e38ae..48b281a 100644
--- a/dvb-t/se-Karlskrona_Vamo
+++ b/dvb-t/se-Karlskrona_Vamo
@@ -1,6 +1,50 @@
# 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 = 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
+
+[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
+
+[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
+
+[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/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Karlstad_Sormon b/dvb-t/se-Karlstad_Sormon
index 658bc70..2a3ffe4 100644
--- a/dvb-t/se-Karlstad_Sormon
+++ b/dvb-t/se-Karlstad_Sormon
@@ -2,8 +2,41 @@
# 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
+[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
+
# Mux4=42
-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
+
# Mux1=43
-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-Kaxholmen_Vistakulle b/dvb-t/se-Kaxholmen_Vistakulle
index ede8ad9..abadade 100644
--- a/dvb-t/se-Kaxholmen_Vistakulle
+++ b/dvb-t/se-Kaxholmen_Vistakulle
@@ -1,3 +1,14 @@
# 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..fa78d89 100644
--- a/dvb-t/se-Kinnastrom
+++ b/dvb-t/se-Kinnastrom
@@ -1,3 +1,14 @@
# 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..8d8e351 100644
--- a/dvb-t/se-Kiruna_Kirunavaara
+++ b/dvb-t/se-Kiruna_Kirunavaara
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Kisa b/dvb-t/se-Kisa
index 21d4bc3..718a750 100644
--- a/dvb-t/se-Kisa
+++ b/dvb-t/se-Kisa
@@ -1,7 +1,62 @@
# 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
+
diff --git a/dvb-t/se-Knared b/dvb-t/se-Knared
index 2feda10..73810ff 100644
--- a/dvb-t/se-Knared
+++ b/dvb-t/se-Knared
@@ -1,3 +1,14 @@
# 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-Kopmanholmen b/dvb-t/se-Kopmanholmen
index f9f9541..a1ca5e6 100644
--- a/dvb-t/se-Kopmanholmen
+++ b/dvb-t/se-Kopmanholmen
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Kopparberg b/dvb-t/se-Kopparberg
index af84cfe..fdd9abd 100644
--- a/dvb-t/se-Kopparberg
+++ b/dvb-t/se-Kopparberg
@@ -1,4 +1,26 @@
# 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 = 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 = 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-Kramfors_Lugnvik b/dvb-t/se-Kramfors_Lugnvik
index f17f8c1..ccf13ca 100644
--- a/dvb-t/se-Kramfors_Lugnvik
+++ b/dvb-t/se-Kramfors_Lugnvik
@@ -1,6 +1,50 @@
# 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 = 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 = 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
+
diff --git a/dvb-t/se-Kristinehamn_Utsiktsberget b/dvb-t/se-Kristinehamn_Utsiktsberget
index 71c465d..0e4c597 100644
--- a/dvb-t/se-Kristinehamn_Utsiktsberget
+++ b/dvb-t/se-Kristinehamn_Utsiktsberget
@@ -1,6 +1,50 @@
# 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 = 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
+
+[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/4
+ 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/4
+ 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/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Kungsater b/dvb-t/se-Kungsater
index 0876dba..a18ba12 100644
--- a/dvb-t/se-Kungsater
+++ b/dvb-t/se-Kungsater
@@ -1,3 +1,14 @@
# 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-Kungsberget_GI b/dvb-t/se-Kungsberget_GI
index 0c4eeb3..8720dad 100644
--- a/dvb-t/se-Kungsberget_GI
+++ b/dvb-t/se-Kungsberget_GI
@@ -1,3 +1,14 @@
# 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-Langshyttan b/dvb-t/se-Langshyttan
index bbba370..f35840f 100644
--- a/dvb-t/se-Langshyttan
+++ b/dvb-t/se-Langshyttan
@@ -1,3 +1,14 @@
# 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..edf5715 100644
--- a/dvb-t/se-Langshyttan_Engelsfors
+++ b/dvb-t/se-Langshyttan_Engelsfors
@@ -1,3 +1,14 @@
# 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 = 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-Leksand_Karingberget b/dvb-t/se-Leksand_Karingberget
index 2d15561..5e91fa2 100644
--- a/dvb-t/se-Leksand_Karingberget
+++ b/dvb-t/se-Leksand_Karingberget
@@ -1,3 +1,14 @@
# 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-Lerdala b/dvb-t/se-Lerdala
index 2428c69..b2ad961 100644
--- a/dvb-t/se-Lerdala
+++ b/dvb-t/se-Lerdala
@@ -1,3 +1,14 @@
# 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-Lilltjara_Digerberget b/dvb-t/se-Lilltjara_Digerberget
index f2cee9f..748a3b5 100644
--- a/dvb-t/se-Lilltjara_Digerberget
+++ b/dvb-t/se-Lilltjara_Digerberget
@@ -1,3 +1,14 @@
# 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..5955a62 100644
--- a/dvb-t/se-Limedsforsen
+++ b/dvb-t/se-Limedsforsen
@@ -1,3 +1,14 @@
# 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..a8cb638 100644
--- a/dvb-t/se-Lindshammar_Ramkvilla
+++ b/dvb-t/se-Lindshammar_Ramkvilla
@@ -1,3 +1,14 @@
# 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..0a417d8 100644
--- a/dvb-t/se-Linkoping_Vattentornet
+++ b/dvb-t/se-Linkoping_Vattentornet
@@ -1,7 +1,62 @@
# 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
+ 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 = 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
+
diff --git a/dvb-t/se-Ljugarn b/dvb-t/se-Ljugarn
index 6474a15..b6b72ec 100644
--- a/dvb-t/se-Ljugarn
+++ b/dvb-t/se-Ljugarn
@@ -1,4 +1,26 @@
# 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-Loffstrand b/dvb-t/se-Loffstrand
index f95de05..a886d31 100644
--- a/dvb-t/se-Loffstrand
+++ b/dvb-t/se-Loffstrand
@@ -1,6 +1,50 @@
# 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 = 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
+
+[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/4
+ 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/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[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
+
diff --git a/dvb-t/se-Lonneberga b/dvb-t/se-Lonneberga
index 8664ea9..05f9392 100644
--- a/dvb-t/se-Lonneberga
+++ b/dvb-t/se-Lonneberga
@@ -1,4 +1,26 @@
# 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 = 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
+
diff --git a/dvb-t/se-Lorstrand b/dvb-t/se-Lorstrand
index 30867a3..94fd148 100644
--- a/dvb-t/se-Lorstrand
+++ b/dvb-t/se-Lorstrand
@@ -1,3 +1,14 @@
# 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-Ludvika_Bjorkasen b/dvb-t/se-Ludvika_Bjorkasen
index 07bccd4..4d2ecd5 100644
--- a/dvb-t/se-Ludvika_Bjorkasen
+++ b/dvb-t/se-Ludvika_Bjorkasen
@@ -1,4 +1,26 @@
# 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
+ 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
+
diff --git a/dvb-t/se-Lumsheden_Trekanten b/dvb-t/se-Lumsheden_Trekanten
index c8a1c9d..36f257c 100644
--- a/dvb-t/se-Lumsheden_Trekanten
+++ b/dvb-t/se-Lumsheden_Trekanten
@@ -1,3 +1,14 @@
# 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..1a64e38 100644
--- a/dvb-t/se-Lycksele_Knaften
+++ b/dvb-t/se-Lycksele_Knaften
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Mahult b/dvb-t/se-Mahult
index 3c45ffa..985c9aa 100644
--- a/dvb-t/se-Mahult
+++ b/dvb-t/se-Mahult
@@ -1,3 +1,14 @@
# 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-Malmo_Jagersro b/dvb-t/se-Malmo_Jagersro
index 2d0d845..edd93e4 100644
--- a/dvb-t/se-Malmo_Jagersro
+++ b/dvb-t/se-Malmo_Jagersro
@@ -1,7 +1,62 @@
# 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 = 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
+
+[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
+
+[CHANNEL]
+ 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/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[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
+
+[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/se-Malung b/dvb-t/se-Malung
index fe2b08d..da5e2f3 100644
--- a/dvb-t/se-Malung
+++ b/dvb-t/se-Malung
@@ -1,4 +1,26 @@
# 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
+ 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
+
diff --git a/dvb-t/se-Mariannelund b/dvb-t/se-Mariannelund
index 2ec7cd6..f84641d 100644
--- a/dvb-t/se-Mariannelund
+++ b/dvb-t/se-Mariannelund
@@ -1,3 +1,14 @@
# 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 = 834000000
+ BANDWIDTH_HZ = 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-Markaryd_Hualtet b/dvb-t/se-Markaryd_Hualtet
index 941f30c..3e86366 100644
--- a/dvb-t/se-Markaryd_Hualtet
+++ b/dvb-t/se-Markaryd_Hualtet
@@ -1,4 +1,26 @@
# 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
+
diff --git a/dvb-t/se-Matfors b/dvb-t/se-Matfors
index d956929..7bfc0ef 100644
--- a/dvb-t/se-Matfors
+++ b/dvb-t/se-Matfors
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Molndal_Vasterberget b/dvb-t/se-Molndal_Vasterberget
index 8f38e4c..b7b3160 100644
--- a/dvb-t/se-Molndal_Vasterberget
+++ b/dvb-t/se-Molndal_Vasterberget
@@ -1,7 +1,62 @@
# 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 = 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 = 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 = 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 = 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
+
+[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/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Mora_Eldris b/dvb-t/se-Mora_Eldris
index 9b7253c..8241ad7 100644
--- a/dvb-t/se-Mora_Eldris
+++ b/dvb-t/se-Mora_Eldris
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Motala_Ervasteby b/dvb-t/se-Motala_Ervasteby
index 4d673f4..2cea72e 100644
--- a/dvb-t/se-Motala_Ervasteby
+++ b/dvb-t/se-Motala_Ervasteby
@@ -1,7 +1,62 @@
# 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
+
diff --git a/dvb-t/se-Mullsjo_Torestorp b/dvb-t/se-Mullsjo_Torestorp
index 264c443..b2882d9 100644
--- a/dvb-t/se-Mullsjo_Torestorp
+++ b/dvb-t/se-Mullsjo_Torestorp
@@ -1,4 +1,26 @@
# 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 = 834000000
+ BANDWIDTH_HZ = 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 = 850000000
+ BANDWIDTH_HZ = 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-Nassjo b/dvb-t/se-Nassjo
index 9fe7769..e324b10 100644
--- a/dvb-t/se-Nassjo
+++ b/dvb-t/se-Nassjo
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Navekvarn b/dvb-t/se-Navekvarn
index 1016800..252eb52 100644
--- a/dvb-t/se-Navekvarn
+++ b/dvb-t/se-Navekvarn
@@ -1,3 +1,14 @@
# 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 = 842000000
+ BANDWIDTH_HZ = 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-Norrahammar b/dvb-t/se-Norrahammar
index f6ae37d..776ea5c 100644
--- a/dvb-t/se-Norrahammar
+++ b/dvb-t/se-Norrahammar
@@ -1,3 +1,14 @@
# 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-Norrkoping_Krokek b/dvb-t/se-Norrkoping_Krokek
index 24fed0c..f7cb1f1 100644
--- a/dvb-t/se-Norrkoping_Krokek
+++ b/dvb-t/se-Norrkoping_Krokek
@@ -1,7 +1,62 @@
# 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
+ 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 = 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
+
+[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 = 802000000
+ BANDWIDTH_HZ = 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-Norrtalje_Sodra_Bergen b/dvb-t/se-Norrtalje_Sodra_Bergen
index 3fb43c6..79ac4a3 100644
--- a/dvb-t/se-Norrtalje_Sodra_Bergen
+++ b/dvb-t/se-Norrtalje_Sodra_Bergen
@@ -1,7 +1,62 @@
# 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-Nykoping b/dvb-t/se-Nykoping
index 848261c..22a0e78 100644
--- a/dvb-t/se-Nykoping
+++ b/dvb-t/se-Nykoping
@@ -1,3 +1,14 @@
# 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-Orebro_Lockhyttan b/dvb-t/se-Orebro_Lockhyttan
index 22a5d51..74f5a32 100644
--- a/dvb-t/se-Orebro_Lockhyttan
+++ b/dvb-t/se-Orebro_Lockhyttan
@@ -1,7 +1,62 @@
# 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
+
diff --git a/dvb-t/se-Ornskoldsvik_As b/dvb-t/se-Ornskoldsvik_As
index 8fa6edb..5151004 100644
--- a/dvb-t/se-Ornskoldsvik_As
+++ b/dvb-t/se-Ornskoldsvik_As
@@ -1,7 +1,62 @@
# 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
+
diff --git a/dvb-t/se-Oskarshamn b/dvb-t/se-Oskarshamn
index 98e8476..274202b 100644
--- a/dvb-t/se-Oskarshamn
+++ b/dvb-t/se-Oskarshamn
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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
+
+[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/8
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
diff --git a/dvb-t/se-Ostersund_Brattasen b/dvb-t/se-Ostersund_Brattasen
index c3828f6..8be64e8 100644
--- a/dvb-t/se-Ostersund_Brattasen
+++ b/dvb-t/se-Ostersund_Brattasen
@@ -1,7 +1,62 @@
# 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 = 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 = 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 = 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 = 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
+
diff --git a/dvb-t/se-Osthammar_Valo b/dvb-t/se-Osthammar_Valo
index d616927..aa3703b 100644
--- a/dvb-t/se-Osthammar_Valo
+++ b/dvb-t/se-Osthammar_Valo
@@ -1,7 +1,62 @@
# 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
+ 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 = 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 = 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 = 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-Overkalix b/dvb-t/se-Overkalix
index 91ec2f5..083c340 100644
--- a/dvb-t/se-Overkalix
+++ b/dvb-t/se-Overkalix
@@ -1,6 +1,50 @@
# 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 = 706000000
+ 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 = 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
+
+[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
+
+[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
+
diff --git a/dvb-t/se-Oxberg b/dvb-t/se-Oxberg
index 6a61626..2e5f762 100644
--- a/dvb-t/se-Oxberg
+++ b/dvb-t/se-Oxberg
@@ -1,3 +1,14 @@
# 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
deleted file mode 100644
index 98b564d..0000000
--- a/dvb-t/se-Pajala
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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
diff --git a/dvb-t/se-Paulistom b/dvb-t/se-Paulistom
index e4abab5..37d7b5f 100644
--- a/dvb-t/se-Paulistom
+++ b/dvb-t/se-Paulistom
@@ -1,3 +1,14 @@
# 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-Rattvik b/dvb-t/se-Rattvik
index f8ffe5f..d7a2827 100644
--- a/dvb-t/se-Rattvik
+++ b/dvb-t/se-Rattvik
@@ -1,3 +1,14 @@
# 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 = 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-Rengsjo b/dvb-t/se-Rengsjo
index 7bb743f..222dfbe 100644
--- a/dvb-t/se-Rengsjo
+++ b/dvb-t/se-Rengsjo
@@ -1,3 +1,14 @@
# 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-Rorbacksnas b/dvb-t/se-Rorbacksnas
index fb45ce7..4c5725c 100644
--- a/dvb-t/se-Rorbacksnas
+++ b/dvb-t/se-Rorbacksnas
@@ -1,3 +1,14 @@
# 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-Sagmyra b/dvb-t/se-Sagmyra
index f68169b..1e5b52d 100644
--- a/dvb-t/se-Sagmyra
+++ b/dvb-t/se-Sagmyra
@@ -1,3 +1,14 @@
# 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-Salen b/dvb-t/se-Salen
index 3785059..59f428c 100644
--- a/dvb-t/se-Salen
+++ b/dvb-t/se-Salen
@@ -1,3 +1,14 @@
# 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..58eeabc 100644
--- a/dvb-t/se-Salfjallet
+++ b/dvb-t/se-Salfjallet
@@ -1,3 +1,14 @@
# 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..135a3ed 100644
--- a/dvb-t/se-Sarna_Mickeltemplet
+++ b/dvb-t/se-Sarna_Mickeltemplet
@@ -1,3 +1,14 @@
# 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..793d24c 100644
--- a/dvb-t/se-Satila
+++ b/dvb-t/se-Satila
@@ -1,3 +1,14 @@
# 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-Saxdalen b/dvb-t/se-Saxdalen
index 0c2db67..a44178b 100644
--- a/dvb-t/se-Saxdalen
+++ b/dvb-t/se-Saxdalen
@@ -1,3 +1,14 @@
# 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-Siljansnas_Uvberget b/dvb-t/se-Siljansnas_Uvberget
index a087eaf..9de47c0 100644
--- a/dvb-t/se-Siljansnas_Uvberget
+++ b/dvb-t/se-Siljansnas_Uvberget
@@ -1,3 +1,14 @@
# 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-Skarstad b/dvb-t/se-Skarstad
index edc1aac..27eb6f8 100644
--- a/dvb-t/se-Skarstad
+++ b/dvb-t/se-Skarstad
@@ -1,3 +1,14 @@
# 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-Skattungbyn b/dvb-t/se-Skattungbyn
index d5b0a23..ec7d286 100644
--- a/dvb-t/se-Skattungbyn
+++ b/dvb-t/se-Skattungbyn
@@ -1,3 +1,14 @@
# 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-Skelleftea b/dvb-t/se-Skelleftea
index d831d9e..feaa723 100644
--- a/dvb-t/se-Skelleftea
+++ b/dvb-t/se-Skelleftea
@@ -1,7 +1,62 @@
# 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
+ 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 = 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 = 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 = 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/se-Skene_Nycklarberget b/dvb-t/se-Skene_Nycklarberget
index 9070ae8..36a11be 100644
--- a/dvb-t/se-Skene_Nycklarberget
+++ b/dvb-t/se-Skene_Nycklarberget
@@ -1,3 +1,14 @@
# 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-Skovde b/dvb-t/se-Skovde
index b79f179..b0da7a6 100644
--- a/dvb-t/se-Skovde
+++ b/dvb-t/se-Skovde
@@ -1,7 +1,62 @@
# 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
+
diff --git a/dvb-t/se-Smedjebacken_Uvberget b/dvb-t/se-Smedjebacken_Uvberget
index abe5f66..21af7cd 100644
--- a/dvb-t/se-Smedjebacken_Uvberget
+++ b/dvb-t/se-Smedjebacken_Uvberget
@@ -1,6 +1,50 @@
# 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
+ 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 = 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 = 802000000
+ BANDWIDTH_HZ = 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-Soderhamn b/dvb-t/se-Soderhamn
index a7d6fef..82ac14c 100644
--- a/dvb-t/se-Soderhamn
+++ b/dvb-t/se-Soderhamn
@@ -1,4 +1,26 @@
# 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
+ 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 = 810000000
+ BANDWIDTH_HZ = 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-Soderkoping b/dvb-t/se-Soderkoping
index 91ceddf..91574f4 100644
--- a/dvb-t/se-Soderkoping
+++ b/dvb-t/se-Soderkoping
@@ -1,4 +1,26 @@
# 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
+ 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
+
diff --git a/dvb-t/se-Sodertalje_Ragnhildsborg b/dvb-t/se-Sodertalje_Ragnhildsborg
index a643955..1645f44 100644
--- a/dvb-t/se-Sodertalje_Ragnhildsborg
+++ b/dvb-t/se-Sodertalje_Ragnhildsborg
@@ -1,8 +1,74 @@
# 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 = 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 = 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 = 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 = 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 = 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-Solleftea_Hallsta b/dvb-t/se-Solleftea_Hallsta
index ed48f90..5d77acf 100644
--- a/dvb-t/se-Solleftea_Hallsta
+++ b/dvb-t/se-Solleftea_Hallsta
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Solleftea_Multra b/dvb-t/se-Solleftea_Multra
index 11ff0a3..ae61c4f 100644
--- a/dvb-t/se-Solleftea_Multra
+++ b/dvb-t/se-Solleftea_Multra
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Sorsjon b/dvb-t/se-Sorsjon
index bead4db..d56c8cf 100644
--- a/dvb-t/se-Sorsjon
+++ b/dvb-t/se-Sorsjon
@@ -1,3 +1,14 @@
# 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-Stockholm_Marieberg b/dvb-t/se-Stockholm_Marieberg
index 1b35b14..184eb0f 100644
--- a/dvb-t/se-Stockholm_Marieberg
+++ b/dvb-t/se-Stockholm_Marieberg
@@ -1,7 +1,62 @@
# 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 = 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-Stockholm_Nacka b/dvb-t/se-Stockholm_Nacka
index e13a95e..f506224 100644
--- a/dvb-t/se-Stockholm_Nacka
+++ b/dvb-t/se-Stockholm_Nacka
@@ -1,8 +1,74 @@
# 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
+
+[Teracom_Mux_6]
+ 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-Stora_Skedvi b/dvb-t/se-Stora_Skedvi
index 2bcd965..a8de973 100644
--- a/dvb-t/se-Stora_Skedvi
+++ b/dvb-t/se-Stora_Skedvi
@@ -1,3 +1,14 @@
# 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-Storfjaten b/dvb-t/se-Storfjaten
index 9c9a73b..1e93cae 100644
--- a/dvb-t/se-Storfjaten
+++ b/dvb-t/se-Storfjaten
@@ -1,3 +1,14 @@
# 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-Storuman b/dvb-t/se-Storuman
index 28092f0..edc90e4 100644
--- a/dvb-t/se-Storuman
+++ b/dvb-t/se-Storuman
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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/se-Stromstad b/dvb-t/se-Stromstad
index 27a2f75..03da896 100644
--- a/dvb-t/se-Stromstad
+++ b/dvb-t/se-Stromstad
@@ -1,7 +1,62 @@
# 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 = 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
+
+[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
+
+[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
+
+[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
+
+[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
+
diff --git a/dvb-t/se-Styrsjobo b/dvb-t/se-Styrsjobo
index 2970f41..33a821c 100644
--- a/dvb-t/se-Styrsjobo
+++ b/dvb-t/se-Styrsjobo
@@ -1,3 +1,14 @@
# 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-Sundborn b/dvb-t/se-Sundborn
index 182158b..49d20cd 100644
--- a/dvb-t/se-Sundborn
+++ b/dvb-t/se-Sundborn
@@ -1,3 +1,14 @@
# 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..a44eaef 100644
--- a/dvb-t/se-Sundsbruk
+++ b/dvb-t/se-Sundsbruk
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Sundsvall_S_Stadsberget b/dvb-t/se-Sundsvall_S_Stadsberget
index 14a4a73..117018e 100644
--- a/dvb-t/se-Sundsvall_S_Stadsberget
+++ b/dvb-t/se-Sundsvall_S_Stadsberget
@@ -1,7 +1,62 @@
# 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 = 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 = 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 = 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 = 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 = 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-Sunne_Blabarskullen b/dvb-t/se-Sunne_Blabarskullen
index 02f8436..1852a1b 100644
--- a/dvb-t/se-Sunne_Blabarskullen
+++ b/dvb-t/se-Sunne_Blabarskullen
@@ -1,6 +1,50 @@
# 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
+ 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 = 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
+
+[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-Svartnas b/dvb-t/se-Svartnas
index afcb44c..e1b8232 100644
--- a/dvb-t/se-Svartnas
+++ b/dvb-t/se-Svartnas
@@ -1,3 +1,14 @@
# 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..54bc694 100644
--- a/dvb-t/se-Sveg_Brickan
+++ b/dvb-t/se-Sveg_Brickan
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Taberg b/dvb-t/se-Taberg
index 45a752a..f41df6e 100644
--- a/dvb-t/se-Taberg
+++ b/dvb-t/se-Taberg
@@ -1,3 +1,14 @@
# 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..d9ab9a8 100644
--- a/dvb-t/se-Tandadalen
+++ b/dvb-t/se-Tandadalen
@@ -1,3 +1,14 @@
# 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 = 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-Tasjo b/dvb-t/se-Tasjo
index 5783f73..27f6a53 100644
--- a/dvb-t/se-Tasjo
+++ b/dvb-t/se-Tasjo
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 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-Tollsjo b/dvb-t/se-Tollsjo
index 97389e5..f718609 100644
--- a/dvb-t/se-Tollsjo
+++ b/dvb-t/se-Tollsjo
@@ -1,3 +1,14 @@
# 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-Torsby_Bada b/dvb-t/se-Torsby_Bada
index 72ef507..2989f0a 100644
--- a/dvb-t/se-Torsby_Bada
+++ b/dvb-t/se-Torsby_Bada
@@ -1,6 +1,50 @@
# 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 = 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 = 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 = 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 = 802000000
+ BANDWIDTH_HZ = 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-Tranas_Bredkarr b/dvb-t/se-Tranas_Bredkarr
index bf32792..f62d0cf 100644
--- a/dvb-t/se-Tranas_Bredkarr
+++ b/dvb-t/se-Tranas_Bredkarr
@@ -1,4 +1,26 @@
# 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
+ 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
+
diff --git a/dvb-t/se-Tranemo b/dvb-t/se-Tranemo
index d3bebfd..ad33a1c 100644
--- a/dvb-t/se-Tranemo
+++ b/dvb-t/se-Tranemo
@@ -1,3 +1,14 @@
# 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..bf0c426 100644
--- a/dvb-t/se-Transtrand_Bolheden
+++ b/dvb-t/se-Transtrand_Bolheden
@@ -1,4 +1,26 @@
# 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 = 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 = 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-Traryd_Betas b/dvb-t/se-Traryd_Betas
index 72bb264..f4790d4 100644
--- a/dvb-t/se-Traryd_Betas
+++ b/dvb-t/se-Traryd_Betas
@@ -1,4 +1,26 @@
# 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 = 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 = 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-Trollhattan b/dvb-t/se-Trollhattan
index 790963e..aaec9cb 100644
--- a/dvb-t/se-Trollhattan
+++ b/dvb-t/se-Trollhattan
@@ -1,7 +1,62 @@
# 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 = 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
+
+[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
+
+[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
+
+[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
+
+[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
+
diff --git a/dvb-t/se-Trosa b/dvb-t/se-Trosa
index 6b11b6a..b1ea9bf 100644
--- a/dvb-t/se-Trosa
+++ b/dvb-t/se-Trosa
@@ -1,4 +1,26 @@
# 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-Tystberga b/dvb-t/se-Tystberga
index 3179648..42aed03 100644
--- a/dvb-t/se-Tystberga
+++ b/dvb-t/se-Tystberga
@@ -1,3 +1,14 @@
# 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 = 842000000
+ BANDWIDTH_HZ = 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-Uddevalla_Herrestad b/dvb-t/se-Uddevalla_Herrestad
index aae5e17..9a94954 100644
--- a/dvb-t/se-Uddevalla_Herrestad
+++ b/dvb-t/se-Uddevalla_Herrestad
@@ -1,7 +1,62 @@
# 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 = 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
+
+[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
+
+[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
+
+[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
+
+[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
+
diff --git a/dvb-t/se-Ullared b/dvb-t/se-Ullared
index 7f5956c..cb3817d 100644
--- a/dvb-t/se-Ullared
+++ b/dvb-t/se-Ullared
@@ -1,3 +1,14 @@
# 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..67ae4f1 100644
--- a/dvb-t/se-Ulricehamn
+++ b/dvb-t/se-Ulricehamn
@@ -1,4 +1,26 @@
# 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
+ 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 = 842000000
+ BANDWIDTH_HZ = 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-Ulvshyttan_Porjus b/dvb-t/se-Ulvshyttan_Porjus
index f69dbfd..44510db 100644
--- a/dvb-t/se-Ulvshyttan_Porjus
+++ b/dvb-t/se-Ulvshyttan_Porjus
@@ -1,3 +1,14 @@
# 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-Uppsala_Rickomberga b/dvb-t/se-Uppsala_Rickomberga
index a771e5d..a4db9c5 100644
--- a/dvb-t/se-Uppsala_Rickomberga
+++ b/dvb-t/se-Uppsala_Rickomberga
@@ -1,3 +1,14 @@
# 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..180fb2f 100644
--- a/dvb-t/se-Uppsala_Vedyxa
+++ b/dvb-t/se-Uppsala_Vedyxa
@@ -1,7 +1,62 @@
# 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
+ 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 = 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 = 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 = 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-Vaddo_Elmsta b/dvb-t/se-Vaddo_Elmsta
index aabc9d6..ccc560c 100644
--- a/dvb-t/se-Vaddo_Elmsta
+++ b/dvb-t/se-Vaddo_Elmsta
@@ -1,4 +1,26 @@
# 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 = 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 = 834000000
+ BANDWIDTH_HZ = 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-Valdemarsvik b/dvb-t/se-Valdemarsvik
index 20b8a8e..35a8639 100644
--- a/dvb-t/se-Valdemarsvik
+++ b/dvb-t/se-Valdemarsvik
@@ -1,4 +1,26 @@
# 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 = 834000000
+ BANDWIDTH_HZ = 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 = 794000000
+ BANDWIDTH_HZ = 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-Vannas_Granlundsberget b/dvb-t/se-Vannas_Granlundsberget
index 2ef81d1..e41bb89 100644
--- a/dvb-t/se-Vannas_Granlundsberget
+++ b/dvb-t/se-Vannas_Granlundsberget
@@ -1,6 +1,50 @@
# 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 = 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
+
+[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 = 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 = 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-Vansbro_Hummelberget b/dvb-t/se-Vansbro_Hummelberget
index 1280490..9ce5e7e 100644
--- a/dvb-t/se-Vansbro_Hummelberget
+++ b/dvb-t/se-Vansbro_Hummelberget
@@ -1,3 +1,14 @@
# 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..e395ae8 100644
--- a/dvb-t/se-Varberg_Grimeton
+++ b/dvb-t/se-Varberg_Grimeton
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Vasteras_Lillharad b/dvb-t/se-Vasteras_Lillharad
index 976bff7..946a349 100644
--- a/dvb-t/se-Vasteras_Lillharad
+++ b/dvb-t/se-Vasteras_Lillharad
@@ -1,7 +1,62 @@
# 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 = 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
+
diff --git a/dvb-t/se-Vastervik_Farhult b/dvb-t/se-Vastervik_Farhult
index b57a9d3..e4b9f90 100644
--- a/dvb-t/se-Vastervik_Farhult
+++ b/dvb-t/se-Vastervik_Farhult
@@ -1,6 +1,50 @@
# 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 = 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
+
+[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 = 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-Vaxbo b/dvb-t/se-Vaxbo
index 4214412..45407dc 100644
--- a/dvb-t/se-Vaxbo
+++ b/dvb-t/se-Vaxbo
@@ -1,3 +1,14 @@
# 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-Vessigebro b/dvb-t/se-Vessigebro
index 56a7e16..c5bfcd3 100644
--- a/dvb-t/se-Vessigebro
+++ b/dvb-t/se-Vessigebro
@@ -1,3 +1,14 @@
# 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..bba4486 100644
--- a/dvb-t/se-Vetlanda_Nye
+++ b/dvb-t/se-Vetlanda_Nye
@@ -1,3 +1,14 @@
# 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-Vikmanshyttan b/dvb-t/se-Vikmanshyttan
index 1def8f3..69a998d 100644
--- a/dvb-t/se-Vikmanshyttan
+++ b/dvb-t/se-Vikmanshyttan
@@ -1,3 +1,14 @@
# 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-Virserum b/dvb-t/se-Virserum
index 601a573..9a1364c 100644
--- a/dvb-t/se-Virserum
+++ b/dvb-t/se-Virserum
@@ -1,6 +1,50 @@
# 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
+
diff --git a/dvb-t/se-Visby_Follingbo b/dvb-t/se-Visby_Follingbo
index f5ec59d..a3bdd14 100644
--- a/dvb-t/se-Visby_Follingbo
+++ b/dvb-t/se-Visby_Follingbo
@@ -1,7 +1,62 @@
# 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
+ 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-Visby_Hamnen b/dvb-t/se-Visby_Hamnen
index 374bcb4..2428bbd 100644
--- a/dvb-t/se-Visby_Hamnen
+++ b/dvb-t/se-Visby_Hamnen
@@ -1,7 +1,62 @@
# 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
+
diff --git a/dvb-t/se-Visingso b/dvb-t/se-Visingso
index 6be33bd..28e7702 100644
--- a/dvb-t/se-Visingso
+++ b/dvb-t/se-Visingso
@@ -1,3 +1,14 @@
# 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..ff8f796 100644
--- a/dvb-t/se-Vislanda_Nydala
+++ b/dvb-t/se-Vislanda_Nydala
@@ -1,6 +1,50 @@
# 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
+ 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 = 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
+
diff --git a/dvb-t/se-Voxna b/dvb-t/se-Voxna
index 8a37481..0dd3fd6 100644
--- a/dvb-t/se-Voxna
+++ b/dvb-t/se-Voxna
@@ -1,3 +1,14 @@
# 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-Ystad_Metallgatan b/dvb-t/se-Ystad_Metallgatan
index c93c995..b01c891 100644
--- a/dvb-t/se-Ystad_Metallgatan
+++ b/dvb-t/se-Ystad_Metallgatan
@@ -1,7 +1,62 @@
# 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 = 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
+
+[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
+
+[CHANNEL]
+ 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/4
+ HIERARCHY = NONE
+ INVERSION = AUTO
+
+[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
+
+[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/se-Yttermalung b/dvb-t/se-Yttermalung
index 5262080..d2a4637 100644
--- a/dvb-t/se-Yttermalung
+++ b/dvb-t/se-Yttermalung
@@ -1,3 +1,14 @@
# 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..d80d012 100644
--- a/dvb-t/sk-BanskaBystrica
+++ b/dvb-t/sk-BanskaBystrica
@@ -3,7 +3,29 @@
# 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..0cd3d74 100644
--- a/dvb-t/sk-BanskaStiavnica
+++ b/dvb-t/sk-BanskaStiavnica
@@ -3,7 +3,29 @@
# 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..93c3fb1 100644
--- a/dvb-t/sk-Bardejov
+++ b/dvb-t/sk-Bardejov
@@ -3,7 +3,29 @@
# 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..9dcfb01 100644
--- a/dvb-t/sk-Bratislava
+++ b/dvb-t/sk-Bratislava
@@ -3,14 +3,47 @@
# 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..a733fd2 100644
--- a/dvb-t/sk-Cadca
+++ b/dvb-t/sk-Cadca
@@ -3,7 +3,29 @@
# 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..b3699b1 100644
--- a/dvb-t/sk-Detva
+++ b/dvb-t/sk-Detva
@@ -3,7 +3,29 @@
# 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..d5e9f42 100644
--- a/dvb-t/sk-Hnusta
+++ b/dvb-t/sk-Hnusta
@@ -3,7 +3,29 @@
# 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..13e17e3 100644
--- a/dvb-t/sk-Kosice
+++ b/dvb-t/sk-Kosice
@@ -3,7 +3,29 @@
# 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..b5ac2f7 100644
--- a/dvb-t/sk-KralovskyChlmec
+++ b/dvb-t/sk-KralovskyChlmec
@@ -3,7 +3,29 @@
# 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..631f1e0 100644
--- a/dvb-t/sk-Krompachy
+++ b/dvb-t/sk-Krompachy
@@ -3,7 +3,29 @@
# 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..c0d8d3e 100644
--- a/dvb-t/sk-Lucenec
+++ b/dvb-t/sk-Lucenec
@@ -3,7 +3,29 @@
# 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..4dd6d27 100644
--- a/dvb-t/sk-Medzev
+++ b/dvb-t/sk-Medzev
@@ -3,7 +3,29 @@
# 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..e701c72 100644
--- a/dvb-t/sk-Namestovo
+++ b/dvb-t/sk-Namestovo
@@ -3,7 +3,29 @@
# 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..cedbd95 100644
--- a/dvb-t/sk-Nitra
+++ b/dvb-t/sk-Nitra
@@ -3,7 +3,29 @@
# 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..a1b8e74 100644
--- a/dvb-t/sk-Poprad
+++ b/dvb-t/sk-Poprad
@@ -3,8 +3,41 @@
# 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..930255c 100644
--- a/dvb-t/sk-PovazskaBystrica
+++ b/dvb-t/sk-PovazskaBystrica
@@ -3,7 +3,29 @@
# 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..ec7505f 100644
--- a/dvb-t/sk-Presov
+++ b/dvb-t/sk-Presov
@@ -3,7 +3,29 @@
# 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..0195da1 100644
--- a/dvb-t/sk-Prievidza
+++ b/dvb-t/sk-Prievidza
@@ -3,7 +3,29 @@
# 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..10c8f0d 100644
--- a/dvb-t/sk-Revuca
+++ b/dvb-t/sk-Revuca
@@ -3,7 +3,29 @@
# 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..54b159c 100644
--- a/dvb-t/sk-Roznava
+++ b/dvb-t/sk-Roznava
@@ -3,7 +3,29 @@
# 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..548eea2 100644
--- a/dvb-t/sk-Ruzomberok
+++ b/dvb-t/sk-Ruzomberok
@@ -3,7 +3,29 @@
# 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..cb193b5 100644
--- a/dvb-t/sk-Snina
+++ b/dvb-t/sk-Snina
@@ -3,7 +3,29 @@
# 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..d50cd51 100644
--- a/dvb-t/sk-StaraLubovna
+++ b/dvb-t/sk-StaraLubovna
@@ -3,7 +3,29 @@
# 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..9f9ccf9 100644
--- a/dvb-t/sk-Sturovo
+++ b/dvb-t/sk-Sturovo
@@ -3,7 +3,29 @@
# 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..2542311 100644
--- a/dvb-t/sk-Trencin
+++ b/dvb-t/sk-Trencin
@@ -3,7 +3,29 @@
# 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..71b1366 100644
--- a/dvb-t/sk-Zilina
+++ b/dvb-t/sk-Zilina
@@ -3,7 +3,29 @@
# 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..9e2881e 100644
--- a/dvb-t/ua-Kharkov
+++ b/dvb-t/ua-Kharkov
@@ -1,6 +1,54 @@
# 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
+ STREAM_ID = 4294967295
+ 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
+ STREAM_ID = 4294967295
+ 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
+ STREAM_ID = 4294967295
+ 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
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
diff --git a/dvb-t/ua-Kiev b/dvb-t/ua-Kiev
index 6db2d56..9802803 100644
--- a/dvb-t/ua-Kiev
+++ b/dvb-t/ua-Kiev
@@ -1,6 +1,54 @@
# 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
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 526000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 538000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
+[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
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 698000000
+ BANDWIDTH_HZ = 8000000
+ CODE_RATE_HP = 3/5
+ CODE_RATE_LP = NONE
+ MODULATION = QAM/256
+ TRANSMISSION_MODE = 32K
+ GUARD_INTERVAL = 1/16
+ HIERARCHY = NONE
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
diff --git a/dvb-t/ua-Lozovaya b/dvb-t/ua-Lozovaya
index a0bfc09..f5b2b02 100644
--- a/dvb-t/ua-Lozovaya
+++ b/dvb-t/ua-Lozovaya
@@ -1,6 +1,54 @@
# 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
+ STREAM_ID = 4294967295
+ 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
+ STREAM_ID = 4294967295
+ 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
+ STREAM_ID = 4294967295
+ 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
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
diff --git a/dvb-t/ua-Odessa b/dvb-t/ua-Odessa
index 2420279..0852991 100644
--- a/dvb-t/ua-Odessa
+++ b/dvb-t/ua-Odessa
@@ -1,6 +1,54 @@
# 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
+ STREAM_ID = 4294967295
+ 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
+ STREAM_ID = 4294967295
+ 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
+ STREAM_ID = 4294967295
+ 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
+ STREAM_ID = 4294967295
+ INVERSION = AUTO
+
diff --git a/dvb-t/ug-All b/dvb-t/ug-All
index 813f859..4aa7a5b 100644
--- a/dvb-t/ug-All
+++ b/dvb-t/ug-All
@@ -1,16 +1,46 @@
-#------------------------------------------------------------------------------
-# 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
# provided by : Joseph Zikusooka
# : http://joseph.zikusooka.com
# : joseph@zikusooka.com
#
-# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [plp_id] [system_id] [# 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
+[UCC Primary]
+ DELIVERY_SYSTEM = DVBT
+ 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 = 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 = 1
+ INVERSION = AUTO
+
+[CHANNEL]
+ DELIVERY_SYSTEM = DVBT2
+ FREQUENCY = 586000000
+ 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 = 9
+ INVERSION = AUTO
+
diff --git a/dvb-t/uk-Aberdare b/dvb-t/uk-Aberdare
index 0a3bad0..5031cf2 100644
--- a/dvb-t/uk-Aberdare
+++ b/dvb-t/uk-Aberdare
@@ -7,9 +7,76 @@
#
# 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..1b65906 100644
--- a/dvb-t/uk-Angus
+++ b/dvb-t/uk-Angus
@@ -7,9 +7,76 @@
#
# 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-BeaconHill b/dvb-t/uk-BeaconHill
index 06ea19c..1ed96ca 100644
--- a/dvb-t/uk-BeaconHill
+++ b/dvb-t/uk-BeaconHill
@@ -7,9 +7,76 @@
#
# 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
+
+[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..d83de04 100644
--- a/dvb-t/uk-Belmont
+++ b/dvb-t/uk-Belmont
@@ -7,10 +7,89 @@
#
# 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..bc4044c 100644
--- a/dvb-t/uk-Bilsdale
+++ b/dvb-t/uk-Bilsdale
@@ -7,10 +7,89 @@
#
# 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..1297580 100644
--- a/dvb-t/uk-BlackHill
+++ b/dvb-t/uk-BlackHill
@@ -7,11 +7,101 @@
#
# 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..a2122ba 100644
--- a/dvb-t/uk-Blaenplwyf
+++ b/dvb-t/uk-Blaenplwyf
@@ -7,9 +7,76 @@
#
# 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..1d64779 100644
--- a/dvb-t/uk-BluebellHill
+++ b/dvb-t/uk-BluebellHill
@@ -7,9 +7,76 @@
#
# 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
+
+[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..9d6a4e4 100644
--- a/dvb-t/uk-Bressay
+++ b/dvb-t/uk-Bressay
@@ -7,9 +7,76 @@
#
# 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..94f280b 100644
--- a/dvb-t/uk-BrierleyHill
+++ b/dvb-t/uk-BrierleyHill
@@ -7,10 +7,88 @@
#
# 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..c84ee29 100644
--- a/dvb-t/uk-BristolIlchesterCrescent
+++ b/dvb-t/uk-BristolIlchesterCrescent
@@ -7,10 +7,88 @@
#
# 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..37fa9e1 100644
--- a/dvb-t/uk-BristolKingsWeston
+++ b/dvb-t/uk-BristolKingsWeston
@@ -7,10 +7,88 @@
#
# 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..2ca86fc 100644
--- a/dvb-t/uk-Bromsgrove
+++ b/dvb-t/uk-Bromsgrove
@@ -7,9 +7,76 @@
#
# 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..628c899 100644
--- a/dvb-t/uk-BrougherMountain
+++ b/dvb-t/uk-BrougherMountain
@@ -7,10 +7,89 @@
#
# 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..dc44b14 100644
--- a/dvb-t/uk-Caldbeck
+++ b/dvb-t/uk-Caldbeck
@@ -7,9 +7,76 @@
#
# 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
+
+[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..4d6b328 100644
--- a/dvb-t/uk-CaradonHill
+++ b/dvb-t/uk-CaradonHill
@@ -7,9 +7,76 @@
#
# 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
+
+[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..2c6e977 100644
--- a/dvb-t/uk-Carmel
+++ b/dvb-t/uk-Carmel
@@ -7,9 +7,76 @@
#
# 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..8aa1a9b 100644
--- a/dvb-t/uk-Chatton
+++ b/dvb-t/uk-Chatton
@@ -7,9 +7,76 @@
#
# 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..fe9826f 100644
--- a/dvb-t/uk-Chesterfield
+++ b/dvb-t/uk-Chesterfield
@@ -7,9 +7,76 @@
#
# 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..72241ff 100644
--- a/dvb-t/uk-Craigkelly
+++ b/dvb-t/uk-Craigkelly
@@ -7,11 +7,101 @@
#
# 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..dc02b4e 100644
--- a/dvb-t/uk-CrystalPalace
+++ b/dvb-t/uk-CrystalPalace
@@ -7,10 +7,89 @@
#
# 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..8512ba7 100644
--- a/dvb-t/uk-Darvel
+++ b/dvb-t/uk-Darvel
@@ -7,9 +7,76 @@
#
# 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
+
+[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..11fdd96 100644
--- a/dvb-t/uk-Divis
+++ b/dvb-t/uk-Divis
@@ -7,10 +7,89 @@
#
# 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..fa1f3ef 100644
--- a/dvb-t/uk-Dover
+++ b/dvb-t/uk-Dover
@@ -7,9 +7,76 @@
#
# 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..99156f9 100644
--- a/dvb-t/uk-Durris
+++ b/dvb-t/uk-Durris
@@ -7,9 +7,76 @@
#
# 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-Eitshal b/dvb-t/uk-Eitshal
index ea53840..936dfea 100644
--- a/dvb-t/uk-Eitshal
+++ b/dvb-t/uk-Eitshal
@@ -7,9 +7,76 @@
#
# 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..1ad73a9 100644
--- a/dvb-t/uk-EmleyMoor
+++ b/dvb-t/uk-EmleyMoor
@@ -7,11 +7,101 @@
#
# 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..16067bf 100644
--- a/dvb-t/uk-Fenham
+++ b/dvb-t/uk-Fenham
@@ -7,9 +7,76 @@
#
# 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
+
+[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..219d23d 100644
--- a/dvb-t/uk-Fenton
+++ b/dvb-t/uk-Fenton
@@ -7,9 +7,76 @@
#
# 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
+
+[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..186f199 100644
--- a/dvb-t/uk-Ferryside
+++ b/dvb-t/uk-Ferryside
@@ -7,7 +7,52 @@
#
# 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..b91944c 100644
--- a/dvb-t/uk-Guildford
+++ b/dvb-t/uk-Guildford
@@ -7,9 +7,76 @@
#
# 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..ee208bf 100644
--- a/dvb-t/uk-Hannington
+++ b/dvb-t/uk-Hannington
@@ -7,10 +7,89 @@
#
# 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..c8361c5 100644
--- a/dvb-t/uk-Hastings
+++ b/dvb-t/uk-Hastings
@@ -7,9 +7,76 @@
#
# 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..4515b72 100644
--- a/dvb-t/uk-Heathfield
+++ b/dvb-t/uk-Heathfield
@@ -7,9 +7,76 @@
#
# 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..fd8c791 100644
--- a/dvb-t/uk-HemelHempstead
+++ b/dvb-t/uk-HemelHempstead
@@ -7,9 +7,76 @@
#
# 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..6c63ad6 100644
--- a/dvb-t/uk-HuntshawCross
+++ b/dvb-t/uk-HuntshawCross
@@ -7,9 +7,76 @@
#
# 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..57798f6 100644
--- a/dvb-t/uk-Idle
+++ b/dvb-t/uk-Idle
@@ -7,9 +7,76 @@
#
# 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..90a1e35 100644
--- a/dvb-t/uk-KeelylangHill
+++ b/dvb-t/uk-KeelylangHill
@@ -7,9 +7,76 @@
#
# 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..6695702 100644
--- a/dvb-t/uk-Keighley
+++ b/dvb-t/uk-Keighley
@@ -7,9 +7,76 @@
#
# 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..cdfb7a0 100644
--- a/dvb-t/uk-KilveyHill
+++ b/dvb-t/uk-KilveyHill
@@ -7,9 +7,76 @@
#
# 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..5340741 100644
--- a/dvb-t/uk-KnockMore
+++ b/dvb-t/uk-KnockMore
@@ -7,9 +7,76 @@
#
# 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..75093b4 100644
--- a/dvb-t/uk-Lancaster
+++ b/dvb-t/uk-Lancaster
@@ -7,9 +7,76 @@
#
# 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..5c36f5d 100644
--- a/dvb-t/uk-LarkStoke
+++ b/dvb-t/uk-LarkStoke
@@ -7,9 +7,76 @@
#
# 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..908f833 100644
--- a/dvb-t/uk-Limavady
+++ b/dvb-t/uk-Limavady
@@ -7,9 +7,76 @@
#
# 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..fcc9f3f 100644
--- a/dvb-t/uk-Llanddona
+++ b/dvb-t/uk-Llanddona
@@ -7,9 +7,76 @@
#
# 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..9f62921 100644
--- a/dvb-t/uk-Malvern
+++ b/dvb-t/uk-Malvern
@@ -7,9 +7,76 @@
#
# 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..377d7d5 100644
--- a/dvb-t/uk-Mendip
+++ b/dvb-t/uk-Mendip
@@ -7,9 +7,76 @@
#
# 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
+
+[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..4d22282 100644
--- a/dvb-t/uk-Midhurst
+++ b/dvb-t/uk-Midhurst
@@ -7,9 +7,76 @@
#
# 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..f39e38f 100644
--- a/dvb-t/uk-MoelyParc
+++ b/dvb-t/uk-MoelyParc
@@ -7,9 +7,76 @@
#
# 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
+
+[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..4aacea3 100644
--- a/dvb-t/uk-Nottingham
+++ b/dvb-t/uk-Nottingham
@@ -7,10 +7,88 @@
#
# 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..967af60 100644
--- a/dvb-t/uk-OliversMount
+++ b/dvb-t/uk-OliversMount
@@ -7,9 +7,76 @@
#
# 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..4326cd2 100644
--- a/dvb-t/uk-Oxford
+++ b/dvb-t/uk-Oxford
@@ -7,9 +7,76 @@
#
# 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
+
+[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
+
diff --git a/dvb-t/uk-PendleForest b/dvb-t/uk-PendleForest
index 1d210c3..57ede3b 100644
--- a/dvb-t/uk-PendleForest
+++ b/dvb-t/uk-PendleForest
@@ -7,9 +7,76 @@
#
# 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..e50eb62 100644
--- a/dvb-t/uk-Plympton
+++ b/dvb-t/uk-Plympton
@@ -7,9 +7,76 @@
#
# 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..02157b8 100644
--- a/dvb-t/uk-PontopPike
+++ b/dvb-t/uk-PontopPike
@@ -7,11 +7,101 @@
#
# 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..627ea06 100644
--- a/dvb-t/uk-Pontypool
+++ b/dvb-t/uk-Pontypool
@@ -7,9 +7,76 @@
#
# 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..2204f60 100644
--- a/dvb-t/uk-Preseli
+++ b/dvb-t/uk-Preseli
@@ -7,9 +7,76 @@
#
# 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..e5705df 100644
--- a/dvb-t/uk-Redruth
+++ b/dvb-t/uk-Redruth
@@ -7,9 +7,76 @@
#
# 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..07d96a3 100644
--- a/dvb-t/uk-Reigate
+++ b/dvb-t/uk-Reigate
@@ -7,9 +7,76 @@
#
# 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..3ef0ad2 100644
--- a/dvb-t/uk-RidgeHill
+++ b/dvb-t/uk-RidgeHill
@@ -7,9 +7,76 @@
#
# 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
+
+[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..4d44f4e 100644
--- a/dvb-t/uk-Rosemarkie
+++ b/dvb-t/uk-Rosemarkie
@@ -7,9 +7,76 @@
#
# 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..6f370c4 100644
--- a/dvb-t/uk-Rosneath
+++ b/dvb-t/uk-Rosneath
@@ -7,9 +7,76 @@
#
# 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..a01b14c 100644
--- a/dvb-t/uk-Rowridge
+++ b/dvb-t/uk-Rowridge
@@ -7,11 +7,101 @@
#
# 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..e7f5eb6 100644
--- a/dvb-t/uk-RumsterForest
+++ b/dvb-t/uk-RumsterForest
@@ -7,9 +7,76 @@
#
# 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..1672efe 100644
--- a/dvb-t/uk-Saddleworth
+++ b/dvb-t/uk-Saddleworth
@@ -7,9 +7,76 @@
#
# 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..d15bb12 100644
--- a/dvb-t/uk-Salisbury
+++ b/dvb-t/uk-Salisbury
@@ -7,9 +7,76 @@
#
# 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..986e38c 100644
--- a/dvb-t/uk-SandyHeath
+++ b/dvb-t/uk-SandyHeath
@@ -7,10 +7,89 @@
#
# 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..1671834 100644
--- a/dvb-t/uk-Selkirk
+++ b/dvb-t/uk-Selkirk
@@ -7,9 +7,76 @@
#
# 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..177a81d 100644
--- a/dvb-t/uk-Sheffield
+++ b/dvb-t/uk-Sheffield
@@ -7,9 +7,76 @@
#
# 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
+
+[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
+
diff --git a/dvb-t/uk-StocklandHill b/dvb-t/uk-StocklandHill
index 0f83c41..898373e 100644
--- a/dvb-t/uk-StocklandHill
+++ b/dvb-t/uk-StocklandHill
@@ -7,9 +7,76 @@
#
# 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 = 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
+
+[C23+ D3&4]
+ 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
+
+[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-Storeton b/dvb-t/uk-Storeton
index fd002ed..7bb44ba 100644
--- a/dvb-t/uk-Storeton
+++ b/dvb-t/uk-Storeton
@@ -7,10 +7,88 @@
#
# 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..8fc1ac3 100644
--- a/dvb-t/uk-Sudbury
+++ b/dvb-t/uk-Sudbury
@@ -7,9 +7,76 @@
#
# 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..e656135 100644
--- a/dvb-t/uk-SuttonColdfield
+++ b/dvb-t/uk-SuttonColdfield
@@ -7,11 +7,101 @@
#
# 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..071de3e 100644
--- a/dvb-t/uk-Tacolneston
+++ b/dvb-t/uk-Tacolneston
@@ -7,9 +7,76 @@
#
# 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
+
+[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..eb5ea30 100644
--- a/dvb-t/uk-TheWrekin
+++ b/dvb-t/uk-TheWrekin
@@ -7,9 +7,76 @@
#
# 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..530bf2e 100644
--- a/dvb-t/uk-Torosay
+++ b/dvb-t/uk-Torosay
@@ -7,9 +7,76 @@
#
# 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..d539532 100644
--- a/dvb-t/uk-TunbridgeWells
+++ b/dvb-t/uk-TunbridgeWells
@@ -7,9 +7,76 @@
#
# 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..1eb6978 100644
--- a/dvb-t/uk-Waltham
+++ b/dvb-t/uk-Waltham
@@ -7,11 +7,101 @@
#
# 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..54e1d6d 100644
--- a/dvb-t/uk-Wenvoe
+++ b/dvb-t/uk-Wenvoe
@@ -7,11 +7,101 @@
#
# 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..f1d60c3 100644
--- a/dvb-t/uk-WhitehawkHill
+++ b/dvb-t/uk-WhitehawkHill
@@ -7,9 +7,76 @@
#
# 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..af1f3d1 100644
--- a/dvb-t/uk-WinterHill
+++ b/dvb-t/uk-WinterHill
@@ -7,10 +7,89 @@
#
# 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..3f3a6d9 100644
--- a/dvb-t/vn-Hanoi
+++ b/dvb-t/vn-Hanoi
@@ -1,5 +1,27 @@
# 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..f44d930 100644
--- a/dvb-t/vn-Thaibinh
+++ b/dvb-t/vn-Thaibinh
@@ -1,5 +1,27 @@
# 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
+