Update Teracom transmitters in Sweden

Signed-off-by: Benjamin Larsson <benjamin@southpole.se>
2015-10-07 00:23:35 +02:00
parent 8d3a7d54b8
commit 2bc2c41005
116 changed files with 1893 additions and 2542 deletions
--- a/dvb-t/se-Alvsbyn
+++ b/dvb-t/se-Alvsbyn
@@ -59,3 +59,12 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Ange_Snoberg
+++ b/dvb-t/se-Ange_Snoberg
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Angebo
+++ b/dvb-t/se-Angebo
@@ -1,13 +1,6 @@
 # Sweden - Ängebo
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 802000000
+	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

--- a/dvb-t/se-Angelholm_Vegeholm
+++ b/dvb-t/se-Angelholm_Vegeholm
@@ -1,61 +1,35 @@
 # Sweden - Ängelholm/Vegeholm
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 482000000
+	FREQUENCY = 698000000
 	BANDWIDTH_HZ = 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
+	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 = 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
+	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 = 794000000
+	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 = DVBT2
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 212500000
+	BANDWIDTH_HZ = 7000000
--- a/dvb-t/se-Arvidsjaur_Jultrask
+++ b/dvb-t/se-Arvidsjaur_Jultrask
@@ -1,49 +1,35 @@
 # Sweden - Arvidsjaur/Julträsk
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 578000000
+	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
+	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

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
 	FREQUENCY = 762000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Atvidaberg
+++ b/dvb-t/se-Atvidaberg
@@ -1,25 +1,35 @@
 # Sweden - Åtvidaberg
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 490000000
+	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 = 610000000
+	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Avesta_Krylbo
+++ b/dvb-t/se-Avesta_Krylbo
@@ -1,25 +1,35 @@
 # Sweden - Avesta/Krylbo
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 530000000
+	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 = 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 = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Backefors
+++ b/dvb-t/se-Backefors
@@ -1,61 +1,35 @@
 # Sweden - Bäckefors
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 586000000
+	FREQUENCY = 514000000
 	BANDWIDTH_HZ = 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 = 586000000
+	BANDWIDTH_HZ = 8000000

 [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
+	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 = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000
--- a/dvb-t/se-Bankeryd
+++ b/dvb-t/se-Bankeryd
@@ -1,25 +1,35 @@
 # Sweden - Bankeryd
-[CHANNEL]
+[[CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 634000000
+	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 = 698000000
+	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 = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000
--- a/dvb-t/se-Bollebygd
+++ b/dvb-t/se-Bollebygd
@@ -1,25 +1,36 @@
 # Sweden - Bollebygd
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 578000000
+	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 = 514000000
+	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 = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Bollnas
+++ b/dvb-t/se-Bollnas
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000
--- a/dvb-t/se-Boras_Dalsjofors
+++ b/dvb-t/se-Boras_Dalsjofors
@@ -3,59 +3,33 @@
 	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 = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
 	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
+	DELIVERY_SYSTEM = DVBT2
+	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
-
--- a/dvb-t/se-Boras_Sjobo
+++ b/dvb-t/se-Boras_Sjobo
@@ -1,25 +1,35 @@
 # Sweden - Borås/Sjöbo
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 770000000
+	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 = 810000000
+	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Borlange_Idkerberget
+++ b/dvb-t/se-Borlange_Idkerberget
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Borlange_Nygardarna
+++ b/dvb-t/se-Borlange_Nygardarna
@@ -23,3 +23,27 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Bromsebro
+++ b/dvb-t/se-Bromsebro
@@ -1,25 +1,35 @@
 # Sweden - Brömsebro
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 554000000
+	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 = 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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000
--- a/dvb-t/se-Dadran
+++ b/dvb-t/se-Dadran
@@ -1,13 +1,5 @@
 # Sweden - Dådran
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 754000000
+	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
-
--- a/dvb-t/se-Degerfors
+++ b/dvb-t/se-Degerfors
@@ -3,47 +3,33 @@
 	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
+	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 = 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 = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Emmaboda_Balshult
+++ b/dvb-t/se-Emmaboda_Balshult
@@ -1,49 +1,36 @@
 # Sweden - Emmaboda/Bälshult
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 554000000
+	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 = 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
+	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 = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Enviken
+++ b/dvb-t/se-Enviken
@@ -1,25 +1,36 @@
 # Sweden - Enviken
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 474000000
+	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 = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Falun_Lovberget
+++ b/dvb-t/se-Falun_Lovberget
@@ -3,47 +3,34 @@
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 682000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 722000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 650000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 634000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Farosund_Bunge
+++ b/dvb-t/se-Farosund_Bunge
@@ -3,59 +3,29 @@
 	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
+	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

 [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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Filipstad_Klockarhojden
+++ b/dvb-t/se-Filipstad_Klockarhojden
@@ -1,49 +1,36 @@
 # Sweden - Filipstad/Klockarhöjden
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 546000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Finnveden
+++ b/dvb-t/se-Finnveden
@@ -3,47 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Gallivare
+++ b/dvb-t/se-Gallivare
@@ -1,49 +1,36 @@
 # Sweden - Gällivare
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 674000000
+	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 = 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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Gavle_Skogmur
+++ b/dvb-t/se-Gavle_Skogmur
@@ -3,47 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 205500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Goteborg_Brudaremossen
+++ b/dvb-t/se-Goteborg_Brudaremossen
@@ -3,59 +3,34 @@
 	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
+	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
+	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

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 818000000
+	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 = DVBT2
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 205500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Goteborg_Slattadamm
+++ b/dvb-t/se-Goteborg_Slattadamm
@@ -1,61 +1,31 @@
 # Sweden - Göteborg/Slättadamm
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 626000000
+	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
+	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
+	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

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 818000000
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	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

--- a/dvb-t/se-Hagfors_Varmullsasen
+++ b/dvb-t/se-Hagfors_Varmullsasen
@@ -1,49 +1,36 @@
 # Sweden - Hagfors/Värmullsåsen
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 482000000
+	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 = 602000000
+	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 = 754000000
+	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 = 802000000
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

--- a/dvb-t/se-Halmstad_Hamnen
+++ b/dvb-t/se-Halmstad_Hamnen
@@ -1,25 +1,31 @@
 # Sweden - Halmstad/Hamnen
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 762000000
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/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 = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Halmstad_Oskarstrom
+++ b/dvb-t/se-Halmstad_Oskarstrom
@@ -3,47 +3,34 @@
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 474000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
-	HIERARCHY = NONE
-	INVERSION = AUTO

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 530000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
-	HIERARCHY = NONE
-	INVERSION = AUTO

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 610000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
-	HIERARCHY = NONE
-	INVERSION = AUTO

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 666000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
-	HIERARCHY = NONE
-	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Harnosand_Harnon
+++ b/dvb-t/se-Harnosand_Harnon
@@ -1,49 +1,36 @@
 # Sweden - Härnösand/Härnön
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 770000000
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/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
+	DELIVERY_SYSTEM = DVBT2
+	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 = 650000000
+	DELIVERY_SYSTEM = DVBT2
+	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

--- a/dvb-t/se-Hedemora
+++ b/dvb-t/se-Hedemora
@@ -1,13 +1,6 @@
 # Sweden - Hedemora
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 754000000
+	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

--- a/dvb-t/se-Helsingborg_Olympia
+++ b/dvb-t/se-Helsingborg_Olympia
@@ -1,61 +1,36 @@
 # Sweden - Helsingborg/Olympia
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 482000000
+	FREQUENCY = 698000000
 	BANDWIDTH_HZ = 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
+	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 = 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
+	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 = 794000000
+	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 = DVBT2
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 212500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Hofors
+++ b/dvb-t/se-Hofors
@@ -3,47 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Hogsby_Virstad
+++ b/dvb-t/se-Hogsby_Virstad
@@ -3,23 +3,34 @@
 	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 = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Horby_Sallerup
+++ b/dvb-t/se-Horby_Sallerup
@@ -1,85 +1,36 @@
 # Sweden - Hörby/Sallerup
-[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
+	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 = 794000000
+	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 = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 212500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Hudiksvall_Forsa
+++ b/dvb-t/se-Hudiksvall_Forsa
@@ -3,47 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Hudiksvall_Galgberget
+++ b/dvb-t/se-Hudiksvall_Galgberget
@@ -3,23 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Idre
+++ b/dvb-t/se-Idre
@@ -1,13 +1,36 @@
 # Sweden - Idre
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 714000000
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

--- a/dvb-t/se-Ingvallsbenning
+++ b/dvb-t/se-Ingvallsbenning
@@ -1,13 +1,6 @@
 # Sweden - Ingvallsbenning
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 642000000
+	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

--- a/dvb-t/se-Jokkmokk_Tjalmejaure
+++ b/dvb-t/se-Jokkmokk_Tjalmejaure
@@ -1,49 +1,36 @@
 # Sweden - Jokkmokk/Tjalmejaure
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 586000000
+	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 = 690000000
+	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
+	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 = 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 = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Jonkoping_Bondberget
+++ b/dvb-t/se-Jonkoping_Bondberget
@@ -3,47 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Kalix
+++ b/dvb-t/se-Kalix
@@ -1,49 +1,36 @@
 # Sweden - Kalix
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 706000000
+	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 = 770000000
+	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

 [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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Karlshamn
+++ b/dvb-t/se-Karlshamn
@@ -1,49 +1,36 @@
 # Sweden - Karlshamn
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 746000000
+	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 = 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
+	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 = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Karlskrona_Vamo
+++ b/dvb-t/se-Karlskrona_Vamo
@@ -1,49 +1,36 @@
 # Sweden - Karlskrona/Vämö
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 746000000
+	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 = 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
+	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 = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Karlstad_Sormon
+++ b/dvb-t/se-Karlstad_Sormon
@@ -1,41 +1,36 @@
-# Sweden - Karlstad Sörmon Valid from 2007 09 26. Ver. 2 Correct FEC
-# Channels
-# Mux3=30
-[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
-[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
+# Sweden - Karlstad Sörmon
 [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 = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Kiruna_Kirunavaara
+++ b/dvb-t/se-Kiruna_Kirunavaara
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Kisa
+++ b/dvb-t/se-Kisa
@@ -59,3 +59,12 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000
--- a/dvb-t/se-Kopmanholmen
+++ b/dvb-t/se-Kopmanholmen
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Kopparberg
+++ b/dvb-t/se-Kopparberg
@@ -1,25 +1,35 @@
 # Sweden - Kopparberg
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 514000000
+	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
+	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Kramfors_Lugnvik
+++ b/dvb-t/se-Kramfors_Lugnvik
@@ -1,49 +1,36 @@
 # Sweden - Kramfors/Lugnvik
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 778000000
+	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 = 498000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 554000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 514000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Kristinehamn_Utsiktsberget
+++ b/dvb-t/se-Kristinehamn_Utsiktsberget
@@ -1,49 +1,36 @@
 # Sweden - Kristinehamn/Utsiktsberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 546000000
 	BANDWIDTH_HZ = 8000000
-	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Langshyttan_Engelsfors
+++ b/dvb-t/se-Langshyttan_Engelsfors
@@ -1,13 +1,6 @@
 # Sweden - Långshyttan/Engelsfors
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 514000000
+	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

--- a/dvb-t/se-Linkoping_Vattentornet
+++ b/dvb-t/se-Linkoping_Vattentornet
@@ -3,59 +3,34 @@
 	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
+	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
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	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

--- a/dvb-t/se-Loffstrand
+++ b/dvb-t/se-Loffstrand
@@ -1,49 +1,36 @@
 # Sweden - Loffstrand
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 506000000
+	FREQUENCY = 514000000
 	BANDWIDTH_HZ = 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
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
-	HIERARCHY = NONE
-	INVERSION = AUTO

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 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
+	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Lonneberga
+++ b/dvb-t/se-Lonneberga
@@ -1,25 +1,35 @@
 # Sweden - Lönneberga
-[CHANNEL]
+CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 562000000
+	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 = 610000000
+	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Ludvika_Bjorkasen
+++ b/dvb-t/se-Ludvika_Bjorkasen
@@ -3,23 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Lycksele_Knaften
+++ b/dvb-t/se-Lycksele_Knaften
@@ -1,49 +1,36 @@
 # Sweden - Lycksele/Knaften
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 770000000
+	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 = 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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Malmo_Jagersro
+++ b/dvb-t/se-Malmo_Jagersro
@@ -1,61 +1,36 @@
 # Sweden - Malmö/Jägersro
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 482000000
+	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 = 506000000
+	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 = 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
+	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 = 794000000
+	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 = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 212500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Malung
+++ b/dvb-t/se-Malung
@@ -3,23 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Mariannelund
+++ b/dvb-t/se-Mariannelund
@@ -1,13 +1,6 @@
 # Sweden - Mariannelund
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 834000000
+	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

--- a/dvb-t/se-Markaryd_Hualtet
+++ b/dvb-t/se-Markaryd_Hualtet
@@ -23,3 +23,27 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000
--- a/dvb-t/se-Matfors
+++ b/dvb-t/se-Matfors
@@ -1,49 +1,35 @@
 # Sweden - Matfors
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 770000000
+	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 = 754000000
+	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 = 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 = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Molndal_Vasterberget
+++ b/dvb-t/se-Molndal_Vasterberget
@@ -1,61 +1,30 @@
 # Sweden - Mölndal/Västerberget
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 626000000
+	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
+	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
+	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

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 818000000
+	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 = DVBT2
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Mora_Eldris
+++ b/dvb-t/se-Mora_Eldris
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Motala_Ervasteby
+++ b/dvb-t/se-Motala_Ervasteby
@@ -59,3 +59,12 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Mullsjo_Torestorp
+++ b/dvb-t/se-Mullsjo_Torestorp
@@ -1,25 +1,35 @@
 # Sweden - Mullsjö/Torestorp
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 834000000
+	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 = 850000000
+	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Nassjo
+++ b/dvb-t/se-Nassjo
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000
--- a/dvb-t/se-Navekvarn
+++ b/dvb-t/se-Navekvarn
@@ -1,13 +1,6 @@
 # Sweden - Nävekvarn
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 842000000
+	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

--- a/dvb-t/se-Norrkoping_Krokek
+++ b/dvb-t/se-Norrkoping_Krokek
@@ -3,59 +3,34 @@
 	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
+	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 = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Orebro_Lockhyttan
+++ b/dvb-t/se-Orebro_Lockhyttan
@@ -59,3 +59,12 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Ornskoldsvik_As
+++ b/dvb-t/se-Ornskoldsvik_As
@@ -59,3 +59,12 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Oskarshamn
+++ b/dvb-t/se-Oskarshamn
@@ -1,49 +1,35 @@
 # Sweden - Oskarshamn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 610000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/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
+	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 = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000
--- a/dvb-t/se-Ostersund_Brattasen
+++ b/dvb-t/se-Ostersund_Brattasen
@@ -1,61 +1,36 @@
 # Sweden - Östersund/Brattåsen
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 690000000
+	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 = 754000000
+	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 = 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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Osthammar_Valo
+++ b/dvb-t/se-Osthammar_Valo
@@ -3,59 +3,34 @@
 	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
+	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 = 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 = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Overkalix
+++ b/dvb-t/se-Overkalix
@@ -1,49 +1,36 @@
 # Sweden - Överkalix
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 706000000
+	FREQUENCY = 666000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
-	HIERARCHY = NONE
-	INVERSION = AUTO

 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 770000000
+	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

 [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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Rattvik
+++ b/dvb-t/se-Rattvik
@@ -1,13 +1,6 @@
 # Sweden - Rättvik
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 530000000
+	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

--- a/dvb-t/se-Skelleftea
+++ b/dvb-t/se-Skelleftea
@@ -3,59 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Skovde
+++ b/dvb-t/se-Skovde
@@ -59,3 +59,12 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Smedjebacken_Uvberget
+++ b/dvb-t/se-Smedjebacken_Uvberget
@@ -3,47 +3,34 @@
 	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
+	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 = 802000000
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

--- a/dvb-t/se-Soderhamn
+++ b/dvb-t/se-Soderhamn
@@ -3,23 +3,34 @@
 	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
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

--- a/dvb-t/se-Soderkoping
+++ b/dvb-t/se-Soderkoping
@@ -3,23 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Sodertalje_Ragnhildsborg
+++ b/dvb-t/se-Sodertalje_Ragnhildsborg
@@ -1,73 +1,36 @@
 # Sweden - Södertälje/Ragnhildsborg
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 506000000
+	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 = 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
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

--- a/dvb-t/se-Solleftea_Hallsta
+++ b/dvb-t/se-Solleftea_Hallsta
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Solleftea_Multra
+++ b/dvb-t/se-Solleftea_Multra
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
--- a/dvb-t/se-Stockholm_Marieberg
+++ b/dvb-t/se-Stockholm_Marieberg
@@ -1,61 +1,36 @@
 # Sweden - Stockholm/Marieberg
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 730000000
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[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 = 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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Stockholm_Nacka
+++ b/dvb-t/se-Stockholm_Nacka
@@ -59,15 +59,13 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO

-[Teracom_Mux_6]
-	DELIVERY_SYSTEM = DVBT
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
 	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

--- a/dvb-t/se-Storuman
+++ b/dvb-t/se-Storuman
@@ -1,49 +1,36 @@
 # Sweden - Storuman
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 674000000
+	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 = 754000000
+	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 = 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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
 	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 = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Stromstad
+++ b/dvb-t/se-Stromstad
@@ -1,61 +1,36 @@
 # Sweden - Strömstad
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 730000000
+	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 = 754000000
+	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 = 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
+	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 = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 205500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Sundsbruk
+++ b/dvb-t/se-Sundsbruk
@@ -1,49 +1,36 @@
 # Sweden - Sundsbruk
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 770000000
+	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 = 754000000
+	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 = 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 = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Sundsvall_S_Stadsberget
+++ b/dvb-t/se-Sundsvall_S_Stadsberget
@@ -1,61 +1,36 @@
 # Sweden - Sundsvall/S Stadsberget
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 770000000
+	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 = 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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Sunne_Blabarskullen
+++ b/dvb-t/se-Sunne_Blabarskullen
@@ -3,47 +3,34 @@
 	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
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[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 = 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 = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Sveg_Brickan
+++ b/dvb-t/se-Sveg_Brickan
@@ -1,49 +1,36 @@
 # Sweden - Sveg/Brickan
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 634000000
+	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 = 594000000
+	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 = 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 = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
 	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 = 562000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Tandadalen
+++ b/dvb-t/se-Tandadalen
@@ -1,13 +1,6 @@
 # Sweden - Tandådalen
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 754000000
+	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

--- a/dvb-t/se-Tasjo
+++ b/dvb-t/se-Tasjo
@@ -1,49 +1,36 @@
 # Sweden - Tåsjö
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 706000000
+	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
+	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 = 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 = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000

--- a/dvb-t/se-Torsby_Bada
+++ b/dvb-t/se-Torsby_Bada
@@ -1,49 +1,36 @@
 # Sweden - Torsby/Bada
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 482000000
+	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 = 602000000
+	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 = 754000000
+	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 = 802000000
+	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000

--- a/dvb-t/se-Tranas_Bredkarr
+++ b/dvb-t/se-Tranas_Bredkarr
@@ -3,23 +3,33 @@
 	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
+	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 = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000
--- a/dvb-t/se-Transtrand_Bolheden
+++ b/dvb-t/se-Transtrand_Bolheden
@@ -1,25 +1,36 @@
 # Sweden - Transtrand/Bolheden
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 634000000
+	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 = 722000000
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 610000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO

--- a/dvb-t/se-Traryd_Betas
+++ b/dvb-t/se-Traryd_Betas
@@ -1,25 +1,36 @@
 # Sweden - Traryd/Betås
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 714000000
+	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 = 730000000
+	FREQUENCY = 594000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000

--- a/Show More
+++ b/Show More