Update Teracom transmitters in Sweden

Signed-off-by: Benjamin Larsson <benjamin@southpole.se>

116 files changed, 1802 insertions, 2451 deletions

diff --git a/dvb-t/se-Alvsbyn b/dvb-t/se-Alvsbyn
index b13bc057..4c308d05 100644
--- 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
diff --git a/dvb-t/se-Ange_Snoberg b/dvb-t/se-Ange_Snoberg
index 552297ec..7f0bac7c 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Angebo b/dvb-t/se-Angebo
index 8b71a836..d3145eae 100644
--- 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
 
diff --git a/dvb-t/se-Angelholm_Vegeholm b/dvb-t/se-Angelholm_Vegeholm
index 0fcd383c..3611129f 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Arvidsjaur_Jultrask b/dvb-t/se-Arvidsjaur_Jultrask
index 465abbaa..76c48626 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Atvidaberg b/dvb-t/se-Atvidaberg
index f67a6d90..380b7e1a 100644
--- 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
diff --git a/dvb-t/se-Avesta_Krylbo b/dvb-t/se-Avesta_Krylbo
index 42eeaa44..e9a146bf 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Backefors b/dvb-t/se-Backefors
index 5a99a5dc..b6b9ba82 100644
--- 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
+	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 = 482000000
+	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 = 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
\ No newline at end of file
diff --git a/dvb-t/se-Bankeryd b/dvb-t/se-Bankeryd
index d0443b4d..ab123125 100644
--- a/dvb-t/se-Bankeryd
+++ b/dvb-t/se-Bankeryd
@@ -1,25 +1,35 @@
 # Sweden - Bankeryd
+[[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 634000000
+	FREQUENCY = 690000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 698000000
+	FREQUENCY = 770000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000
\ No newline at end of file
diff --git a/dvb-t/se-Bollebygd b/dvb-t/se-Bollebygd
index 4c841f43..80606617 100644
--- 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
 
diff --git a/dvb-t/se-Bollnas b/dvb-t/se-Bollnas
index 973a9c6f..63f56b56 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Boras_Dalsjofors b/dvb-t/se-Boras_Dalsjofors
index 3b4b9dbe..8ae4b9de 100644
--- 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 = 594000000
+	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 = 794000000
+	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 = 594000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Boras_Sjobo b/dvb-t/se-Boras_Sjobo
index 5ae7fd05..f2e80f1b 100644
--- 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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[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 = 810000000
+	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 = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
\ No newline at end of file
diff --git a/dvb-t/se-Borlange_Idkerberget b/dvb-t/se-Borlange_Idkerberget
index b70f761d..b678ee95 100644
--- 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
diff --git a/dvb-t/se-Borlange_Nygardarna b/dvb-t/se-Borlange_Nygardarna
index 0307e5a5..393e729c 100644
--- 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
diff --git a/dvb-t/se-Bromsebro b/dvb-t/se-Bromsebro
index eb557835..48e81751 100644
--- 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
diff --git a/dvb-t/se-Dadran b/dvb-t/se-Dadran
index a9733eb5..c8eb9a06 100644
--- 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
-
diff --git a/dvb-t/se-Degerfors b/dvb-t/se-Degerfors
index b8d16e62..b2f65726 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Emmaboda_Balshult b/dvb-t/se-Emmaboda_Balshult
index 512c69da..61d117bd 100644
--- 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
+
+[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 = DVBT2
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000
 
diff --git a/dvb-t/se-Enviken b/dvb-t/se-Enviken
index c36079c0..99367185 100644
--- 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
 
diff --git a/dvb-t/se-Falun_Lovberget b/dvb-t/se-Falun_Lovberget
index 478b9c1d..792bcb77 100644
--- 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
 
diff --git a/dvb-t/se-Farosund_Bunge b/dvb-t/se-Farosund_Bunge
index 2af8971f..bb0dcb12 100644
--- 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
 
diff --git a/dvb-t/se-Filipstad_Klockarhojden b/dvb-t/se-Filipstad_Klockarhojden
index a861d0a9..c3674bb1 100644
--- 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 = 546000000
+	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 = 522000000
+	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 = 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
 
diff --git a/dvb-t/se-Finnveden b/dvb-t/se-Finnveden
index 98cf8df2..1fa0dbfc 100644
--- 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
 
diff --git a/dvb-t/se-Gallivare b/dvb-t/se-Gallivare
index 35eeb5b0..1f98a967 100644
--- 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
 
diff --git a/dvb-t/se-Gavle_Skogmur b/dvb-t/se-Gavle_Skogmur
index 556acd8b..ae8ac75a 100644
--- 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
 
diff --git a/dvb-t/se-Goteborg_Brudaremossen b/dvb-t/se-Goteborg_Brudaremossen
index 854d4879..51d7b654 100644
--- 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
 
diff --git a/dvb-t/se-Goteborg_Slattadamm b/dvb-t/se-Goteborg_Slattadamm
index 843f90f7..4f499e94 100644
--- 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
 
diff --git a/dvb-t/se-Hagfors_Varmullsasen b/dvb-t/se-Hagfors_Varmullsasen
index 02960ac1..7b8f932f 100644
--- 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
 
diff --git a/dvb-t/se-Halmstad_Hamnen b/dvb-t/se-Halmstad_Hamnen
index 32e3c27b..344e7125 100644
--- 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
 
diff --git a/dvb-t/se-Halmstad_Oskarstrom b/dvb-t/se-Halmstad_Oskarstrom
index 2aba6c7e..bd8b06bc 100644
--- 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
 
diff --git a/dvb-t/se-Harnosand_Harnon b/dvb-t/se-Harnosand_Harnon
index 8210753c..6511fea2 100644
--- 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
-	CODE_RATE_HP = 2/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 = 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 = 546000000
+	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 = 650000000
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 706000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
diff --git a/dvb-t/se-Hedemora b/dvb-t/se-Hedemora
index ba6343df..b4c4e55f 100644
--- 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
 
diff --git a/dvb-t/se-Helsingborg_Olympia b/dvb-t/se-Helsingborg_Olympia
index f7fc25c5..224840a9 100644
--- 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
 
diff --git a/dvb-t/se-Hofors b/dvb-t/se-Hofors
index 82650815..a476eb8a 100644
--- 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
 
diff --git a/dvb-t/se-Hogsby_Virstad b/dvb-t/se-Hogsby_Virstad
index 37f150a4..27e37685 100644
--- 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
 
diff --git a/dvb-t/se-Horby_Sallerup b/dvb-t/se-Horby_Sallerup
index 3b99edb7..7363cbbd 100644
--- 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
+	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 = 570000000
+	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 = 634000000
+	FREQUENCY = 506000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 650000000
+	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 = 818000000
+	DELIVERY_SYSTEM = DVBT2
+	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 = 794000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
-	HIERARCHY = NONE
-	INVERSION = AUTO
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 212500000
+	BANDWIDTH_HZ = 7000000
 
diff --git a/dvb-t/se-Hudiksvall_Forsa b/dvb-t/se-Hudiksvall_Forsa
index 9a9365fb..aecf6d50 100644
--- 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
 
diff --git a/dvb-t/se-Hudiksvall_Galgberget b/dvb-t/se-Hudiksvall_Galgberget
index e40b0ab1..836f3c56 100644
--- 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
 
diff --git a/dvb-t/se-Idre b/dvb-t/se-Idre
index dc5ee028..341ff8dc 100644
--- a/dvb-t/se-Idre
+++ b/dvb-t/se-Idre
@@ -1,13 +1,36 @@
 # Sweden - Idre
 [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
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/se-Ingvallsbenning b/dvb-t/se-Ingvallsbenning
index f8e70889..391cb145 100644
--- 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
 
diff --git a/dvb-t/se-Jokkmokk_Tjalmejaure b/dvb-t/se-Jokkmokk_Tjalmejaure
index 75675aa1..364ba6da 100644
--- 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
 
diff --git a/dvb-t/se-Jonkoping_Bondberget b/dvb-t/se-Jonkoping_Bondberget
index 067eaf02..f8ca1d45 100644
--- 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
 
diff --git a/dvb-t/se-Kalix b/dvb-t/se-Kalix
index 401a1d41..fe4e1d2f 100644
--- 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
 
diff --git a/dvb-t/se-Karlshamn b/dvb-t/se-Karlshamn
index 1acf751b..948e5d0e 100644
--- 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
 
diff --git a/dvb-t/se-Karlskrona_Vamo b/dvb-t/se-Karlskrona_Vamo
index dc478bff..56195f49 100644
--- 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
 
diff --git a/dvb-t/se-Karlstad_Sormon b/dvb-t/se-Karlstad_Sormon
index 004aa923..0173e42f 100644
--- 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
+# Sweden - Karlstad Sörmon
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 546000000
 	BANDWIDTH_HZ = 8000000
-	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
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 650000000
+	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
 
diff --git a/dvb-t/se-Kiruna_Kirunavaara b/dvb-t/se-Kiruna_Kirunavaara
index 638f181f..91ee4631 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Kisa b/dvb-t/se-Kisa
index ab85ef88..590111de 100644
--- 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
diff --git a/dvb-t/se-Kopmanholmen b/dvb-t/se-Kopmanholmen
index ce66f920..bbe55a60 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Kopparberg b/dvb-t/se-Kopparberg
index 7820e4da..b684445d 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Kramfors_Lugnvik b/dvb-t/se-Kramfors_Lugnvik
index 88e9b34c..67bab9a7 100644
--- 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
 
diff --git a/dvb-t/se-Kristinehamn_Utsiktsberget b/dvb-t/se-Kristinehamn_Utsiktsberget
index e9dfbaa7..a4d53921 100644
--- a/dvb-t/se-Kristinehamn_Utsiktsberget
+++ b/dvb-t/se-Kristinehamn_Utsiktsberget
@@ -1,49 +1,36 @@
 # Sweden - Kristinehamn/Utsiktsberget
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 546000000
+	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 = 522000000
+	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 = 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
 
diff --git a/dvb-t/se-Langshyttan_Engelsfors b/dvb-t/se-Langshyttan_Engelsfors
index 69612c8a..420d18b5 100644
--- 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
 
diff --git a/dvb-t/se-Linkoping_Vattentornet b/dvb-t/se-Linkoping_Vattentornet
index f6d3be08..ecc44e84 100644
--- 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
 
diff --git a/dvb-t/se-Loffstrand b/dvb-t/se-Loffstrand
index ffcb4e2f..440ac0ab 100644
--- 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
 
diff --git a/dvb-t/se-Lonneberga b/dvb-t/se-Lonneberga
index 91768ffc..492c6c15 100644
--- a/dvb-t/se-Lonneberga
+++ b/dvb-t/se-Lonneberga
@@ -1,25 +1,35 @@
 # Sweden - Lönneberga
+CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 562000000
+	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 = 610000000
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	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 = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ludvika_Bjorkasen b/dvb-t/se-Ludvika_Bjorkasen
index 165a8d31..8512a0d5 100644
--- 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
 
diff --git a/dvb-t/se-Lycksele_Knaften b/dvb-t/se-Lycksele_Knaften
index dcf4adb8..b5ec6dd0 100644
--- 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
 
diff --git a/dvb-t/se-Malmo_Jagersro b/dvb-t/se-Malmo_Jagersro
index 1587396b..c8725c9f 100644
--- 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
 
diff --git a/dvb-t/se-Malung b/dvb-t/se-Malung
index 3d681510..4ea63616 100644
--- 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
 
diff --git a/dvb-t/se-Mariannelund b/dvb-t/se-Mariannelund
index 1c9dcf97..21b51000 100644
--- 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
 
diff --git a/dvb-t/se-Markaryd_Hualtet b/dvb-t/se-Markaryd_Hualtet
index d78df38b..453807e8 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Matfors b/dvb-t/se-Matfors
index 62bacff2..4f0b82bc 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Molndal_Vasterberget b/dvb-t/se-Molndal_Vasterberget
index bafdb49e..8bc31222 100644
--- 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
diff --git a/dvb-t/se-Mora_Eldris b/dvb-t/se-Mora_Eldris
index a5c466c1..322331bc 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Motala_Ervasteby b/dvb-t/se-Motala_Ervasteby
index 90a3f855..eb46976b 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Mullsjo_Torestorp b/dvb-t/se-Mullsjo_Torestorp
index 495ee612..af676e5c 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Nassjo b/dvb-t/se-Nassjo
index 0df00299..7b162847 100644
--- 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
diff --git a/dvb-t/se-Navekvarn b/dvb-t/se-Navekvarn
index cc00cb7e..cccc63ee 100644
--- 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
 
diff --git a/dvb-t/se-Norrkoping_Krokek b/dvb-t/se-Norrkoping_Krokek
index 8ccf1b98..f6e6e489 100644
--- 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
 
diff --git a/dvb-t/se-Orebro_Lockhyttan b/dvb-t/se-Orebro_Lockhyttan
index 1ce0d86e..036d74b9 100644
--- 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
diff --git a/dvb-t/se-Ornskoldsvik_As b/dvb-t/se-Ornskoldsvik_As
index e0fb7c20..b35452cb 100644
--- 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
\ No newline at end of file
diff --git a/dvb-t/se-Oskarshamn b/dvb-t/se-Oskarshamn
index 50c9015c..8ee04ca7 100644
--- a/dvb-t/se-Oskarshamn
+++ b/dvb-t/se-Oskarshamn
@@ -1,49 +1,35 @@
 # Sweden - Oskarshamn
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 610000000
+	FREQUENCY = 594000000
+	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 = 762000000
+	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 = 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
diff --git a/dvb-t/se-Ostersund_Brattasen b/dvb-t/se-Ostersund_Brattasen
index f462756b..ddb74a5c 100644
--- 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
 
diff --git a/dvb-t/se-Osthammar_Valo b/dvb-t/se-Osthammar_Valo
index 0142c8f7..301063d2 100644
--- 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
 
diff --git a/dvb-t/se-Overkalix b/dvb-t/se-Overkalix
index 69b9fd45..56612b80 100644
--- 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
 
diff --git a/dvb-t/se-Rattvik b/dvb-t/se-Rattvik
index 52899508..725bc8b7 100644
--- 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
 
diff --git a/dvb-t/se-Skelleftea b/dvb-t/se-Skelleftea
index 955d0384..6ab14003 100644
--- 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
+	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
-	CODE_RATE_HP = 2/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 = 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 = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000
 
diff --git a/dvb-t/se-Skovde b/dvb-t/se-Skovde
index 431f510d..4a5f8b2c 100644
--- 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
diff --git a/dvb-t/se-Smedjebacken_Uvberget b/dvb-t/se-Smedjebacken_Uvberget
index 9befd166..01658dfe 100644
--- 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
 
diff --git a/dvb-t/se-Soderhamn b/dvb-t/se-Soderhamn
index 3798f67c..6a85f0ba 100644
--- 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
 
diff --git a/dvb-t/se-Soderkoping b/dvb-t/se-Soderkoping
index 6525a795..ce55cd4c 100644
--- 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
 
diff --git a/dvb-t/se-Sodertalje_Ragnhildsborg b/dvb-t/se-Sodertalje_Ragnhildsborg
index c2d2d49f..065434e7 100644
--- 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
+	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 = 538000000
+	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 = 546000000
+	FREQUENCY = 522000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 666000000
+	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 = 682000000
+	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
 
diff --git a/dvb-t/se-Solleftea_Hallsta b/dvb-t/se-Solleftea_Hallsta
index 8f017b6f..1279be4b 100644
--- 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
diff --git a/dvb-t/se-Solleftea_Multra b/dvb-t/se-Solleftea_Multra
index 9816a77d..8fb8ec36 100644
--- 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
diff --git a/dvb-t/se-Stockholm_Marieberg b/dvb-t/se-Stockholm_Marieberg
index 0d5dc836..0ae30a2f 100644
--- 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
-	CODE_RATE_HP = 2/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 = 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 = 778000000
+	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 = 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
 
diff --git a/dvb-t/se-Stockholm_Nacka b/dvb-t/se-Stockholm_Nacka
index f9b4b499..b5345041 100644
--- 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
 
diff --git a/dvb-t/se-Storuman b/dvb-t/se-Storuman
index f2ce3687..9fe23fc0 100644
--- 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
 
diff --git a/dvb-t/se-Stromstad b/dvb-t/se-Stromstad
index 51b8c4b9..f2609f68 100644
--- 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
 
diff --git a/dvb-t/se-Sundsbruk b/dvb-t/se-Sundsbruk
index d3a3c746..9c7a7fd5 100644
--- 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
 
diff --git a/dvb-t/se-Sundsvall_S_Stadsberget b/dvb-t/se-Sundsvall_S_Stadsberget
index 6fd61d8d..cf6bbdcb 100644
--- 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
+	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 = 522000000
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	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
 
diff --git a/dvb-t/se-Sunne_Blabarskullen b/dvb-t/se-Sunne_Blabarskullen
index 54e7faf7..c0f29a99 100644
--- 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
 
diff --git a/dvb-t/se-Sveg_Brickan b/dvb-t/se-Sveg_Brickan
index ddc8a3a2..b385b98d 100644
--- 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
 
diff --git a/dvb-t/se-Tandadalen b/dvb-t/se-Tandadalen
index 1361c86a..e726d3a0 100644
--- 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
 
diff --git a/dvb-t/se-Tasjo b/dvb-t/se-Tasjo
index 4cc782e5..b1958546 100644
--- 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
 
diff --git a/dvb-t/se-Torsby_Bada b/dvb-t/se-Torsby_Bada
index 278ae9e3..fc3e506b 100644
--- 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
 
diff --git a/dvb-t/se-Tranas_Bredkarr b/dvb-t/se-Tranas_Bredkarr
index 1d2dedef..7e88588f 100644
--- 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
diff --git a/dvb-t/se-Transtrand_Bolheden b/dvb-t/se-Transtrand_Bolheden
index 4fca78f0..2d140a9a 100644
--- 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
 
diff --git a/dvb-t/se-Traryd_Betas b/dvb-t/se-Traryd_Betas
index 30ead5ce..6a7bcdfd 100644
--- 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
 
diff --git a/dvb-t/se-Trollhattan b/dvb-t/se-Trollhattan
index 0767d310..72ca0609 100644
--- a/dvb-t/se-Trollhattan
+++ b/dvb-t/se-Trollhattan
@@ -1,61 +1,36 @@
 # Sweden - Trollhättan
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 730000000
+	FREQUENCY = 490000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 754000000
+	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 = 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 = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 205500000
+	BANDWIDTH_HZ = 7000000
 
diff --git a/dvb-t/se-Tystberga b/dvb-t/se-Tystberga
index 522f51e0..ef240a3e 100644
--- a/dvb-t/se-Tystberga
+++ b/dvb-t/se-Tystberga
@@ -1,13 +1,6 @@
 # Sweden - Tystberga
 [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
 
diff --git a/dvb-t/se-Uddevalla_Herrestad b/dvb-t/se-Uddevalla_Herrestad
index 96c9c308..bc1992bb 100644
--- a/dvb-t/se-Uddevalla_Herrestad
+++ b/dvb-t/se-Uddevalla_Herrestad
@@ -1,61 +1,36 @@
 # Sweden - Uddevalla/Herrestad
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 730000000
+	FREQUENCY = 490000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 754000000
+	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 = 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 = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 205500000
+	BANDWIDTH_HZ = 7000000
 
diff --git a/dvb-t/se-Ulricehamn b/dvb-t/se-Ulricehamn
index b73bf004..759c62f9 100644
--- a/dvb-t/se-Ulricehamn
+++ b/dvb-t/se-Ulricehamn
@@ -3,23 +3,34 @@
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 618000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 842000000
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 634000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
diff --git a/dvb-t/se-Uppsala_Vedyxa b/dvb-t/se-Uppsala_Vedyxa
index 59618d9d..55f99a8d 100644
--- a/dvb-t/se-Uppsala_Vedyxa
+++ b/dvb-t/se-Uppsala_Vedyxa
@@ -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 = 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 = 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 = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/se-Vaddo_Elmsta b/dvb-t/se-Vaddo_Elmsta
index 27b78e71..310a1da6 100644
--- a/dvb-t/se-Vaddo_Elmsta
+++ b/dvb-t/se-Vaddo_Elmsta
@@ -1,25 +1,36 @@
 # Sweden - Väddö/Elmsta
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 514000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 834000000
+	FREQUENCY = 690000000
+	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000
 
diff --git a/dvb-t/se-Valdemarsvik b/dvb-t/se-Valdemarsvik
index 9ace1a63..0d7c7407 100644
--- a/dvb-t/se-Valdemarsvik
+++ b/dvb-t/se-Valdemarsvik
@@ -1,25 +1,36 @@
 # Sweden - Valdemarsvik
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 834000000
+	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 = 794000000
+	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 = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000
 
diff --git a/dvb-t/se-Vannas_Granlundsberget b/dvb-t/se-Vannas_Granlundsberget
index 7031e188..53e7df00 100644
--- a/dvb-t/se-Vannas_Granlundsberget
+++ b/dvb-t/se-Vannas_Granlundsberget
@@ -1,49 +1,36 @@
 # Sweden - Vännäs/Granlundsberget
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 786000000
+	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
+	FREQUENCY = 706000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 754000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 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
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/se-Varberg_Grimeton b/dvb-t/se-Varberg_Grimeton
index 9f090b4a..6c85acd5 100644
--- a/dvb-t/se-Varberg_Grimeton
+++ b/dvb-t/se-Varberg_Grimeton
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Vasteras_Lillharad b/dvb-t/se-Vasteras_Lillharad
index 80965130..0c50190d 100644
--- a/dvb-t/se-Vasteras_Lillharad
+++ b/dvb-t/se-Vasteras_Lillharad
@@ -13,6 +13,18 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 554000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
@@ -59,3 +71,12 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vastervik_Farhult b/dvb-t/se-Vastervik_Farhult
index feee9efc..6b17d389 100644
--- a/dvb-t/se-Vastervik_Farhult
+++ b/dvb-t/se-Vastervik_Farhult
@@ -1,49 +1,36 @@
 # Sweden - Västervik/Fårhult
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 626000000
+	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 = 578000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 498000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 546000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
 
diff --git a/dvb-t/se-Virserum b/dvb-t/se-Virserum
index 566f69fd..32c79bcf 100644
--- a/dvb-t/se-Virserum
+++ b/dvb-t/se-Virserum
@@ -47,3 +47,17 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Visby_Follingbo b/dvb-t/se-Visby_Follingbo
index 616e9928..33b14fa5 100644
--- a/dvb-t/se-Visby_Follingbo
+++ b/dvb-t/se-Visby_Follingbo
@@ -3,59 +3,34 @@
 	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
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 205500000
+	BANDWIDTH_HZ = 7000000
 
diff --git a/dvb-t/se-Visby_Hamnen b/dvb-t/se-Visby_Hamnen
index e60a86d7..1c839f18 100644
--- a/dvb-t/se-Visby_Hamnen
+++ b/dvb-t/se-Visby_Hamnen
@@ -59,3 +59,7 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vislanda_Nydala b/dvb-t/se-Vislanda_Nydala
index ed2892ba..1aaf3ef9 100644
--- a/dvb-t/se-Vislanda_Nydala
+++ b/dvb-t/se-Vislanda_Nydala
@@ -3,47 +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 = 698000000
+	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 = 578000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 602000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
-	HIERARCHY = NONE
-	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000
 
diff --git a/dvb-t/se-Ystad_Metallgatan b/dvb-t/se-Ystad_Metallgatan
index a124e2d8..5c250b50 100644
--- a/dvb-t/se-Ystad_Metallgatan
+++ b/dvb-t/se-Ystad_Metallgatan
@@ -1,61 +1,36 @@
 # Sweden - Ystad/Metallgatan
 [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 = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 212500000
+	BANDWIDTH_HZ = 7000000