492 files changed, 5412 insertions, 2451 deletions

diff --git a/dvb-t/co-All b/dvb-t/co-All
new file mode 100644
index 0000000..c06056a
--- /dev/null
+++ b/dvb-t/co-All
@@ -0,0 +1,34 @@
+# initial scan file for Colombia, national level
+# DVB-T2, 470-860MHz, 6MHz bandwidth
+# See: https://es.wikipedia.org/wiki/Televisi%C3%B3n_Digital_Terrestre_en_Colombia
+# See: https://www.crcom.gov.co/recursos_user/Documentos_CRC_2012/Actividades_Regulatorias/TDT/documentos_soporte_TDT_20120914.pdf#page=51
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 473000000
+	BANDWIDTH_HZ = 6000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 479000000
+	BANDWIDTH_HZ = 6000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 485000000
+	BANDWIDTH_HZ = 6000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 491000000
+	BANDWIDTH_HZ = 6000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 551000000
+	BANDWIDTH_HZ = 6000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 557000000
+	BANDWIDTH_HZ = 6000000
diff --git a/dvb-t/pl-Szczecin b/dvb-t/pl-Szczecin
new file mode 100644
index 0000000..6fff9bb
--- /dev/null
+++ b/dvb-t/pl-Szczecin
@@ -0,0 +1,46 @@
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20091230 1 0 OFDM PL </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Poland, Szczecin
+# date (yyyy-mm-dd)    : 2015-12-01
+# provided by (opt)    : Fantom
+#
+#------------------------------------------------------------------------------
+
+[Zachodniopomorskie, Ch.41, Mux1 Szczecin/Kolowo 100kW]
+<------>DELIVERY_SYSTEM = DVBT
+<------>FREQUENCY = 634000000
+<------>BANDWIDTH_HZ = 8000000
+<------>CODE_RATE_HP = 3/4
+<------>CODE_RATE_LP = NONE
+<------>MODULATION = QAM/64
+<------>TRANSMISSION_MODE = 8K
+<------>GUARD_INTERVAL = 1/8
+<------>HIERARCHY = NONE
+<------>INVERSION = AUTO
+
+[Zachodniopomorskie, Ch.34, Mux2 Szczecin/Kolowo 100kW]
+<------>DELIVERY_SYSTEM = DVBT
+<------>FREQUENCY = 578000000
+<------>BANDWIDTH_HZ = 8000000
+<------>CODE_RATE_HP = 3/4
+<------>CODE_RATE_LP = NONE
+<------>MODULATION = QAM/64
+<------>TRANSMISSION_MODE = 8K
+<------>GUARD_INTERVAL = 1/8
+<------>HIERARCHY = NONE
+<------>INVERSION = AUTO
+
+[Zachodniopomorskie, Ch.48, Mux3 Szczecin/Kolowo 100kW]
+<------>DELIVERY_SYSTEM = DVBT
+<------>FREQUENCY = 690000000
+<------>BANDWIDTH_HZ = 8000000
+<------>CODE_RATE_HP = 3/4
+<------>CODE_RATE_LP = NONE
+<------>MODULATION = QAM/64
+<------>TRANSMISSION_MODE = 8K
+<------>GUARD_INTERVAL = 1/8
+<------>HIERARCHY = NONE
+<------>INVERSION = AUTO
diff --git a/dvb-t/se-Aareavaara b/dvb-t/se-Aareavaara
new file mode 100644
index 0000000..13d716a
--- /dev/null
+++ b/dvb-t/se-Aareavaara
@@ -0,0 +1,5 @@
+# Sweden - Aareavaara
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Adolfstrom b/dvb-t/se-Adolfstrom
new file mode 100644
index 0000000..b7aa445
--- /dev/null
+++ b/dvb-t/se-Adolfstrom
@@ -0,0 +1,5 @@
+# Sweden - Adolfström
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Agnas b/dvb-t/se-Agnas
new file mode 100644
index 0000000..bd7c1c9
--- /dev/null
+++ b/dvb-t/se-Agnas
@@ -0,0 +1,5 @@
+# Sweden - Agnäs
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Akersjon b/dvb-t/se-Akersjon
new file mode 100644
index 0000000..26dc4ed
--- /dev/null
+++ b/dvb-t/se-Akersjon
@@ -0,0 +1,5 @@
+# Sweden - Åkersjön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Alafors b/dvb-t/se-Alafors
new file mode 100644
index 0000000..c126dce
--- /dev/null
+++ b/dvb-t/se-Alafors
@@ -0,0 +1,35 @@
+# Sweden - Alafors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Albacken b/dvb-t/se-Albacken
new file mode 100644
index 0000000..e91aa4f
--- /dev/null
+++ b/dvb-t/se-Albacken
@@ -0,0 +1,5 @@
+# Sweden - Albacken
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Algsjo b/dvb-t/se-Algsjo
new file mode 100644
index 0000000..6bcb782
--- /dev/null
+++ b/dvb-t/se-Algsjo
@@ -0,0 +1,5 @@
+# Sweden - Älgsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Alingsas_Mariedal b/dvb-t/se-Alingsas_Mariedal
new file mode 100644
index 0000000..249fe98
--- /dev/null
+++ b/dvb-t/se-Alingsas_Mariedal
@@ -0,0 +1,35 @@
+# Sweden - Alingsås/Mariedal
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Alvangen b/dvb-t/se-Alvangen
new file mode 100644
index 0000000..cd389a2
--- /dev/null
+++ b/dvb-t/se-Alvangen
@@ -0,0 +1,35 @@
+# Sweden - Älvängen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Alvsbacka b/dvb-t/se-Alvsbacka
new file mode 100644
index 0000000..ceb9635
--- /dev/null
+++ b/dvb-t/se-Alvsbacka
@@ -0,0 +1,5 @@
+# Sweden - Älvsbacka
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Alvsbyn b/dvb-t/se-Alvsbyn
index b13bc05..4c308d0 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-Ammarnas_Ribovardo b/dvb-t/se-Ammarnas_Ribovardo
new file mode 100644
index 0000000..9206a9a
--- /dev/null
+++ b/dvb-t/se-Ammarnas_Ribovardo
@@ -0,0 +1,5 @@
+# Sweden - Ammarnäs Ribovardo
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ammarnas_Tjultrask b/dvb-t/se-Ammarnas_Tjultrask
new file mode 100644
index 0000000..4bb1d35
--- /dev/null
+++ b/dvb-t/se-Ammarnas_Tjultrask
@@ -0,0 +1,5 @@
+# Sweden - Ammarnäs/Tjulträsk
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Amotfors_Kroppstad b/dvb-t/se-Amotfors_Kroppstad
new file mode 100644
index 0000000..9272645
--- /dev/null
+++ b/dvb-t/se-Amotfors_Kroppstad
@@ -0,0 +1,5 @@
+# Sweden - Åmotfors Kroppstad
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-An b/dvb-t/se-An
new file mode 100644
index 0000000..acabed7
--- /dev/null
+++ b/dvb-t/se-An
@@ -0,0 +1,5 @@
+# Sweden - Ån
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Andersvattnet_Ersmyrberget b/dvb-t/se-Andersvattnet_Ersmyrberget
new file mode 100644
index 0000000..aa82b3f
--- /dev/null
+++ b/dvb-t/se-Andersvattnet_Ersmyrberget
@@ -0,0 +1,5 @@
+# Sweden - Andersvattnet/Ersmyrberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ange_Snoberg b/dvb-t/se-Ange_Snoberg
index 552297e..7f0bac7 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 8b71a83..d3145ea 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 0fcd383..3611129 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-Angersjo b/dvb-t/se-Angersjo
new file mode 100644
index 0000000..190c7f5
--- /dev/null
+++ b/dvb-t/se-Angersjo
@@ -0,0 +1,5 @@
+# Sweden - Ängersjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Are b/dvb-t/se-Are
new file mode 100644
index 0000000..be581bb
--- /dev/null
+++ b/dvb-t/se-Are
@@ -0,0 +1,35 @@
+# Sweden - Åre
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Arjang b/dvb-t/se-Arjang
new file mode 100644
index 0000000..3b540ab
--- /dev/null
+++ b/dvb-t/se-Arjang
@@ -0,0 +1,35 @@
+# Sweden - Årjäng
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Arjeplog_Galtispouda b/dvb-t/se-Arjeplog_Galtispouda
new file mode 100644
index 0000000..dc0c818
--- /dev/null
+++ b/dvb-t/se-Arjeplog_Galtispouda
@@ -0,0 +1,35 @@
+# Sweden - Arjeplog Galtispouda
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Arosjokk b/dvb-t/se-Arosjokk
new file mode 100644
index 0000000..fa88de3
--- /dev/null
+++ b/dvb-t/se-Arosjokk
@@ -0,0 +1,5 @@
+# Sweden - Årosjokk
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Arvidsjaur_Jultrask b/dvb-t/se-Arvidsjaur_Jultrask
index 465abba..76c4862 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-Arvika_Orshultaberget b/dvb-t/se-Arvika_Orshultaberget
new file mode 100644
index 0000000..7d041b2
--- /dev/null
+++ b/dvb-t/se-Arvika_Orshultaberget
@@ -0,0 +1,5 @@
+# Sweden - Arvika/Örshultaberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-As b/dvb-t/se-As
new file mode 100644
index 0000000..ca6213e
--- /dev/null
+++ b/dvb-t/se-As
@@ -0,0 +1,5 @@
+# Sweden - Ås
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Asele_Aslia b/dvb-t/se-Asele_Aslia
new file mode 100644
index 0000000..cac0d8e
--- /dev/null
+++ b/dvb-t/se-Asele_Aslia
@@ -0,0 +1,5 @@
+# Sweden - Åsele Åslia
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Asmon_Sormoflo b/dvb-t/se-Asmon_Sormoflo
new file mode 100644
index 0000000..c744206
--- /dev/null
+++ b/dvb-t/se-Asmon_Sormoflo
@@ -0,0 +1,5 @@
+# Sweden - Åsmon/Sörmoflo
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Atvidaberg b/dvb-t/se-Atvidaberg
index f67a6d9..380b7e1 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 42eeaa4..e9a146b 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-Backe b/dvb-t/se-Backe
new file mode 100644
index 0000000..e688bf7
--- /dev/null
+++ b/dvb-t/se-Backe
@@ -0,0 +1,5 @@
+# Sweden - Backe
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Backefors b/dvb-t/se-Backefors
index 5a99a5d..b6b9ba8 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 d0443b4..ab12312 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-Bengtsfors b/dvb-t/se-Bengtsfors
new file mode 100644
index 0000000..41de7e2
--- /dev/null
+++ b/dvb-t/se-Bengtsfors
@@ -0,0 +1,5 @@
+# Sweden - Bengtsfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Berghamn b/dvb-t/se-Berghamn
new file mode 100644
index 0000000..59b198a
--- /dev/null
+++ b/dvb-t/se-Berghamn
@@ -0,0 +1,5 @@
+# Sweden - Berghamn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bergshamra_Vaxtuna b/dvb-t/se-Bergshamra_Vaxtuna
new file mode 100644
index 0000000..08e7e6e
--- /dev/null
+++ b/dvb-t/se-Bergshamra_Vaxtuna
@@ -0,0 +1,35 @@
+# Sweden - Bergshamra/Vaxtuna
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Billsjo b/dvb-t/se-Billsjo
new file mode 100644
index 0000000..ff3bbf7
--- /dev/null
+++ b/dvb-t/se-Billsjo
@@ -0,0 +1,5 @@
+# Sweden - Billsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bispfors b/dvb-t/se-Bispfors
new file mode 100644
index 0000000..d93aa7a
--- /dev/null
+++ b/dvb-t/se-Bispfors
@@ -0,0 +1,35 @@
+# Sweden - Bispfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjorkliden_Tornehamn b/dvb-t/se-Bjorkliden_Tornehamn
new file mode 100644
index 0000000..3653d56
--- /dev/null
+++ b/dvb-t/se-Bjorkliden_Tornehamn
@@ -0,0 +1,5 @@
+# Sweden - Björkliden/Tornehamn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjorksele b/dvb-t/se-Bjorksele
new file mode 100644
index 0000000..fa24fd2
--- /dev/null
+++ b/dvb-t/se-Bjorksele
@@ -0,0 +1,5 @@
+# Sweden - Björksele
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjorkvattnet b/dvb-t/se-Bjorkvattnet
new file mode 100644
index 0000000..b8ce3ad
--- /dev/null
+++ b/dvb-t/se-Bjorkvattnet
@@ -0,0 +1,5 @@
+# Sweden - Björkvattnet
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjorna b/dvb-t/se-Bjorna
new file mode 100644
index 0000000..a022329
--- /dev/null
+++ b/dvb-t/se-Bjorna
@@ -0,0 +1,5 @@
+# Sweden - Björna
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjurberget_Hemtjarn b/dvb-t/se-Bjurberget_Hemtjarn
new file mode 100644
index 0000000..e6d57c5
--- /dev/null
+++ b/dvb-t/se-Bjurberget_Hemtjarn
@@ -0,0 +1,5 @@
+# Sweden - Bjurberget/Hemtjärn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bjurtrask b/dvb-t/se-Bjurtrask
new file mode 100644
index 0000000..c1d7a32
--- /dev/null
+++ b/dvb-t/se-Bjurtrask
@@ -0,0 +1,5 @@
+# Sweden - Bjurträsk
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Boberg b/dvb-t/se-Boberg
new file mode 100644
index 0000000..323b1c2
--- /dev/null
+++ b/dvb-t/se-Boberg
@@ -0,0 +1,5 @@
+# Sweden - Boberg
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Boda_Fagerum b/dvb-t/se-Boda_Fagerum
new file mode 100644
index 0000000..2f705a7
--- /dev/null
+++ b/dvb-t/se-Boda_Fagerum
@@ -0,0 +1,35 @@
+# Sweden - Böda/Fagerum
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Boden_Skogsa b/dvb-t/se-Boden_Skogsa
new file mode 100644
index 0000000..c7dbabe
--- /dev/null
+++ b/dvb-t/se-Boden_Skogsa
@@ -0,0 +1,5 @@
+# Sweden - Boden/Skogså
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bograngen b/dvb-t/se-Bograngen
new file mode 100644
index 0000000..0ae4656
--- /dev/null
+++ b/dvb-t/se-Bograngen
@@ -0,0 +1,5 @@
+# Sweden - Bograngen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bollebygd b/dvb-t/se-Bollebygd
index 4c841f4..8060661 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 973a9c6..63f56b5 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-Bonhamn b/dvb-t/se-Bonhamn
new file mode 100644
index 0000000..07e6d84
--- /dev/null
+++ b/dvb-t/se-Bonhamn
@@ -0,0 +1,5 @@
+# Sweden - Bönhamn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Boras_Dalsjofors b/dvb-t/se-Boras_Dalsjofors
index 3b4b9db..8ae4b9d 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 5ae7fd0..f2e80f1 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-Borgafjall b/dvb-t/se-Borgafjall
new file mode 100644
index 0000000..68e72a3
--- /dev/null
+++ b/dvb-t/se-Borgafjall
@@ -0,0 +1,5 @@
+# Sweden - Borgafjäll
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Borgholm_Ramsattra b/dvb-t/se-Borgholm_Ramsattra
new file mode 100644
index 0000000..6cd9efb
--- /dev/null
+++ b/dvb-t/se-Borgholm_Ramsattra
@@ -0,0 +1,35 @@
+# Sweden - Borgholm/Ramsättra
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY =
+	BANDWIDTH_HZ = 7000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Borgsjobyn b/dvb-t/se-Borgsjobyn
new file mode 100644
index 0000000..cd55d97
--- /dev/null
+++ b/dvb-t/se-Borgsjobyn
@@ -0,0 +1,5 @@
+# Sweden - Borgsjöbyn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Borkan b/dvb-t/se-Borkan
new file mode 100644
index 0000000..efeba30
--- /dev/null
+++ b/dvb-t/se-Borkan
@@ -0,0 +1,5 @@
+# Sweden - Borkan
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Borlange_Idkerberget b/dvb-t/se-Borlange_Idkerberget
index b70f761..b678ee9 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 0307e5a..393e729 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-Bortansbyn_Bortan b/dvb-t/se-Bortansbyn_Bortan
new file mode 100644
index 0000000..4c0f263
--- /dev/null
+++ b/dvb-t/se-Bortansbyn_Bortan
@@ -0,0 +1,5 @@
+# Sweden - Bortansbyn/Bortan
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bosebyn b/dvb-t/se-Bosebyn
new file mode 100644
index 0000000..edb7c4e
--- /dev/null
+++ b/dvb-t/se-Bosebyn
@@ -0,0 +1,5 @@
+# Sweden - Bosebyn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Botsmark b/dvb-t/se-Botsmark
new file mode 100644
index 0000000..ca257a1
--- /dev/null
+++ b/dvb-t/se-Botsmark
@@ -0,0 +1,5 @@
+# Sweden - Botsmark
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bredaker b/dvb-t/se-Bredaker
new file mode 100644
index 0000000..342744a
--- /dev/null
+++ b/dvb-t/se-Bredaker
@@ -0,0 +1,5 @@
+# Sweden - Bredåker
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bredbyn_Kubbe b/dvb-t/se-Bredbyn_Kubbe
new file mode 100644
index 0000000..1038e20
--- /dev/null
+++ b/dvb-t/se-Bredbyn_Kubbe
@@ -0,0 +1,5 @@
+# Sweden - Bredbyn/Kubbe
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bredbyn_Vasterfannbyn b/dvb-t/se-Bredbyn_Vasterfannbyn
new file mode 100644
index 0000000..2abb1ad
--- /dev/null
+++ b/dvb-t/se-Bredbyn_Vasterfannbyn
@@ -0,0 +1,5 @@
+# Sweden - Bredbyn Västerfannbyn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bredsjon b/dvb-t/se-Bredsjon
new file mode 100644
index 0000000..c6b4e7e
--- /dev/null
+++ b/dvb-t/se-Bredsjon
@@ -0,0 +1,5 @@
+# Sweden - Bredsjön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bromsebro b/dvb-t/se-Bromsebro
index eb55783..48e8175 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-Bydalen_Hovdehogen b/dvb-t/se-Bydalen_Hovdehogen
new file mode 100644
index 0000000..dcec415
--- /dev/null
+++ b/dvb-t/se-Bydalen_Hovdehogen
@@ -0,0 +1,5 @@
+# Sweden - Bydalen/Hovdehögen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bygdetrask b/dvb-t/se-Bygdetrask
new file mode 100644
index 0000000..1766162
--- /dev/null
+++ b/dvb-t/se-Bygdetrask
@@ -0,0 +1,5 @@
+# Sweden - Bygdeträsk
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Bygdsiljum b/dvb-t/se-Bygdsiljum
new file mode 100644
index 0000000..2a7eb03
--- /dev/null
+++ b/dvb-t/se-Bygdsiljum
@@ -0,0 +1,5 @@
+# Sweden - Bygdsiljum
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Dadran b/dvb-t/se-Dadran
index a9733eb..c8eb9a0 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-Dal b/dvb-t/se-Dal
new file mode 100644
index 0000000..f33ab2e
--- /dev/null
+++ b/dvb-t/se-Dal
@@ -0,0 +1,5 @@
+# Sweden - Dal
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Dals_Langed b/dvb-t/se-Dals_Langed
new file mode 100644
index 0000000..473733d
--- /dev/null
+++ b/dvb-t/se-Dals_Langed
@@ -0,0 +1,5 @@
+# Sweden - Dals Långed
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Degeberga b/dvb-t/se-Degeberga
new file mode 100644
index 0000000..a3518f7
--- /dev/null
+++ b/dvb-t/se-Degeberga
@@ -0,0 +1,5 @@
+# Sweden - Degeberga
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Degerfors b/dvb-t/se-Degerfors
index b8d16e6..b2f6572 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-Delary_Kolaboda b/dvb-t/se-Delary_Kolaboda
new file mode 100644
index 0000000..362df26
--- /dev/null
+++ b/dvb-t/se-Delary_Kolaboda
@@ -0,0 +1,5 @@
+# Sweden - Delary/Kölaboda
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Dorotea b/dvb-t/se-Dorotea
new file mode 100644
index 0000000..7b5aaca
--- /dev/null
+++ b/dvb-t/se-Dorotea
@@ -0,0 +1,5 @@
+# Sweden - Dorotea
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Duved b/dvb-t/se-Duved
new file mode 100644
index 0000000..dfb39da
--- /dev/null
+++ b/dvb-t/se-Duved
@@ -0,0 +1,5 @@
+# Sweden - Duved
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Edane b/dvb-t/se-Edane
new file mode 100644
index 0000000..c168681
--- /dev/null
+++ b/dvb-t/se-Edane
@@ -0,0 +1,5 @@
+# Sweden - Edane
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Edsele b/dvb-t/se-Edsele
new file mode 100644
index 0000000..c7df3b8
--- /dev/null
+++ b/dvb-t/se-Edsele
@@ -0,0 +1,5 @@
+# Sweden - Edsele
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Edsleskog_Hogheden b/dvb-t/se-Edsleskog_Hogheden
new file mode 100644
index 0000000..3df7f0d
--- /dev/null
+++ b/dvb-t/se-Edsleskog_Hogheden
@@ -0,0 +1,5 @@
+# Sweden - Edsleskog/Högheden
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Eksharad_Ekesberget b/dvb-t/se-Eksharad_Ekesberget
new file mode 100644
index 0000000..6daa2d5
--- /dev/null
+++ b/dvb-t/se-Eksharad_Ekesberget
@@ -0,0 +1,5 @@
+# Sweden - Ekshärad Ekesberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ellos b/dvb-t/se-Ellos
new file mode 100644
index 0000000..ba83849
--- /dev/null
+++ b/dvb-t/se-Ellos
@@ -0,0 +1,5 @@
+# Sweden - Ellös
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Emmaboda_Balshult b/dvb-t/se-Emmaboda_Balshult
index 512c69d..61d117b 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-Enafors b/dvb-t/se-Enafors
new file mode 100644
index 0000000..5e2089a
--- /dev/null
+++ b/dvb-t/se-Enafors
@@ -0,0 +1,5 @@
+# Sweden - Enafors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Enviken b/dvb-t/se-Enviken
index c36079c..9936718 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-Erikslund_Bergasen b/dvb-t/se-Erikslund_Bergasen
new file mode 100644
index 0000000..6b1622c
--- /dev/null
+++ b/dvb-t/se-Erikslund_Bergasen
@@ -0,0 +1,5 @@
+# Sweden - Erikslund/Bergåsen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fagersta_Jattasen b/dvb-t/se-Fagersta_Jattasen
new file mode 100644
index 0000000..de93d29
--- /dev/null
+++ b/dvb-t/se-Fagersta_Jattasen
@@ -0,0 +1,35 @@
+# Sweden - Fagersta Jättåsen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Falkenberg_Ringsegard b/dvb-t/se-Falkenberg_Ringsegard
new file mode 100644
index 0000000..709dbad
--- /dev/null
+++ b/dvb-t/se-Falkenberg_Ringsegard
@@ -0,0 +1,5 @@
+# Sweden - Falkenberg/Ringsegård
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Faltrask b/dvb-t/se-Faltrask
new file mode 100644
index 0000000..93bcda1
--- /dev/null
+++ b/dvb-t/se-Faltrask
@@ -0,0 +1,5 @@
+# Sweden - Falträsk
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Falun_Lovberget b/dvb-t/se-Falun_Lovberget
index 478b9c1..792bcb7 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-Farjestaden_Algutsrum b/dvb-t/se-Farjestaden_Algutsrum
new file mode 100644
index 0000000..e45a1da
--- /dev/null
+++ b/dvb-t/se-Farjestaden_Algutsrum
@@ -0,0 +1,35 @@
+# Sweden - Färjestaden/Algutsrum
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Faro_Ajkestrask b/dvb-t/se-Faro_Ajkestrask
new file mode 100644
index 0000000..5e36835
--- /dev/null
+++ b/dvb-t/se-Faro_Ajkestrask
@@ -0,0 +1,30 @@
+# Sweden - Fårö/Ajkesträsk
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Farosund_Bunge b/dvb-t/se-Farosund_Bunge
index 2af8971..bb0dcb1 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-Fengersfors b/dvb-t/se-Fengersfors
new file mode 100644
index 0000000..94eeca2
--- /dev/null
+++ b/dvb-t/se-Fengersfors
@@ -0,0 +1,5 @@
+# Sweden - Fengersfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Filipstad_Klockarhojden b/dvb-t/se-Filipstad_Klockarhojden
index a861d0a..c3674bb 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 98cf8df..1fa0dbf 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-Fjal b/dvb-t/se-Fjal
new file mode 100644
index 0000000..600d991
--- /dev/null
+++ b/dvb-t/se-Fjal
@@ -0,0 +1,5 @@
+# Sweden - Fjäl
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fjallsta b/dvb-t/se-Fjallsta
new file mode 100644
index 0000000..afc99cc
--- /dev/null
+++ b/dvb-t/se-Fjallsta
@@ -0,0 +1,5 @@
+# Sweden - Fjällsta
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Flarke b/dvb-t/se-Flarke
new file mode 100644
index 0000000..2e0d9ea
--- /dev/null
+++ b/dvb-t/se-Flarke
@@ -0,0 +1,5 @@
+# Sweden - Flärke
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Floda b/dvb-t/se-Floda
new file mode 100644
index 0000000..af4e629
--- /dev/null
+++ b/dvb-t/se-Floda
@@ -0,0 +1,5 @@
+# Sweden - Floda
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Flurkmark b/dvb-t/se-Flurkmark
new file mode 100644
index 0000000..cedba80
--- /dev/null
+++ b/dvb-t/se-Flurkmark
@@ -0,0 +1,5 @@
+# Sweden - Flurkmark
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Flyggsjo b/dvb-t/se-Flyggsjo
new file mode 100644
index 0000000..bcec030
--- /dev/null
+++ b/dvb-t/se-Flyggsjo
@@ -0,0 +1,5 @@
+# Sweden - Flyggsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Flyn b/dvb-t/se-Flyn
new file mode 100644
index 0000000..59b8aee
--- /dev/null
+++ b/dvb-t/se-Flyn
@@ -0,0 +1,5 @@
+# Sweden - Flyn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Folsbyn b/dvb-t/se-Folsbyn
new file mode 100644
index 0000000..9b70007
--- /dev/null
+++ b/dvb-t/se-Folsbyn
@@ -0,0 +1,5 @@
+# Sweden - Fölsbyn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Forsed b/dvb-t/se-Forsed
new file mode 100644
index 0000000..4981325
--- /dev/null
+++ b/dvb-t/se-Forsed
@@ -0,0 +1,5 @@
+# Sweden - Forsed
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Forsmo b/dvb-t/se-Forsmo
new file mode 100644
index 0000000..560bafa
--- /dev/null
+++ b/dvb-t/se-Forsmo
@@ -0,0 +1,5 @@
+# Sweden - Forsmo
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Forsmo_Yttersel b/dvb-t/se-Forsmo_Yttersel
new file mode 100644
index 0000000..86681c6
--- /dev/null
+++ b/dvb-t/se-Forsmo_Yttersel
@@ -0,0 +1,5 @@
+# Sweden - Forsmo/Yttersel
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Forsnaset b/dvb-t/se-Forsnaset
new file mode 100644
index 0000000..8127217
--- /dev/null
+++ b/dvb-t/se-Forsnaset
@@ -0,0 +1,5 @@
+# Sweden - Forsnäset
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Frankrikegarden_Frankrike b/dvb-t/se-Frankrikegarden_Frankrike
new file mode 100644
index 0000000..8a82988
--- /dev/null
+++ b/dvb-t/se-Frankrikegarden_Frankrike
@@ -0,0 +1,5 @@
+# Sweden - Frankrikegården/Frankrike
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fransta b/dvb-t/se-Fransta
new file mode 100644
index 0000000..ac86ede
--- /dev/null
+++ b/dvb-t/se-Fransta
@@ -0,0 +1,5 @@
+# Sweden - Fränsta
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fredrika b/dvb-t/se-Fredrika
new file mode 100644
index 0000000..76230d1
--- /dev/null
+++ b/dvb-t/se-Fredrika
@@ -0,0 +1,5 @@
+# Sweden - Fredrika
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fredros b/dvb-t/se-Fredros
new file mode 100644
index 0000000..2013d86
--- /dev/null
+++ b/dvb-t/se-Fredros
@@ -0,0 +1,5 @@
+# Sweden - Fredros
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Fullsjon b/dvb-t/se-Fullsjon
new file mode 100644
index 0000000..f57739d
--- /dev/null
+++ b/dvb-t/se-Fullsjon
@@ -0,0 +1,5 @@
+# Sweden - Fullsjön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Funasdalen_Funasdalsberge b/dvb-t/se-Funasdalen_Funasdalsberge
new file mode 100644
index 0000000..b24ce5c
--- /dev/null
+++ b/dvb-t/se-Funasdalen_Funasdalsberge
@@ -0,0 +1,35 @@
+# Sweden - Funäsdalen Funäsdalsberge
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Funasdalen_Telestation b/dvb-t/se-Funasdalen_Telestation
new file mode 100644
index 0000000..0cff062
--- /dev/null
+++ b/dvb-t/se-Funasdalen_Telestation
@@ -0,0 +1,5 @@
+# Sweden - Funäsdalen/Telestation
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gaddede b/dvb-t/se-Gaddede
new file mode 100644
index 0000000..31183b5
--- /dev/null
+++ b/dvb-t/se-Gaddede
@@ -0,0 +1,5 @@
+# Sweden - Gäddede
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gallivare b/dvb-t/se-Gallivare
index 35eeb5b..1f98a96 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-Gallsatter b/dvb-t/se-Gallsatter
new file mode 100644
index 0000000..fce5424
--- /dev/null
+++ b/dvb-t/se-Gallsatter
@@ -0,0 +1,5 @@
+# Sweden - Gallsätter
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gardikfors b/dvb-t/se-Gardikfors
new file mode 100644
index 0000000..5c97a95
--- /dev/null
+++ b/dvb-t/se-Gardikfors
@@ -0,0 +1,5 @@
+# Sweden - Gardikfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gargnas b/dvb-t/se-Gargnas
new file mode 100644
index 0000000..5ef79a1
--- /dev/null
+++ b/dvb-t/se-Gargnas
@@ -0,0 +1,5 @@
+# Sweden - Gargnäs
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gavle_Skogmur b/dvb-t/se-Gavle_Skogmur
index 556acd8..ae8ac75 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-Gillhov b/dvb-t/se-Gillhov
new file mode 100644
index 0000000..15415f1
--- /dev/null
+++ b/dvb-t/se-Gillhov
@@ -0,0 +1,5 @@
+# Sweden - Gillhov
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Glimakra b/dvb-t/se-Glimakra
new file mode 100644
index 0000000..5f027cc
--- /dev/null
+++ b/dvb-t/se-Glimakra
@@ -0,0 +1,5 @@
+# Sweden - Glimåkra
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gordalen b/dvb-t/se-Gordalen
new file mode 100644
index 0000000..e47263f
--- /dev/null
+++ b/dvb-t/se-Gordalen
@@ -0,0 +1,5 @@
+# Sweden - Gördalen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Goteborg_Brudaremossen b/dvb-t/se-Goteborg_Brudaremossen
index 854d487..51d7b65 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 843f90f..4f499e9 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-Graninge b/dvb-t/se-Graninge
new file mode 100644
index 0000000..191e14d
--- /dev/null
+++ b/dvb-t/se-Graninge
@@ -0,0 +1,5 @@
+# Sweden - Graninge
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Grasmark b/dvb-t/se-Grasmark
new file mode 100644
index 0000000..3c0cd6f
--- /dev/null
+++ b/dvb-t/se-Grasmark
@@ -0,0 +1,5 @@
+# Sweden - Gräsmark
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Grasmyr b/dvb-t/se-Grasmyr
new file mode 100644
index 0000000..1767f52
--- /dev/null
+++ b/dvb-t/se-Grasmyr
@@ -0,0 +1,5 @@
+# Sweden - Gräsmyr
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Grebbestad b/dvb-t/se-Grebbestad
new file mode 100644
index 0000000..41b6ba8
--- /dev/null
+++ b/dvb-t/se-Grebbestad
@@ -0,0 +1,35 @@
+# Sweden - Grebbestad
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 205500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Grevie b/dvb-t/se-Grevie
new file mode 100644
index 0000000..4c2a98a
--- /dev/null
+++ b/dvb-t/se-Grevie
@@ -0,0 +1,5 @@
+# Sweden - Grevie
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Grovelsjon b/dvb-t/se-Grovelsjon
new file mode 100644
index 0000000..04f7916
--- /dev/null
+++ b/dvb-t/se-Grovelsjon
@@ -0,0 +1,5 @@
+# Sweden - Grövelsjön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Grums b/dvb-t/se-Grums
new file mode 100644
index 0000000..d7e9976
--- /dev/null
+++ b/dvb-t/se-Grums
@@ -0,0 +1,5 @@
+# Sweden - Grums
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Guliksberg b/dvb-t/se-Guliksberg
new file mode 100644
index 0000000..050f864
--- /dev/null
+++ b/dvb-t/se-Guliksberg
@@ -0,0 +1,5 @@
+# Sweden - Guliksberg
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Guliksberg_Rodvattnet b/dvb-t/se-Guliksberg_Rodvattnet
new file mode 100644
index 0000000..c55b80a
--- /dev/null
+++ b/dvb-t/se-Guliksberg_Rodvattnet
@@ -0,0 +1,5 @@
+# Sweden - Guliksberg/Rödvattnet
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gumhojden b/dvb-t/se-Gumhojden
new file mode 100644
index 0000000..7322820
--- /dev/null
+++ b/dvb-t/se-Gumhojden
@@ -0,0 +1,5 @@
+# Sweden - Gumhöjden
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gunnarn_Sorsjoliden b/dvb-t/se-Gunnarn_Sorsjoliden
new file mode 100644
index 0000000..5aee02f
--- /dev/null
+++ b/dvb-t/se-Gunnarn_Sorsjoliden
@@ -0,0 +1,35 @@
+# Sweden - Gunnarn/Sörsjöliden
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gunnarsbyn b/dvb-t/se-Gunnarsbyn
new file mode 100644
index 0000000..1625739
--- /dev/null
+++ b/dvb-t/se-Gunnarsbyn
@@ -0,0 +1,5 @@
+# Sweden - Gunnarsbyn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Gunnarskog b/dvb-t/se-Gunnarskog
new file mode 100644
index 0000000..9600c92
--- /dev/null
+++ b/dvb-t/se-Gunnarskog
@@ -0,0 +1,5 @@
+# Sweden - Gunnarskog
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hadanberg b/dvb-t/se-Hadanberg
new file mode 100644
index 0000000..8a34887
--- /dev/null
+++ b/dvb-t/se-Hadanberg
@@ -0,0 +1,5 @@
+# Sweden - Hädanberg
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hagfors_Varmullsasen b/dvb-t/se-Hagfors_Varmullsasen
index 02960ac..7b8f932 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-Hakafot b/dvb-t/se-Hakafot
new file mode 100644
index 0000000..1f1b392
--- /dev/null
+++ b/dvb-t/se-Hakafot
@@ -0,0 +1,5 @@
+# Sweden - Håkafot
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Halaforsen b/dvb-t/se-Halaforsen
new file mode 100644
index 0000000..f9ab849
--- /dev/null
+++ b/dvb-t/se-Halaforsen
@@ -0,0 +1,5 @@
+# Sweden - Hålaforsen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Haljeboda b/dvb-t/se-Haljeboda
new file mode 100644
index 0000000..d56bb1d
--- /dev/null
+++ b/dvb-t/se-Haljeboda
@@ -0,0 +1,5 @@
+# Sweden - Häljeboda
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hallan b/dvb-t/se-Hallan
new file mode 100644
index 0000000..316266c
--- /dev/null
+++ b/dvb-t/se-Hallan
@@ -0,0 +1,5 @@
+# Sweden - Hållan
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hallastrom b/dvb-t/se-Hallastrom
new file mode 100644
index 0000000..3e07de1
--- /dev/null
+++ b/dvb-t/se-Hallastrom
@@ -0,0 +1,5 @@
+# Sweden - Hällaström
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Halle b/dvb-t/se-Halle
new file mode 100644
index 0000000..82192fd
--- /dev/null
+++ b/dvb-t/se-Halle
@@ -0,0 +1,5 @@
+# Sweden - Hälle
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Halleviksstrand b/dvb-t/se-Halleviksstrand
new file mode 100644
index 0000000..ce12528
--- /dev/null
+++ b/dvb-t/se-Halleviksstrand
@@ -0,0 +1,5 @@
+# Sweden - Hälleviksstrand
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hallsjo b/dvb-t/se-Hallsjo
new file mode 100644
index 0000000..8ac6646
--- /dev/null
+++ b/dvb-t/se-Hallsjo
@@ -0,0 +1,5 @@
+# Sweden - Hällsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Halmstad_Hamnen b/dvb-t/se-Halmstad_Hamnen
index 32e3c27..344e712 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 2aba6c7..bd8b06b 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-Hamburgsund b/dvb-t/se-Hamburgsund
new file mode 100644
index 0000000..09aca5f
--- /dev/null
+++ b/dvb-t/se-Hamburgsund
@@ -0,0 +1,5 @@
+# Sweden - Hamburgsund
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Harads b/dvb-t/se-Harads
new file mode 100644
index 0000000..8acae9a
--- /dev/null
+++ b/dvb-t/se-Harads
@@ -0,0 +1,5 @@
+# Sweden - Harads
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Harnosand_Harnon b/dvb-t/se-Harnosand_Harnon
index 8210753..6511fea 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-Harrsjon b/dvb-t/se-Harrsjon
new file mode 100644
index 0000000..597d9fb
--- /dev/null
+++ b/dvb-t/se-Harrsjon
@@ -0,0 +1,5 @@
+# Sweden - Harrsjön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hede b/dvb-t/se-Hede
new file mode 100644
index 0000000..e024aa6
--- /dev/null
+++ b/dvb-t/se-Hede
@@ -0,0 +1,35 @@
+# Sweden - Hede
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hedemora b/dvb-t/se-Hedemora
index ba6343d..b4c4e55 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-Hedenaset b/dvb-t/se-Hedenaset
new file mode 100644
index 0000000..c33e6ad
--- /dev/null
+++ b/dvb-t/se-Hedenaset
@@ -0,0 +1,5 @@
+# Sweden - Hedenäset
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Helgum b/dvb-t/se-Helgum
new file mode 100644
index 0000000..57f82a9
--- /dev/null
+++ b/dvb-t/se-Helgum
@@ -0,0 +1,5 @@
+# Sweden - Helgum
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Helsingborg_Olympia b/dvb-t/se-Helsingborg_Olympia
index f7fc25c..224840a 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-Hemavan b/dvb-t/se-Hemavan
new file mode 100644
index 0000000..1af34be
--- /dev/null
+++ b/dvb-t/se-Hemavan
@@ -0,0 +1,35 @@
+# Sweden - Hemavan
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hemson b/dvb-t/se-Hemson
new file mode 100644
index 0000000..6a6e001
--- /dev/null
+++ b/dvb-t/se-Hemson
@@ -0,0 +1,5 @@
+# Sweden - Hemsön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Henan b/dvb-t/se-Henan
new file mode 100644
index 0000000..2fab24c
--- /dev/null
+++ b/dvb-t/se-Henan
@@ -0,0 +1,5 @@
+# Sweden - Henån
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hofors b/dvb-t/se-Hofors
index 8265081..a476eb8 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-Hoglunda b/dvb-t/se-Hoglunda
new file mode 100644
index 0000000..86656f5
--- /dev/null
+++ b/dvb-t/se-Hoglunda
@@ -0,0 +1,5 @@
+# Sweden - Höglunda
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hogsby_Virstad b/dvb-t/se-Hogsby_Virstad
index 37f150a..27e3768 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-Hogvalen b/dvb-t/se-Hogvalen
new file mode 100644
index 0000000..f90e01e
--- /dev/null
+++ b/dvb-t/se-Hogvalen
@@ -0,0 +1,5 @@
+# Sweden - Högvålen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Holjes b/dvb-t/se-Holjes
new file mode 100644
index 0000000..feefa84
--- /dev/null
+++ b/dvb-t/se-Holjes
@@ -0,0 +1,5 @@
+# Sweden - Höljes
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hollviken_Stora_Hammar b/dvb-t/se-Hollviken_Stora_Hammar
new file mode 100644
index 0000000..41de99d
--- /dev/null
+++ b/dvb-t/se-Hollviken_Stora_Hammar
@@ -0,0 +1,30 @@
+# Sweden - Höllviken/Stora Hammar
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Horby_Sallerup b/dvb-t/se-Horby_Sallerup
index 3b99edb..7363cbb 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-Hornon b/dvb-t/se-Hornon
new file mode 100644
index 0000000..4892c1d
--- /dev/null
+++ b/dvb-t/se-Hornon
@@ -0,0 +1,5 @@
+# Sweden - Hornön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hotagen b/dvb-t/se-Hotagen
new file mode 100644
index 0000000..631a624
--- /dev/null
+++ b/dvb-t/se-Hotagen
@@ -0,0 +1,5 @@
+# Sweden - Hotagen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hoting b/dvb-t/se-Hoting
new file mode 100644
index 0000000..60387c6
--- /dev/null
+++ b/dvb-t/se-Hoting
@@ -0,0 +1,5 @@
+# Sweden - Hoting
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hovfjallet b/dvb-t/se-Hovfjallet
new file mode 100644
index 0000000..3d37947
--- /dev/null
+++ b/dvb-t/se-Hovfjallet
@@ -0,0 +1,5 @@
+# Sweden - Hovfjället
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hudiksvall_Forsa b/dvb-t/se-Hudiksvall_Forsa
index 9a9365f..aecf6d5 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 e40b0ab..836f3c5 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-Hummelholm b/dvb-t/se-Hummelholm
new file mode 100644
index 0000000..88638ad
--- /dev/null
+++ b/dvb-t/se-Hummelholm
@@ -0,0 +1,5 @@
+# Sweden - Hummelholm
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Hunnebostrand b/dvb-t/se-Hunnebostrand
new file mode 100644
index 0000000..54918df
--- /dev/null
+++ b/dvb-t/se-Hunnebostrand
@@ -0,0 +1,5 @@
+# Sweden - Hunnebostrand
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Husum b/dvb-t/se-Husum
new file mode 100644
index 0000000..d6678a4
--- /dev/null
+++ b/dvb-t/se-Husum
@@ -0,0 +1,5 @@
+# Sweden - Husum
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Idivuoma b/dvb-t/se-Idivuoma
new file mode 100644
index 0000000..d8a3b42
--- /dev/null
+++ b/dvb-t/se-Idivuoma
@@ -0,0 +1,5 @@
+# Sweden - Idivuoma
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Idre b/dvb-t/se-Idre
index dc5ee02..341ff8d 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 f8e7088..391cb14 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-Irevik_3195 b/dvb-t/se-Irevik_3195
new file mode 100644
index 0000000..694b756
--- /dev/null
+++ b/dvb-t/se-Irevik_3195
@@ -0,0 +1,30 @@
+# Sweden - Irevik/3195
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ivarsbyn b/dvb-t/se-Ivarsbyn
new file mode 100644
index 0000000..9f5c555
--- /dev/null
+++ b/dvb-t/se-Ivarsbyn
@@ -0,0 +1,5 @@
+# Sweden - Ivarsbyn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jakkvik_Frakenmyren b/dvb-t/se-Jakkvik_Frakenmyren
new file mode 100644
index 0000000..ca2cea1
--- /dev/null
+++ b/dvb-t/se-Jakkvik_Frakenmyren
@@ -0,0 +1,5 @@
+# Sweden - Jäkkvik Fräkenmyren
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jarkvissle b/dvb-t/se-Jarkvissle
new file mode 100644
index 0000000..7cfbaeb
--- /dev/null
+++ b/dvb-t/se-Jarkvissle
@@ -0,0 +1,5 @@
+# Sweden - Järkvissle
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jarpen_Mellangardsberget b/dvb-t/se-Jarpen_Mellangardsberget
new file mode 100644
index 0000000..d4b47c5
--- /dev/null
+++ b/dvb-t/se-Jarpen_Mellangardsberget
@@ -0,0 +1,5 @@
+# Sweden - Järpen Mellangårdsberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jarvtrask b/dvb-t/se-Jarvtrask
new file mode 100644
index 0000000..4e46510
--- /dev/null
+++ b/dvb-t/se-Jarvtrask
@@ -0,0 +1,5 @@
+# Sweden - Järvträsk
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Joestrom b/dvb-t/se-Joestrom
new file mode 100644
index 0000000..9e1bc4a
--- /dev/null
+++ b/dvb-t/se-Joestrom
@@ -0,0 +1,5 @@
+# Sweden - Joeström
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jokkmokk_Nyborg b/dvb-t/se-Jokkmokk_Nyborg
new file mode 100644
index 0000000..4f12cf2
--- /dev/null
+++ b/dvb-t/se-Jokkmokk_Nyborg
@@ -0,0 +1,35 @@
+# Sweden - Jokkmokk/Nyborg
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jokkmokk_Tjalmejaure b/dvb-t/se-Jokkmokk_Tjalmejaure
index 75675aa..364ba6d 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 067eaf0..f8ca1d4 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-Jormvattnet b/dvb-t/se-Jormvattnet
new file mode 100644
index 0000000..0a9b458
--- /dev/null
+++ b/dvb-t/se-Jormvattnet
@@ -0,0 +1,5 @@
+# Sweden - Jormvattnet
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Jude b/dvb-t/se-Jude
new file mode 100644
index 0000000..f0a4dfe
--- /dev/null
+++ b/dvb-t/se-Jude
@@ -0,0 +1,5 @@
+# Sweden - Jude
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Junsele_Hamptjarnsberget b/dvb-t/se-Junsele_Hamptjarnsberget
new file mode 100644
index 0000000..a031b71
--- /dev/null
+++ b/dvb-t/se-Junsele_Hamptjarnsberget
@@ -0,0 +1,5 @@
+# Sweden - Junsele Hamptjärnsberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Junsele_Vallen b/dvb-t/se-Junsele_Vallen
new file mode 100644
index 0000000..af1fe14
--- /dev/null
+++ b/dvb-t/se-Junsele_Vallen
@@ -0,0 +1,5 @@
+# Sweden - Junsele/Vallen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kagerod_Mollarp b/dvb-t/se-Kagerod_Mollarp
new file mode 100644
index 0000000..665b195
--- /dev/null
+++ b/dvb-t/se-Kagerod_Mollarp
@@ -0,0 +1,5 @@
+# Sweden - Kågeröd/Möllarp
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kalarne b/dvb-t/se-Kalarne
new file mode 100644
index 0000000..3ed4c70
--- /dev/null
+++ b/dvb-t/se-Kalarne
@@ -0,0 +1,5 @@
+# Sweden - Kälarne
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kalen b/dvb-t/se-Kalen
new file mode 100644
index 0000000..c26d776
--- /dev/null
+++ b/dvb-t/se-Kalen
@@ -0,0 +1,5 @@
+# Sweden - Kälen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kalix b/dvb-t/se-Kalix
index 401a1d4..fe4e1d2 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-Kallered b/dvb-t/se-Kallered
new file mode 100644
index 0000000..9bad036
--- /dev/null
+++ b/dvb-t/se-Kallered
@@ -0,0 +1,5 @@
+# Sweden - Kållered
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kallinge_Kalleberga b/dvb-t/se-Kallinge_Kalleberga
new file mode 100644
index 0000000..4079c6b
--- /dev/null
+++ b/dvb-t/se-Kallinge_Kalleberga
@@ -0,0 +1,35 @@
+# Sweden - Kallinge/Kalleberga
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Kallror b/dvb-t/se-Kallror
new file mode 100644
index 0000000..9c05f41
--- /dev/null
+++ b/dvb-t/se-Kallror
@@ -0,0 +1,5 @@
+# Sweden - Kallrör
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kampersvik_Ekeberget b/dvb-t/se-Kampersvik_Ekeberget
new file mode 100644
index 0000000..37394ca
--- /dev/null
+++ b/dvb-t/se-Kampersvik_Ekeberget
@@ -0,0 +1,5 @@
+# Sweden - Kämpersvik/Ekeberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Karesuando b/dvb-t/se-Karesuando
new file mode 100644
index 0000000..ac8e934
--- /dev/null
+++ b/dvb-t/se-Karesuando
@@ -0,0 +1,5 @@
+# Sweden - Karesuando
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Karlanda b/dvb-t/se-Karlanda
new file mode 100644
index 0000000..3c455a1
--- /dev/null
+++ b/dvb-t/se-Karlanda
@@ -0,0 +1,5 @@
+# Sweden - Karlanda
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Karlshamn b/dvb-t/se-Karlshamn
index 1acf751..948e5d0 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_Jamjo b/dvb-t/se-Karlskrona_Jamjo
new file mode 100644
index 0000000..d7c2bf9
--- /dev/null
+++ b/dvb-t/se-Karlskrona_Jamjo
@@ -0,0 +1,35 @@
+# Sweden - Karlskrona/Jämjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Karlskrona_Vamo b/dvb-t/se-Karlskrona_Vamo
index dc478bf..56195f4 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 004aa92..0173e42 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-Kasta_Ringkallen b/dvb-t/se-Kasta_Ringkallen
new file mode 100644
index 0000000..6288d41
--- /dev/null
+++ b/dvb-t/se-Kasta_Ringkallen
@@ -0,0 +1,5 @@
+# Sweden - Kåsta Ringkallen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kaxas b/dvb-t/se-Kaxas
new file mode 100644
index 0000000..e4e67c8
--- /dev/null
+++ b/dvb-t/se-Kaxas
@@ -0,0 +1,5 @@
+# Sweden - Kaxås
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kiruna_Kirunavaara b/dvb-t/se-Kiruna_Kirunavaara
index 638f181..91ee463 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 ab85ef8..590111d 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-Klingsta b/dvb-t/se-Klingsta
new file mode 100644
index 0000000..41b9669
--- /dev/null
+++ b/dvb-t/se-Klingsta
@@ -0,0 +1,5 @@
+# Sweden - Klingsta
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Klovsjo b/dvb-t/se-Klovsjo
new file mode 100644
index 0000000..2cbf2e4
--- /dev/null
+++ b/dvb-t/se-Klovsjo
@@ -0,0 +1,5 @@
+# Sweden - Klövsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Knavland b/dvb-t/se-Knavland
new file mode 100644
index 0000000..9a09224
--- /dev/null
+++ b/dvb-t/se-Knavland
@@ -0,0 +1,5 @@
+# Sweden - Knävland
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kopmanholmen b/dvb-t/se-Kopmanholmen
index ce66f92..bbe55a6 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 7820e4d..b684445 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-Koppom b/dvb-t/se-Koppom
new file mode 100644
index 0000000..e600153
--- /dev/null
+++ b/dvb-t/se-Koppom
@@ -0,0 +1,35 @@
+# Sweden - Koppom
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Korstrask b/dvb-t/se-Korstrask
new file mode 100644
index 0000000..b854cc2
--- /dev/null
+++ b/dvb-t/se-Korstrask
@@ -0,0 +1,5 @@
+# Sweden - Korsträsk
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kottsjon b/dvb-t/se-Kottsjon
new file mode 100644
index 0000000..a3b0cde
--- /dev/null
+++ b/dvb-t/se-Kottsjon
@@ -0,0 +1,5 @@
+# Sweden - Köttsjön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kovland b/dvb-t/se-Kovland
new file mode 100644
index 0000000..9f5d97c
--- /dev/null
+++ b/dvb-t/se-Kovland
@@ -0,0 +1,5 @@
+# Sweden - Kovland
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kramfors_Lugnvik b/dvb-t/se-Kramfors_Lugnvik
index 88e9b34..67bab9a 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-Kramfors_Ostby b/dvb-t/se-Kramfors_Ostby
new file mode 100644
index 0000000..9cd0d78
--- /dev/null
+++ b/dvb-t/se-Kramfors_Ostby
@@ -0,0 +1,5 @@
+# Sweden - Kramfors/Östby
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Krangede b/dvb-t/se-Krangede
new file mode 100644
index 0000000..ac6ff0b
--- /dev/null
+++ b/dvb-t/se-Krangede
@@ -0,0 +1,5 @@
+# Sweden - Krångede
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kristineberg b/dvb-t/se-Kristineberg
new file mode 100644
index 0000000..f8c00a4
--- /dev/null
+++ b/dvb-t/se-Kristineberg
@@ -0,0 +1,5 @@
+# Sweden - Kristineberg
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kristinehamn_Utsiktsberget b/dvb-t/se-Kristinehamn_Utsiktsberget
index e9dfbaa..a4d5392 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-Krokstrand b/dvb-t/se-Krokstrand
new file mode 100644
index 0000000..b999d34
--- /dev/null
+++ b/dvb-t/se-Krokstrand
@@ -0,0 +1,5 @@
+# Sweden - Krokstrand
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kultsjon b/dvb-t/se-Kultsjon
new file mode 100644
index 0000000..a79ca58
--- /dev/null
+++ b/dvb-t/se-Kultsjon
@@ -0,0 +1,5 @@
+# Sweden - Kultsjön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kungalv b/dvb-t/se-Kungalv
new file mode 100644
index 0000000..ea51882
--- /dev/null
+++ b/dvb-t/se-Kungalv
@@ -0,0 +1,35 @@
+# Sweden - Kungälv
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Kungsbacka_Ojersbo b/dvb-t/se-Kungsbacka_Ojersbo
new file mode 100644
index 0000000..17fbda1
--- /dev/null
+++ b/dvb-t/se-Kungsbacka_Ojersbo
@@ -0,0 +1,5 @@
+# Sweden - Kungsbacka/Öjersbo
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kungsberget_Gl b/dvb-t/se-Kungsberget_Gl
new file mode 100644
index 0000000..f3e5c2f
--- /dev/null
+++ b/dvb-t/se-Kungsberget_Gl
@@ -0,0 +1,5 @@
+# Sweden - Kungsberget/Gl
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kungshamn b/dvb-t/se-Kungshamn
new file mode 100644
index 0000000..adb5989
--- /dev/null
+++ b/dvb-t/se-Kungshamn
@@ -0,0 +1,35 @@
+# Sweden - Kungshamn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 205500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Kurravaara b/dvb-t/se-Kurravaara
new file mode 100644
index 0000000..06abf2b
--- /dev/null
+++ b/dvb-t/se-Kurravaara
@@ -0,0 +1,5 @@
+# Sweden - Kurravaara
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kvarnsvedjan b/dvb-t/se-Kvarnsvedjan
new file mode 100644
index 0000000..c2d9f6e
--- /dev/null
+++ b/dvb-t/se-Kvarnsvedjan
@@ -0,0 +1,5 @@
+# Sweden - Kvarnsvedjan
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kvikkjokk_Arrevare b/dvb-t/se-Kvikkjokk_Arrevare
new file mode 100644
index 0000000..b4606ac
--- /dev/null
+++ b/dvb-t/se-Kvikkjokk_Arrevare
@@ -0,0 +1,5 @@
+# Sweden - Kvikkjokk/Årrevare
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kvikkjokk_Tavvevare b/dvb-t/se-Kvikkjokk_Tavvevare
new file mode 100644
index 0000000..d15e9a5
--- /dev/null
+++ b/dvb-t/se-Kvikkjokk_Tavvevare
@@ -0,0 +1,5 @@
+# Sweden - Kvikkjokk/Tavvevare
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Kyrkesund b/dvb-t/se-Kyrkesund
new file mode 100644
index 0000000..935a300
--- /dev/null
+++ b/dvb-t/se-Kyrkesund
@@ -0,0 +1,5 @@
+# Sweden - Kyrkesund
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lagfors b/dvb-t/se-Lagfors
new file mode 100644
index 0000000..c4f530c
--- /dev/null
+++ b/dvb-t/se-Lagfors
@@ -0,0 +1,5 @@
+# Sweden - Lagfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Laggarberg b/dvb-t/se-Laggarberg
new file mode 100644
index 0000000..0c96875
--- /dev/null
+++ b/dvb-t/se-Laggarberg
@@ -0,0 +1,5 @@
+# Sweden - Laggarberg
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Laisvall b/dvb-t/se-Laisvall
new file mode 100644
index 0000000..36d1b0a
--- /dev/null
+++ b/dvb-t/se-Laisvall
@@ -0,0 +1,5 @@
+# Sweden - Laisvall
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Langa b/dvb-t/se-Langa
new file mode 100644
index 0000000..f083532
--- /dev/null
+++ b/dvb-t/se-Langa
@@ -0,0 +1,5 @@
+# Sweden - Långå
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Langsele b/dvb-t/se-Langsele
new file mode 100644
index 0000000..15bddfc
--- /dev/null
+++ b/dvb-t/se-Langsele
@@ -0,0 +1,5 @@
+# Sweden - Långsele
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Langshyttan_Engelsfors b/dvb-t/se-Langshyttan_Engelsfors
index 69612c8..420d18b 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-Laxsjo b/dvb-t/se-Laxsjo
new file mode 100644
index 0000000..655b28a
--- /dev/null
+++ b/dvb-t/se-Laxsjo
@@ -0,0 +1,5 @@
+# Sweden - Laxsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Laxviken b/dvb-t/se-Laxviken
new file mode 100644
index 0000000..4bd6bd9
--- /dev/null
+++ b/dvb-t/se-Laxviken
@@ -0,0 +1,5 @@
+# Sweden - Laxviken
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Leksand_Asledsberget b/dvb-t/se-Leksand_Asledsberget
new file mode 100644
index 0000000..f7a0d8a
--- /dev/null
+++ b/dvb-t/se-Leksand_Asledsberget
@@ -0,0 +1,35 @@
+# Sweden - Leksand/Åsledsberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lekvattnet b/dvb-t/se-Lekvattnet
new file mode 100644
index 0000000..e052924
--- /dev/null
+++ b/dvb-t/se-Lekvattnet
@@ -0,0 +1,5 @@
+# Sweden - Lekvattnet
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lesjofors b/dvb-t/se-Lesjofors
new file mode 100644
index 0000000..47ec104
--- /dev/null
+++ b/dvb-t/se-Lesjofors
@@ -0,0 +1,35 @@
+# Sweden - Lesjöfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Liden b/dvb-t/se-Liden
new file mode 100644
index 0000000..7e0e844
--- /dev/null
+++ b/dvb-t/se-Liden
@@ -0,0 +1,5 @@
+# Sweden - Liden
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Liden_Osterstrom b/dvb-t/se-Liden_Osterstrom
new file mode 100644
index 0000000..37120a1
--- /dev/null
+++ b/dvb-t/se-Liden_Osterstrom
@@ -0,0 +1,5 @@
+# Sweden - Liden/Österström
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lilla_Edet b/dvb-t/se-Lilla_Edet
new file mode 100644
index 0000000..edaf906
--- /dev/null
+++ b/dvb-t/se-Lilla_Edet
@@ -0,0 +1,35 @@
+# Sweden - Lilla Edet
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Lillogda b/dvb-t/se-Lillogda
new file mode 100644
index 0000000..8ceaea1
--- /dev/null
+++ b/dvb-t/se-Lillogda
@@ -0,0 +1,5 @@
+# Sweden - Lillögda
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lillpite_Bastaberget b/dvb-t/se-Lillpite_Bastaberget
new file mode 100644
index 0000000..a296c0c
--- /dev/null
+++ b/dvb-t/se-Lillpite_Bastaberget
@@ -0,0 +1,5 @@
+# Sweden - Lillpite Bastaberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Linkoping_Vattentornet b/dvb-t/se-Linkoping_Vattentornet
index f6d3be0..ecc44e8 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-Linsell b/dvb-t/se-Linsell
new file mode 100644
index 0000000..679209b
--- /dev/null
+++ b/dvb-t/se-Linsell
@@ -0,0 +1,5 @@
+# Sweden - Linsell
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lit b/dvb-t/se-Lit
new file mode 100644
index 0000000..abe24ec
--- /dev/null
+++ b/dvb-t/se-Lit
@@ -0,0 +1,5 @@
+# Sweden - Lit
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ljugarn_3193 b/dvb-t/se-Ljugarn_3193
new file mode 100644
index 0000000..d248cec
--- /dev/null
+++ b/dvb-t/se-Ljugarn_3193
@@ -0,0 +1,30 @@
+# Sweden - Ljugarn/3193
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ljungaverk b/dvb-t/se-Ljungaverk
new file mode 100644
index 0000000..9b8144d
--- /dev/null
+++ b/dvb-t/se-Ljungaverk
@@ -0,0 +1,5 @@
+# Sweden - Ljungaverk
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ljungdalen b/dvb-t/se-Ljungdalen
new file mode 100644
index 0000000..993efd0
--- /dev/null
+++ b/dvb-t/se-Ljungdalen
@@ -0,0 +1,35 @@
+# Sweden - Ljungdalen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ljustorp b/dvb-t/se-Ljustorp
new file mode 100644
index 0000000..1444dc9
--- /dev/null
+++ b/dvb-t/se-Ljustorp
@@ -0,0 +1,5 @@
+# Sweden - Ljustorp
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ljusvattnet b/dvb-t/se-Ljusvattnet
new file mode 100644
index 0000000..25026ca
--- /dev/null
+++ b/dvb-t/se-Ljusvattnet
@@ -0,0 +1,5 @@
+# Sweden - Ljusvattnet
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Loderups_Strandbad b/dvb-t/se-Loderups_Strandbad
new file mode 100644
index 0000000..a9b4073
--- /dev/null
+++ b/dvb-t/se-Loderups_Strandbad
@@ -0,0 +1,5 @@
+# Sweden - Löderups Strandbad
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Loffstrand b/dvb-t/se-Loffstrand
index ffcb4e2..440ac0a 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-Lofsdalen b/dvb-t/se-Lofsdalen
new file mode 100644
index 0000000..dcae230
--- /dev/null
+++ b/dvb-t/se-Lofsdalen
@@ -0,0 +1,5 @@
+# Sweden - Lofsdalen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Logdealv b/dvb-t/se-Logdealv
new file mode 100644
index 0000000..b1a7ac9
--- /dev/null
+++ b/dvb-t/se-Logdealv
@@ -0,0 +1,5 @@
+# Sweden - Lögdeälv
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Lonneberga b/dvb-t/se-Lonneberga
index 91768ff..492c6c1 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-Lovanger b/dvb-t/se-Lovanger
new file mode 100644
index 0000000..0e05df5
--- /dev/null
+++ b/dvb-t/se-Lovanger
@@ -0,0 +1,5 @@
+# Sweden - Lövånger
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ludvika_Bjorkasen b/dvb-t/se-Ludvika_Bjorkasen
index 165a8d3..8512a0d 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 dcf4adb..b5ec6dd 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-Mala b/dvb-t/se-Mala
new file mode 100644
index 0000000..96fce5a
--- /dev/null
+++ b/dvb-t/se-Mala
@@ -0,0 +1,5 @@
+# Sweden - Malå
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Malmo_Jagersro b/dvb-t/se-Malmo_Jagersro
index 1587396..c8725c9 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 3d68151..4ea6361 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-Manserud b/dvb-t/se-Manserud
new file mode 100644
index 0000000..a9ee5b0
--- /dev/null
+++ b/dvb-t/se-Manserud
@@ -0,0 +1,5 @@
+# Sweden - Månserud
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mardsjo b/dvb-t/se-Mardsjo
new file mode 100644
index 0000000..ddf67ba
--- /dev/null
+++ b/dvb-t/se-Mardsjo
@@ -0,0 +1,5 @@
+# Sweden - Mårdsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mariannelund b/dvb-t/se-Mariannelund
index 1c9dcf9..21b5100 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 d78df38..453807e 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 62bacff..4f0b82b 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-Matsdal b/dvb-t/se-Matsdal
new file mode 100644
index 0000000..a06ec36
--- /dev/null
+++ b/dvb-t/se-Matsdal
@@ -0,0 +1,5 @@
+# Sweden - Matsdal
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Medstugan b/dvb-t/se-Medstugan
new file mode 100644
index 0000000..2ca7194
--- /dev/null
+++ b/dvb-t/se-Medstugan
@@ -0,0 +1,5 @@
+# Sweden - Medstugan
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mittadalen b/dvb-t/se-Mittadalen
new file mode 100644
index 0000000..ddbc60a
--- /dev/null
+++ b/dvb-t/se-Mittadalen
@@ -0,0 +1,5 @@
+# Sweden - Mittådalen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mjallom b/dvb-t/se-Mjallom
new file mode 100644
index 0000000..8f0ea29
--- /dev/null
+++ b/dvb-t/se-Mjallom
@@ -0,0 +1,35 @@
+# Sweden - Mjällom
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Mjosjo b/dvb-t/se-Mjosjo
new file mode 100644
index 0000000..ea339fd
--- /dev/null
+++ b/dvb-t/se-Mjosjo
@@ -0,0 +1,5 @@
+# Sweden - Mjösjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Moliden b/dvb-t/se-Moliden
new file mode 100644
index 0000000..6067827
--- /dev/null
+++ b/dvb-t/se-Moliden
@@ -0,0 +1,5 @@
+# Sweden - Moliden
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Molnbo_Tallstugan b/dvb-t/se-Molnbo_Tallstugan
new file mode 100644
index 0000000..5aa6176
--- /dev/null
+++ b/dvb-t/se-Molnbo_Tallstugan
@@ -0,0 +1,35 @@
+# Sweden - Mölnbo/Tallstugan
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Molndal_Vasterberget b/dvb-t/se-Molndal_Vasterberget
index bafdb49..8bc3122 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 a5c466c..322331b 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-Morkret b/dvb-t/se-Morkret
new file mode 100644
index 0000000..cac8286
--- /dev/null
+++ b/dvb-t/se-Morkret
@@ -0,0 +1,5 @@
+# Sweden - Mörkret
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Moskosel b/dvb-t/se-Moskosel
new file mode 100644
index 0000000..7c20752
--- /dev/null
+++ b/dvb-t/se-Moskosel
@@ -0,0 +1,5 @@
+# Sweden - Moskosel
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Motala_Ervasteby b/dvb-t/se-Motala_Ervasteby
index 90a3f85..eb46976 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 495ee61..af676e5 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-Munkedal b/dvb-t/se-Munkedal
new file mode 100644
index 0000000..bc022c3
--- /dev/null
+++ b/dvb-t/se-Munkedal
@@ -0,0 +1,35 @@
+# Sweden - Munkedal
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Munkfors b/dvb-t/se-Munkfors
new file mode 100644
index 0000000..5dcc656
--- /dev/null
+++ b/dvb-t/se-Munkfors
@@ -0,0 +1,35 @@
+# Sweden - Munkfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Muodoslompolo b/dvb-t/se-Muodoslompolo
new file mode 100644
index 0000000..b10d741
--- /dev/null
+++ b/dvb-t/se-Muodoslompolo
@@ -0,0 +1,5 @@
+# Sweden - Muodoslompolo
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nalden b/dvb-t/se-Nalden
new file mode 100644
index 0000000..42e4ebe
--- /dev/null
+++ b/dvb-t/se-Nalden
@@ -0,0 +1,5 @@
+# Sweden - Nälden
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nasaker b/dvb-t/se-Nasaker
new file mode 100644
index 0000000..5df6e2c
--- /dev/null
+++ b/dvb-t/se-Nasaker
@@ -0,0 +1,5 @@
+# Sweden - Näsåker
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nasanget b/dvb-t/se-Nasanget
new file mode 100644
index 0000000..381ac65
--- /dev/null
+++ b/dvb-t/se-Nasanget
@@ -0,0 +1,5 @@
+# Sweden - Näsänget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nassjo b/dvb-t/se-Nassjo
index 0df0029..7b16284 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-Nasteln b/dvb-t/se-Nasteln
new file mode 100644
index 0000000..e47ade6
--- /dev/null
+++ b/dvb-t/se-Nasteln
@@ -0,0 +1,5 @@
+# Sweden - Nästeln
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Navekvarn b/dvb-t/se-Navekvarn
index cc00cb7..cccc63e 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-Naverede_Oberget b/dvb-t/se-Naverede_Oberget
new file mode 100644
index 0000000..b6e6fb6
--- /dev/null
+++ b/dvb-t/se-Naverede_Oberget
@@ -0,0 +1,5 @@
+# Sweden - Näverede Öberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Niemisel b/dvb-t/se-Niemisel
new file mode 100644
index 0000000..eee6be7
--- /dev/null
+++ b/dvb-t/se-Niemisel
@@ -0,0 +1,5 @@
+# Sweden - Niemisel
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nordanede b/dvb-t/se-Nordanede
new file mode 100644
index 0000000..3a2ad29
--- /dev/null
+++ b/dvb-t/se-Nordanede
@@ -0,0 +1,5 @@
+# Sweden - Nordanede
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nordmaling b/dvb-t/se-Nordmaling
new file mode 100644
index 0000000..9d02cd5
--- /dev/null
+++ b/dvb-t/se-Nordmaling
@@ -0,0 +1,5 @@
+# Sweden - Nordmaling
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norra_Rorum b/dvb-t/se-Norra_Rorum
new file mode 100644
index 0000000..a08dfd8
--- /dev/null
+++ b/dvb-t/se-Norra_Rorum
@@ -0,0 +1,5 @@
+# Sweden - Norra Rörum
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norraker b/dvb-t/se-Norraker
new file mode 100644
index 0000000..cfea43f
--- /dev/null
+++ b/dvb-t/se-Norraker
@@ -0,0 +1,5 @@
+# Sweden - Norråker
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norrfors b/dvb-t/se-Norrfors
new file mode 100644
index 0000000..d9a0cbe
--- /dev/null
+++ b/dvb-t/se-Norrfors
@@ -0,0 +1,5 @@
+# Sweden - Norrfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norrhassel b/dvb-t/se-Norrhassel
new file mode 100644
index 0000000..69b698e
--- /dev/null
+++ b/dvb-t/se-Norrhassel
@@ -0,0 +1,5 @@
+# Sweden - Norrhassel
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norrkoping_Krokek b/dvb-t/se-Norrkoping_Krokek
index 8ccf1b9..f6e6e48 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-Norrtalje_Sodra b/dvb-t/se-Norrtalje_Sodra
new file mode 100644
index 0000000..33b6c8f
--- /dev/null
+++ b/dvb-t/se-Norrtalje_Sodra
@@ -0,0 +1,30 @@
+# Sweden - Norrtälje Södra
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Norsjovallen b/dvb-t/se-Norsjovallen
new file mode 100644
index 0000000..4f3e768
--- /dev/null
+++ b/dvb-t/se-Norsjovallen
@@ -0,0 +1,5 @@
+# Sweden - Norsjövallen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nyhem b/dvb-t/se-Nyhem
new file mode 100644
index 0000000..a7406f4
--- /dev/null
+++ b/dvb-t/se-Nyhem
@@ -0,0 +1,5 @@
+# Sweden - Nyhem
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nyliden b/dvb-t/se-Nyliden
new file mode 100644
index 0000000..c03bc4c
--- /dev/null
+++ b/dvb-t/se-Nyliden
@@ -0,0 +1,5 @@
+# Sweden - Nyliden
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Nynashamn_Vattentornet b/dvb-t/se-Nynashamn_Vattentornet
new file mode 100644
index 0000000..ec118d8
--- /dev/null
+++ b/dvb-t/se-Nynashamn_Vattentornet
@@ -0,0 +1,35 @@
+# Sweden - Nynäshamn/Vattentornet
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Odsmal b/dvb-t/se-Odsmal
new file mode 100644
index 0000000..fff9356
--- /dev/null
+++ b/dvb-t/se-Odsmal
@@ -0,0 +1,5 @@
+# Sweden - Ödsmål
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Olden_Telestation b/dvb-t/se-Olden_Telestation
new file mode 100644
index 0000000..4a65fae
--- /dev/null
+++ b/dvb-t/se-Olden_Telestation
@@ -0,0 +1,5 @@
+# Sweden - Olden/Telestation
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Olkamangi b/dvb-t/se-Olkamangi
new file mode 100644
index 0000000..c76b784
--- /dev/null
+++ b/dvb-t/se-Olkamangi
@@ -0,0 +1,5 @@
+# Sweden - Olkamangi
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Olofstrom b/dvb-t/se-Olofstrom
new file mode 100644
index 0000000..e883dc3
--- /dev/null
+++ b/dvb-t/se-Olofstrom
@@ -0,0 +1,5 @@
+# Sweden - Olofström
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Orebro_Lockhyttan b/dvb-t/se-Orebro_Lockhyttan
index 1ce0d86..036d74b 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-Orkelljunga b/dvb-t/se-Orkelljunga
new file mode 100644
index 0000000..2306c7e
--- /dev/null
+++ b/dvb-t/se-Orkelljunga
@@ -0,0 +1,35 @@
+# Sweden - Örkelljunga
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 212500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Ornskoldsvik_As b/dvb-t/se-Ornskoldsvik_As
index e0fb7c2..b35452c 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 50c9015..8ee04ca 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-Osmo_Bjorsta b/dvb-t/se-Osmo_Bjorsta
new file mode 100644
index 0000000..c5973bf
--- /dev/null
+++ b/dvb-t/se-Osmo_Bjorsta
@@ -0,0 +1,10 @@
+# Sweden - Ösmo/Björsta
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Osterforse b/dvb-t/se-Osterforse
new file mode 100644
index 0000000..ce72b93
--- /dev/null
+++ b/dvb-t/se-Osterforse
@@ -0,0 +1,5 @@
+# Sweden - Österforse
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ostergraninge b/dvb-t/se-Ostergraninge
new file mode 100644
index 0000000..1c0a589
--- /dev/null
+++ b/dvb-t/se-Ostergraninge
@@ -0,0 +1,5 @@
+# Sweden - Östergraninge
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ostersund_Brattasen b/dvb-t/se-Ostersund_Brattasen
index f462756..ddb74a5 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 0142c8f..301063d 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-Ostmark b/dvb-t/se-Ostmark
new file mode 100644
index 0000000..40cb1a7
--- /dev/null
+++ b/dvb-t/se-Ostmark
@@ -0,0 +1,5 @@
+# Sweden - Östmark
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overammer b/dvb-t/se-Overammer
new file mode 100644
index 0000000..db3e13b
--- /dev/null
+++ b/dvb-t/se-Overammer
@@ -0,0 +1,5 @@
+# Sweden - Överammer
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overhogdal b/dvb-t/se-Overhogdal
new file mode 100644
index 0000000..4990749
--- /dev/null
+++ b/dvb-t/se-Overhogdal
@@ -0,0 +1,5 @@
+# Sweden - Överhogdal
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overkalix b/dvb-t/se-Overkalix
index 69b9fd4..56612b8 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-Overklinten b/dvb-t/se-Overklinten
new file mode 100644
index 0000000..5c427ee
--- /dev/null
+++ b/dvb-t/se-Overklinten
@@ -0,0 +1,5 @@
+# Sweden - Överklinten
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overrissjo b/dvb-t/se-Overrissjo
new file mode 100644
index 0000000..030f14f
--- /dev/null
+++ b/dvb-t/se-Overrissjo
@@ -0,0 +1,5 @@
+# Sweden - Överrissjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overtornea_Sarkivaara b/dvb-t/se-Overtornea_Sarkivaara
new file mode 100644
index 0000000..1d9bee0
--- /dev/null
+++ b/dvb-t/se-Overtornea_Sarkivaara
@@ -0,0 +1,35 @@
+# Sweden - Övertorneå Särkivaara
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Overturingen b/dvb-t/se-Overturingen
new file mode 100644
index 0000000..1dbac13
--- /dev/null
+++ b/dvb-t/se-Overturingen
@@ -0,0 +1,5 @@
+# Sweden - Överturingen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Pajala b/dvb-t/se-Pajala
new file mode 100644
index 0000000..a0e7b64
--- /dev/null
+++ b/dvb-t/se-Pajala
@@ -0,0 +1,35 @@
+# Sweden - Pajala
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Paulistrom b/dvb-t/se-Paulistrom
new file mode 100644
index 0000000..60f8253
--- /dev/null
+++ b/dvb-t/se-Paulistrom
@@ -0,0 +1,5 @@
+# Sweden - Pauliström
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Pilgrimstad b/dvb-t/se-Pilgrimstad
new file mode 100644
index 0000000..cbed291
--- /dev/null
+++ b/dvb-t/se-Pilgrimstad
@@ -0,0 +1,5 @@
+# Sweden - Pilgrimstad
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Porjus b/dvb-t/se-Porjus
new file mode 100644
index 0000000..720623d
--- /dev/null
+++ b/dvb-t/se-Porjus
@@ -0,0 +1,35 @@
+# Sweden - Porjus
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Puoltsa b/dvb-t/se-Puoltsa
new file mode 100644
index 0000000..4d3140b
--- /dev/null
+++ b/dvb-t/se-Puoltsa
@@ -0,0 +1,5 @@
+# Sweden - Puoltsa
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ragunda b/dvb-t/se-Ragunda
new file mode 100644
index 0000000..7bd1705
--- /dev/null
+++ b/dvb-t/se-Ragunda
@@ -0,0 +1,35 @@
+# Sweden - Ragunda
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ramsele_Skavasen b/dvb-t/se-Ramsele_Skavasen
new file mode 100644
index 0000000..fbd6e4a
--- /dev/null
+++ b/dvb-t/se-Ramsele_Skavasen
@@ -0,0 +1,35 @@
+# Sweden - Ramsele Skavåsen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ramsjo b/dvb-t/se-Ramsjo
new file mode 100644
index 0000000..8bb3ffe
--- /dev/null
+++ b/dvb-t/se-Ramsjo
@@ -0,0 +1,5 @@
+# Sweden - Ramsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ramundberget b/dvb-t/se-Ramundberget
new file mode 100644
index 0000000..0f8c169
--- /dev/null
+++ b/dvb-t/se-Ramundberget
@@ -0,0 +1,5 @@
+# Sweden - Ramundberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Randalen b/dvb-t/se-Randalen
new file mode 100644
index 0000000..c0f4230
--- /dev/null
+++ b/dvb-t/se-Randalen
@@ -0,0 +1,5 @@
+# Sweden - Råndalen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Randijaure b/dvb-t/se-Randijaure
new file mode 100644
index 0000000..ccfa86b
--- /dev/null
+++ b/dvb-t/se-Randijaure
@@ -0,0 +1,5 @@
+# Sweden - Randijaure
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ransater b/dvb-t/se-Ransater
new file mode 100644
index 0000000..8615695
--- /dev/null
+++ b/dvb-t/se-Ransater
@@ -0,0 +1,5 @@
+# Sweden - Ransäter
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Rattvik b/dvb-t/se-Rattvik
index 5289950..725bc8b 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-Renstrom b/dvb-t/se-Renstrom
new file mode 100644
index 0000000..f710ec3
--- /dev/null
+++ b/dvb-t/se-Renstrom
@@ -0,0 +1,5 @@
+# Sweden - Renström
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Resele b/dvb-t/se-Resele
new file mode 100644
index 0000000..b706c87
--- /dev/null
+++ b/dvb-t/se-Resele
@@ -0,0 +1,5 @@
+# Sweden - Resele
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Risback b/dvb-t/se-Risback
new file mode 100644
index 0000000..f27173e
--- /dev/null
+++ b/dvb-t/se-Risback
@@ -0,0 +1,5 @@
+# Sweden - Risbäck
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Rissna b/dvb-t/se-Rissna
new file mode 100644
index 0000000..29efffe
--- /dev/null
+++ b/dvb-t/se-Rissna
@@ -0,0 +1,5 @@
+# Sweden - Rissna
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ritsem b/dvb-t/se-Ritsem
new file mode 100644
index 0000000..4c98209
--- /dev/null
+++ b/dvb-t/se-Ritsem
@@ -0,0 +1,5 @@
+# Sweden - Ritsem
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Robertsfors b/dvb-t/se-Robertsfors
new file mode 100644
index 0000000..01f0cee
--- /dev/null
+++ b/dvb-t/se-Robertsfors
@@ -0,0 +1,5 @@
+# Sweden - Robertsfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Rojdafors b/dvb-t/se-Rojdafors
new file mode 100644
index 0000000..0119dbb
--- /dev/null
+++ b/dvb-t/se-Rojdafors
@@ -0,0 +1,5 @@
+# Sweden - Röjdåfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ronnang b/dvb-t/se-Ronnang
new file mode 100644
index 0000000..5e8607f
--- /dev/null
+++ b/dvb-t/se-Ronnang
@@ -0,0 +1,5 @@
+# Sweden - Rönnäng
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Rosson b/dvb-t/se-Rosson
new file mode 100644
index 0000000..6807bd3
--- /dev/null
+++ b/dvb-t/se-Rosson
@@ -0,0 +1,5 @@
+# Sweden - Rossön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Rusksele b/dvb-t/se-Rusksele
new file mode 100644
index 0000000..75d36e4
--- /dev/null
+++ b/dvb-t/se-Rusksele
@@ -0,0 +1,5 @@
+# Sweden - Rusksele
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sadvaluspen b/dvb-t/se-Sadvaluspen
new file mode 100644
index 0000000..6510a36
--- /dev/null
+++ b/dvb-t/se-Sadvaluspen
@@ -0,0 +1,5 @@
+# Sweden - Sädvaluspen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Saivomuotka b/dvb-t/se-Saivomuotka
new file mode 100644
index 0000000..57b43a6
--- /dev/null
+++ b/dvb-t/se-Saivomuotka
@@ -0,0 +1,5 @@
+# Sweden - Saivomuotka
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Savar_Sorbyn b/dvb-t/se-Savar_Sorbyn
new file mode 100644
index 0000000..4c924bd
--- /dev/null
+++ b/dvb-t/se-Savar_Sorbyn
@@ -0,0 +1,5 @@
+# Sweden - Sävar Sörbyn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Savast b/dvb-t/se-Savast
new file mode 100644
index 0000000..ea99007
--- /dev/null
+++ b/dvb-t/se-Savast
@@ -0,0 +1,5 @@
+# Sweden - Sävast
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Seitevaare b/dvb-t/se-Seitevaare
new file mode 100644
index 0000000..a02c831
--- /dev/null
+++ b/dvb-t/se-Seitevaare
@@ -0,0 +1,5 @@
+# Sweden - Seitevaare
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Selanger b/dvb-t/se-Selanger
new file mode 100644
index 0000000..8ea3e2a
--- /dev/null
+++ b/dvb-t/se-Selanger
@@ -0,0 +1,5 @@
+# Sweden - Selånger
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Seltjarn b/dvb-t/se-Seltjarn
new file mode 100644
index 0000000..3914c8d
--- /dev/null
+++ b/dvb-t/se-Seltjarn
@@ -0,0 +1,5 @@
+# Sweden - Seltjärn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sidensjo_Aberget b/dvb-t/se-Sidensjo_Aberget
new file mode 100644
index 0000000..1ae9b5b
--- /dev/null
+++ b/dvb-t/se-Sidensjo_Aberget
@@ -0,0 +1,5 @@
+# Sweden - Sidensjö Åberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Simrishamn_Fabriksgatan b/dvb-t/se-Simrishamn_Fabriksgatan
new file mode 100644
index 0000000..e5583de
--- /dev/null
+++ b/dvb-t/se-Simrishamn_Fabriksgatan
@@ -0,0 +1,35 @@
+# Sweden - Simrishamn/Fabriksgatan
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 212500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Skalan b/dvb-t/se-Skalan
new file mode 100644
index 0000000..71362e5
--- /dev/null
+++ b/dvb-t/se-Skalan
@@ -0,0 +1,5 @@
+# Sweden - Skålan
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skalmsjo b/dvb-t/se-Skalmsjo
new file mode 100644
index 0000000..7f4bd42
--- /dev/null
+++ b/dvb-t/se-Skalmsjo
@@ -0,0 +1,5 @@
+# Sweden - Skalmsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skarvangen b/dvb-t/se-Skarvangen
new file mode 100644
index 0000000..ebe9594
--- /dev/null
+++ b/dvb-t/se-Skarvangen
@@ -0,0 +1,5 @@
+# Sweden - Skärvången
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skaulo_Pyhakielinen b/dvb-t/se-Skaulo_Pyhakielinen
new file mode 100644
index 0000000..fbfef7b
--- /dev/null
+++ b/dvb-t/se-Skaulo_Pyhakielinen
@@ -0,0 +1,5 @@
+# Sweden - Skaulo Pyhäkielinen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skelleftea b/dvb-t/se-Skelleftea
index 955d038..6ab1400 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-Skillingsfors b/dvb-t/se-Skillingsfors
new file mode 100644
index 0000000..c635db5
--- /dev/null
+++ b/dvb-t/se-Skillingsfors
@@ -0,0 +1,5 @@
+# Sweden - Skillingsfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skorped b/dvb-t/se-Skorped
new file mode 100644
index 0000000..694e3e3
--- /dev/null
+++ b/dvb-t/se-Skorped
@@ -0,0 +1,5 @@
+# Sweden - Skorped
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skottsund b/dvb-t/se-Skottsund
new file mode 100644
index 0000000..862c044
--- /dev/null
+++ b/dvb-t/se-Skottsund
@@ -0,0 +1,5 @@
+# Sweden - Skottsund
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skovde b/dvb-t/se-Skovde
index 431f510..4a5f8b2 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-Skroven b/dvb-t/se-Skroven
new file mode 100644
index 0000000..98e24f0
--- /dev/null
+++ b/dvb-t/se-Skroven
@@ -0,0 +1,5 @@
+# Sweden - Skröven
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Skymnas b/dvb-t/se-Skymnas
new file mode 100644
index 0000000..1658d63
--- /dev/null
+++ b/dvb-t/se-Skymnas
@@ -0,0 +1,5 @@
+# Sweden - Skymnäs
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Slussfors b/dvb-t/se-Slussfors
new file mode 100644
index 0000000..4a6a9b4
--- /dev/null
+++ b/dvb-t/se-Slussfors
@@ -0,0 +1,5 @@
+# Sweden - Slussfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Smedjebacken_Uvberget b/dvb-t/se-Smedjebacken_Uvberget
index 9befd16..01658df 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 3798f67..6a85f0b 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 6525a79..ce55cd4 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 c2d2d49..065434e 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 8f017b6..1279be4 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 9816a77..8fb8ec3 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-Soraker b/dvb-t/se-Soraker
new file mode 100644
index 0000000..9365215
--- /dev/null
+++ b/dvb-t/se-Soraker
@@ -0,0 +1,5 @@
+# Sweden - Söråker
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sorbygden b/dvb-t/se-Sorbygden
new file mode 100644
index 0000000..20e9d31
--- /dev/null
+++ b/dvb-t/se-Sorbygden
@@ -0,0 +1,5 @@
+# Sweden - Sörbygden
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sorflarke b/dvb-t/se-Sorflarke
new file mode 100644
index 0000000..2e779f4
--- /dev/null
+++ b/dvb-t/se-Sorflarke
@@ -0,0 +1,5 @@
+# Sweden - Sörflärke
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sorsele_Nalovardo b/dvb-t/se-Sorsele_Nalovardo
new file mode 100644
index 0000000..5f8cd7b
--- /dev/null
+++ b/dvb-t/se-Sorsele_Nalovardo
@@ -0,0 +1,5 @@
+# Sweden - Sorsele Nalovardo
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sorsele_Vattentornet b/dvb-t/se-Sorsele_Vattentornet
new file mode 100644
index 0000000..ba7e3c2
--- /dev/null
+++ b/dvb-t/se-Sorsele_Vattentornet
@@ -0,0 +1,5 @@
+# Sweden - Sorsele/Vattentornet
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Soukolojarvi b/dvb-t/se-Soukolojarvi
new file mode 100644
index 0000000..6d5e247
--- /dev/null
+++ b/dvb-t/se-Soukolojarvi
@@ -0,0 +1,5 @@
+# Sweden - Soukolojärvi
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stalon b/dvb-t/se-Stalon
new file mode 100644
index 0000000..ce88159
--- /dev/null
+++ b/dvb-t/se-Stalon
@@ -0,0 +1,5 @@
+# Sweden - Stalon
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stigsjo b/dvb-t/se-Stigsjo
new file mode 100644
index 0000000..137a59e
--- /dev/null
+++ b/dvb-t/se-Stigsjo
@@ -0,0 +1,5 @@
+# Sweden - Stigsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stockholm_Marieberg b/dvb-t/se-Stockholm_Marieberg
index 0d5dc83..0ae30a2 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 f9b4b49..b534504 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-Stode_Hullsjon b/dvb-t/se-Stode_Hullsjon
new file mode 100644
index 0000000..e46bc80
--- /dev/null
+++ b/dvb-t/se-Stode_Hullsjon
@@ -0,0 +1,5 @@
+# Sweden - Stöde/Hullsjön
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stode_Intaget b/dvb-t/se-Stode_Intaget
new file mode 100644
index 0000000..deb3bab
--- /dev/null
+++ b/dvb-t/se-Stode_Intaget
@@ -0,0 +1,35 @@
+# Sweden - Stöde Intaget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stomne_Skasas b/dvb-t/se-Stomne_Skasas
new file mode 100644
index 0000000..7e293ba
--- /dev/null
+++ b/dvb-t/se-Stomne_Skasas
@@ -0,0 +1,5 @@
+# Sweden - Stömne/Skasås
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stordalen b/dvb-t/se-Stordalen
new file mode 100644
index 0000000..75656dd
--- /dev/null
+++ b/dvb-t/se-Stordalen
@@ -0,0 +1,5 @@
+# Sweden - Stordalen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Storlien b/dvb-t/se-Storlien
new file mode 100644
index 0000000..10e2522
--- /dev/null
+++ b/dvb-t/se-Storlien
@@ -0,0 +1,5 @@
+# Sweden - Storlien
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Storuman b/dvb-t/se-Storuman
index f2ce368..9fe23fc 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 51b8c4b..f2609f6 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-Stromsund_Grelsgard b/dvb-t/se-Stromsund_Grelsgard
new file mode 100644
index 0000000..a126552
--- /dev/null
+++ b/dvb-t/se-Stromsund_Grelsgard
@@ -0,0 +1,35 @@
+# Sweden - Strömsund/Grelsgård
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Stugun b/dvb-t/se-Stugun
new file mode 100644
index 0000000..e4b6218
--- /dev/null
+++ b/dvb-t/se-Stugun
@@ -0,0 +1,5 @@
+# Sweden - Stugun
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Suddesjaur b/dvb-t/se-Suddesjaur
new file mode 100644
index 0000000..36a53dc
--- /dev/null
+++ b/dvb-t/se-Suddesjaur
@@ -0,0 +1,5 @@
+# Sweden - Suddesjaur
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Suijavaara b/dvb-t/se-Suijavaara
new file mode 100644
index 0000000..1f0371b
--- /dev/null
+++ b/dvb-t/se-Suijavaara
@@ -0,0 +1,5 @@
+# Sweden - Suijavaara
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sulvik b/dvb-t/se-Sulvik
new file mode 100644
index 0000000..d26f593
--- /dev/null
+++ b/dvb-t/se-Sulvik
@@ -0,0 +1,5 @@
+# Sweden - Sulvik
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sundsbruk b/dvb-t/se-Sundsbruk
index d3a3c74..9c7a7fd 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 6fd61d8..cf6bbdc 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_As b/dvb-t/se-Sunne_As
new file mode 100644
index 0000000..c94500e
--- /dev/null
+++ b/dvb-t/se-Sunne_As
@@ -0,0 +1,5 @@
+# Sweden - Sunne/Ås
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sunne_Blabarskullen b/dvb-t/se-Sunne_Blabarskullen
index 54e7faf..c0f29a9 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-Sunnemo b/dvb-t/se-Sunnemo
new file mode 100644
index 0000000..18beec2
--- /dev/null
+++ b/dvb-t/se-Sunnemo
@@ -0,0 +1,5 @@
+# Sweden - Sunnemo
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svaneholm b/dvb-t/se-Svaneholm
new file mode 100644
index 0000000..9b32d44
--- /dev/null
+++ b/dvb-t/se-Svaneholm
@@ -0,0 +1,5 @@
+# Sweden - Svaneholm
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svanstein b/dvb-t/se-Svanstein
new file mode 100644
index 0000000..97e1d3e
--- /dev/null
+++ b/dvb-t/se-Svanstein
@@ -0,0 +1,5 @@
+# Sweden - Svanstein
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svardsosund_Svardso b/dvb-t/se-Svardsosund_Svardso
new file mode 100644
index 0000000..233c10e
--- /dev/null
+++ b/dvb-t/se-Svardsosund_Svardso
@@ -0,0 +1,5 @@
+# Sweden - Svärdsösund/Svärdsö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Sveg_Brickan b/dvb-t/se-Sveg_Brickan
index ddc8a3a..b385b98 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-Sveg_Ransjo b/dvb-t/se-Sveg_Ransjo
new file mode 100644
index 0000000..fb503d9
--- /dev/null
+++ b/dvb-t/se-Sveg_Ransjo
@@ -0,0 +1,5 @@
+# Sweden - Sveg/Ransjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svenstavik b/dvb-t/se-Svenstavik
new file mode 100644
index 0000000..551e33f
--- /dev/null
+++ b/dvb-t/se-Svenstavik
@@ -0,0 +1,5 @@
+# Sweden - Svenstavik
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Svinesund b/dvb-t/se-Svinesund
new file mode 100644
index 0000000..32c5098
--- /dev/null
+++ b/dvb-t/se-Svinesund
@@ -0,0 +1,5 @@
+# Sweden - Svinesund
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Syssleback b/dvb-t/se-Syssleback
new file mode 100644
index 0000000..b2be682
--- /dev/null
+++ b/dvb-t/se-Syssleback
@@ -0,0 +1,35 @@
+# Sweden - Sysslebäck
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 198500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Tandadalen b/dvb-t/se-Tandadalen
index 1361c86..e726d3a 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-Tannas_Vastra b/dvb-t/se-Tannas_Vastra
new file mode 100644
index 0000000..9e1799c
--- /dev/null
+++ b/dvb-t/se-Tannas_Vastra
@@ -0,0 +1,5 @@
+# Sweden - Tännäs Västra
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tanndalen b/dvb-t/se-Tanndalen
new file mode 100644
index 0000000..ca4b668
--- /dev/null
+++ b/dvb-t/se-Tanndalen
@@ -0,0 +1,5 @@
+# Sweden - Tänndalen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tarnaby_Ryfjallet b/dvb-t/se-Tarnaby_Ryfjallet
new file mode 100644
index 0000000..62720a9
--- /dev/null
+++ b/dvb-t/se-Tarnaby_Ryfjallet
@@ -0,0 +1,35 @@
+# Sweden - Tärnaby Ryfjället
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tarnamo b/dvb-t/se-Tarnamo
new file mode 100644
index 0000000..0fd4e93
--- /dev/null
+++ b/dvb-t/se-Tarnamo
@@ -0,0 +1,5 @@
+# Sweden - Tärnamo
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tasjo b/dvb-t/se-Tasjo
index 4cc782e..b195854 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-Tavelsjo b/dvb-t/se-Tavelsjo
new file mode 100644
index 0000000..f300992
--- /dev/null
+++ b/dvb-t/se-Tavelsjo
@@ -0,0 +1,5 @@
+# Sweden - Tavelsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tocksfors b/dvb-t/se-Tocksfors
new file mode 100644
index 0000000..2c08794
--- /dev/null
+++ b/dvb-t/se-Tocksfors
@@ -0,0 +1,35 @@
+# Sweden - Töcksfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Tormestorp b/dvb-t/se-Tormestorp
new file mode 100644
index 0000000..d4bf449
--- /dev/null
+++ b/dvb-t/se-Tormestorp
@@ -0,0 +1,5 @@
+# Sweden - Tormestorp
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tornetrask b/dvb-t/se-Tornetrask
new file mode 100644
index 0000000..c97b3d6
--- /dev/null
+++ b/dvb-t/se-Tornetrask
@@ -0,0 +1,5 @@
+# Sweden - Torneträsk
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Torpshammar b/dvb-t/se-Torpshammar
new file mode 100644
index 0000000..2510268
--- /dev/null
+++ b/dvb-t/se-Torpshammar
@@ -0,0 +1,35 @@
+# Sweden - Torpshammar
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Torsby_Bada b/dvb-t/se-Torsby_Bada
index 278ae9e..fc3e506 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 1d2dede..7e88588 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 4fca78f..2d140a9 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 30ead5c..6a7bcdf 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-Trehorningsjo b/dvb-t/se-Trehorningsjo
new file mode 100644
index 0000000..e14d48d
--- /dev/null
+++ b/dvb-t/se-Trehorningsjo
@@ -0,0 +1,5 @@
+# Sweden - Trehörningsjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Trelleborg_Gylle b/dvb-t/se-Trelleborg_Gylle
new file mode 100644
index 0000000..d127f66
--- /dev/null
+++ b/dvb-t/se-Trelleborg_Gylle
@@ -0,0 +1,35 @@
+# Sweden - Trelleborg/Gylle
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 212500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Trollhattan b/dvb-t/se-Trollhattan
index 0767d31..72ca060 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-Tullinge_Hamra b/dvb-t/se-Tullinge_Hamra
new file mode 100644
index 0000000..b1b15aa
--- /dev/null
+++ b/dvb-t/se-Tullinge_Hamra
@@ -0,0 +1,35 @@
+# Sweden - Tullinge/Hamra
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tyringe b/dvb-t/se-Tyringe
new file mode 100644
index 0000000..1222e5c
--- /dev/null
+++ b/dvb-t/se-Tyringe
@@ -0,0 +1,5 @@
+# Sweden - Tyringe
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Tystberga b/dvb-t/se-Tystberga
index 522f51e..ef240a3 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 96c9c30..bc1992b 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-Uddevalla_Kapelle b/dvb-t/se-Uddevalla_Kapelle
new file mode 100644
index 0000000..7a2668e
--- /dev/null
+++ b/dvb-t/se-Uddevalla_Kapelle
@@ -0,0 +1,5 @@
+# Sweden - Uddevalla/Kapelle
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Uggleheden b/dvb-t/se-Uggleheden
new file mode 100644
index 0000000..afbfc68
--- /dev/null
+++ b/dvb-t/se-Uggleheden
@@ -0,0 +1,5 @@
+# Sweden - Uggleheden
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ullanger_Skidsta b/dvb-t/se-Ullanger_Skidsta
new file mode 100644
index 0000000..8f5a54f
--- /dev/null
+++ b/dvb-t/se-Ullanger_Skidsta
@@ -0,0 +1,5 @@
+# Sweden - Ullånger Skidsta
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ulricehamn b/dvb-t/se-Ulricehamn
index b73bf00..759c62f 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-Ulvohamn b/dvb-t/se-Ulvohamn
new file mode 100644
index 0000000..57ae731
--- /dev/null
+++ b/dvb-t/se-Ulvohamn
@@ -0,0 +1,5 @@
+# Sweden - Ulvöhamn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Umea_Mariehem b/dvb-t/se-Umea_Mariehem
new file mode 100644
index 0000000..70f7360
--- /dev/null
+++ b/dvb-t/se-Umea_Mariehem
@@ -0,0 +1,5 @@
+# Sweden - Umeå/Mariehem
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Umfors b/dvb-t/se-Umfors
new file mode 100644
index 0000000..51a1e49
--- /dev/null
+++ b/dvb-t/se-Umfors
@@ -0,0 +1,5 @@
+# Sweden - Umfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Umgransele_Granselelund b/dvb-t/se-Umgransele_Granselelund
new file mode 100644
index 0000000..8fef12a
--- /dev/null
+++ b/dvb-t/se-Umgransele_Granselelund
@@ -0,0 +1,5 @@
+# Sweden - Umgransele/Granselelund
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Undersaker b/dvb-t/se-Undersaker
new file mode 100644
index 0000000..95e816e
--- /dev/null
+++ b/dvb-t/se-Undersaker
@@ -0,0 +1,5 @@
+# Sweden - Undersåker
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Uppsala_Vedyxa b/dvb-t/se-Uppsala_Vedyxa
index 59618d9..55f99a8 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-Utansjo b/dvb-t/se-Utansjo
new file mode 100644
index 0000000..9504400
--- /dev/null
+++ b/dvb-t/se-Utansjo
@@ -0,0 +1,5 @@
+# Sweden - Utansjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Utanskog b/dvb-t/se-Utanskog
new file mode 100644
index 0000000..799d850
--- /dev/null
+++ b/dvb-t/se-Utanskog
@@ -0,0 +1,5 @@
+# Sweden - Utanskog
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vaddo_Elmsta b/dvb-t/se-Vaddo_Elmsta
index 27b78e7..310a1da 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-Valadalen b/dvb-t/se-Valadalen
new file mode 100644
index 0000000..9aeed88
--- /dev/null
+++ b/dvb-t/se-Valadalen
@@ -0,0 +1,5 @@
+# Sweden - Vålådalen
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Valanger b/dvb-t/se-Valanger
new file mode 100644
index 0000000..64e33f1
--- /dev/null
+++ b/dvb-t/se-Valanger
@@ -0,0 +1,5 @@
+# Sweden - Vålånger
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Valdemarsvik b/dvb-t/se-Valdemarsvik
index 9ace1a6..0d7c740 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-Valsjobyn b/dvb-t/se-Valsjobyn
new file mode 100644
index 0000000..dc158b9
--- /dev/null
+++ b/dvb-t/se-Valsjobyn
@@ -0,0 +1,5 @@
+# Sweden - Valsjöbyn
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vannas_Granlundsberget b/dvb-t/se-Vannas_Granlundsberget
index 7031e18..53e7df0 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 9f090b4..6c85acd 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-Varmvattnet b/dvb-t/se-Varmvattnet
new file mode 100644
index 0000000..9e56091
--- /dev/null
+++ b/dvb-t/se-Varmvattnet
@@ -0,0 +1,5 @@
+# Sweden - Varmvattnet
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Varnamo_Alandsryd b/dvb-t/se-Varnamo_Alandsryd
new file mode 100644
index 0000000..f9f6414
--- /dev/null
+++ b/dvb-t/se-Varnamo_Alandsryd
@@ -0,0 +1,5 @@
+# Sweden - Värnamo/Alandsryd -
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vassbotten b/dvb-t/se-Vassbotten
new file mode 100644
index 0000000..5aac5e9
--- /dev/null
+++ b/dvb-t/se-Vassbotten
@@ -0,0 +1,5 @@
+# Sweden - Vassbotten
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vassijaure b/dvb-t/se-Vassijaure
new file mode 100644
index 0000000..8d6ebf7
--- /dev/null
+++ b/dvb-t/se-Vassijaure
@@ -0,0 +1,5 @@
+# Sweden - Vassijaure
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vastansjo b/dvb-t/se-Vastansjo
new file mode 100644
index 0000000..dafa88f
--- /dev/null
+++ b/dvb-t/se-Vastansjo
@@ -0,0 +1,5 @@
+# Sweden - Västansjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vasteras_Lillharad b/dvb-t/se-Vasteras_Lillharad
index 8096513..0c50190 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 feee9ef..6b17d38 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-Vato b/dvb-t/se-Vato
new file mode 100644
index 0000000..94721d0
--- /dev/null
+++ b/dvb-t/se-Vato
@@ -0,0 +1,5 @@
+# Sweden - Vätö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vemdalsskalet b/dvb-t/se-Vemdalsskalet
new file mode 100644
index 0000000..2447887
--- /dev/null
+++ b/dvb-t/se-Vemdalsskalet
@@ -0,0 +1,5 @@
+# Sweden - Vemdalsskalet
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vidsel b/dvb-t/se-Vidsel
new file mode 100644
index 0000000..0351783
--- /dev/null
+++ b/dvb-t/se-Vidsel
@@ -0,0 +1,5 @@
+# Sweden - Vidsel
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vietas b/dvb-t/se-Vietas
new file mode 100644
index 0000000..668657b
--- /dev/null
+++ b/dvb-t/se-Vietas
@@ -0,0 +1,5 @@
+# Sweden - Vietas
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Viksjo b/dvb-t/se-Viksjo
new file mode 100644
index 0000000..d004252
--- /dev/null
+++ b/dvb-t/se-Viksjo
@@ -0,0 +1,5 @@
+# Sweden - Viksjö
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vilhelmina b/dvb-t/se-Vilhelmina
new file mode 100644
index 0000000..1adb2a0
--- /dev/null
+++ b/dvb-t/se-Vilhelmina
@@ -0,0 +1,35 @@
+# Sweden - Vilhelmina
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Villands_Vanga b/dvb-t/se-Villands_Vanga
new file mode 100644
index 0000000..431ec0c
--- /dev/null
+++ b/dvb-t/se-Villands_Vanga
@@ -0,0 +1,5 @@
+# Sweden - Villands Vånga
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vindelgransele b/dvb-t/se-Vindelgransele
new file mode 100644
index 0000000..d31e682
--- /dev/null
+++ b/dvb-t/se-Vindelgransele
@@ -0,0 +1,5 @@
+# Sweden - Vindelgransele
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vindeln_Renfors b/dvb-t/se-Vindeln_Renfors
new file mode 100644
index 0000000..d34c836
--- /dev/null
+++ b/dvb-t/se-Vindeln_Renfors
@@ -0,0 +1,35 @@
+# Sweden - Vindeln/Renfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Virserum b/dvb-t/se-Virserum
index 566f69f..32c79bc 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 616e992..33b14fa 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 e60a86d..1c839f1 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-Visby_Havdhem b/dvb-t/se-Visby_Havdhem
new file mode 100644
index 0000000..c376217
--- /dev/null
+++ b/dvb-t/se-Visby_Havdhem
@@ -0,0 +1,35 @@
+# Sweden - Visby/Havdhem
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 205500000
+	BANDWIDTH_HZ = 7000000
diff --git a/dvb-t/se-Vislanda_Nydala b/dvb-t/se-Vislanda_Nydala
index ed2892b..1aaf3ef 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-Vitberget b/dvb-t/se-Vitberget
new file mode 100644
index 0000000..7053f5a
--- /dev/null
+++ b/dvb-t/se-Vitberget
@@ -0,0 +1,5 @@
+# Sweden - Vitberget
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vitsand b/dvb-t/se-Vitsand
new file mode 100644
index 0000000..a1b4dc9
--- /dev/null
+++ b/dvb-t/se-Vitsand
@@ -0,0 +1,5 @@
+# Sweden - Vitsand
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vitsand_Vagsjofors b/dvb-t/se-Vitsand_Vagsjofors
new file mode 100644
index 0000000..c07c012
--- /dev/null
+++ b/dvb-t/se-Vitsand_Vagsjofors
@@ -0,0 +1,5 @@
+# Sweden - Vitsand/Vägsjöfors
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Vuollerim b/dvb-t/se-Vuollerim
new file mode 100644
index 0000000..a034ca8
--- /dev/null
+++ b/dvb-t/se-Vuollerim
@@ -0,0 +1,35 @@
+# Sweden - Vuollerim
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
diff --git a/dvb-t/se-Ystad_Metallgatan b/dvb-t/se-Ystad_Metallgatan
index a124e2d..5c250b5 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