update Brazilian scan files

Data updated according with https://portalbsd.com.br/.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

2476 files changed, 69312 insertions, 12805 deletions

diff --git a/isdb-t/br-ac-Brasileia b/isdb-t/br-ac-Brasileia
new file mode 100644
index 00000000..c7b38c37
--- /dev/null
+++ b/isdb-t/br-ac-Brasileia
@@ -0,0 +1,61 @@
+# Channel table for Brasiléia - AC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=259
+
+# Physical channel 14 (virtual 4.1)
+[Rede Amazônica Rio Branco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 50.1)
+[Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ac-Bujari b/isdb-t/br-ac-Bujari
index ad80a030..687f1660 100644
--- a/isdb-t/br-ac-Bujari
+++ b/isdb-t/br-ac-Bujari
@@ -1,8 +1,8 @@
 # Channel table for Bujari - AC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2473
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2473
 
 # Physical channel 14 (virtual 4.1)
-[TV Acre]
+[Rede Amazônica Rio Branco]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 27.1)
-[TV Diocese]
+# Physical channel 26 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 8.1)
+[TV Rio Branco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 11.1)
 [TV Gazeta AC]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 21.1)
-[ABC TV Rio Branco]
+# Physical channel 42 (virtual 7.1)
+[TVA Rio Branco]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ac-CruzeiroDoSul b/isdb-t/br-ac-CruzeiroDoSul
index e26216f6..7bf88a3e 100644
--- a/isdb-t/br-ac-CruzeiroDoSul
+++ b/isdb-t/br-ac-CruzeiroDoSul
@@ -1,8 +1,8 @@
 # Channel table for Cruzeiro Do Sul - AC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/197
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=197
 
 # Physical channel 22 (virtual 5.1)
-[TV Cruzeiro do Sul]
+[Rede Amazônica Cruzeiro do Sul]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 36.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 44 (virtual 10.1)
 [TV Juruá]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ac-Epitaciolandia b/isdb-t/br-ac-Epitaciolandia
new file mode 100644
index 00000000..f4e2c43a
--- /dev/null
+++ b/isdb-t/br-ac-Epitaciolandia
@@ -0,0 +1,61 @@
+# Channel table for Epitaciol�ndia - AC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2474
+
+# Physical channel 14 (virtual 4.1)
+[Rede Amazônica Rio Branco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 50.1)
+[Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ac-PortoAcre b/isdb-t/br-ac-PortoAcre
index 443abd46..bcefadb4 100644
--- a/isdb-t/br-ac-PortoAcre
+++ b/isdb-t/br-ac-PortoAcre
@@ -1,8 +1,8 @@
 # Channel table for Porto Acre - AC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/598
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=598
 
 # Physical channel 14 (virtual 4.1)
-[TV Acre]
+[Rede Amazônica Rio Branco]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 27.1)
-[TV Diocese]
+# Physical channel 26 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 8.1)
+[TV Rio Branco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 11.1)
 [TV Gazeta AC]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 7.1)
+[TVA Rio Branco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ac-RioBranco b/isdb-t/br-ac-RioBranco
index d596c4e9..5f0ce3db 100644
--- a/isdb-t/br-ac-RioBranco
+++ b/isdb-t/br-ac-RioBranco
@@ -1,8 +1,8 @@
 # Channel table for Rio Branco - AC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/112
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=112
 
 # Physical channel 14 (virtual 4.1)
-[TV Acre]
+[Rede Amazônica Rio Branco]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 21.1)
-[ABC TV Rio Branco]
+# Physical channel 24 (virtual 3.4)
+[TV Câmara, TV ALEAC, TV Câmara Municipal Rio Branco, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.4)
-[TV Câmara, TV ALEAC, TV Senado, TV Câmara Municipal Rio Branco]
+# Physical channel 25 (virtual 25.1)
+[TV Quinari]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 27.1)
-[TV Diocese]
+# Physical channel 26 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 35.1)
-[TV Nazaré]
+[TV Diocese]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[Rede Brasil]
+[TV Cidade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -320,7 +320,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 42.1)
+# Physical channel 40 (virtual 9.1)
+[TV Cultura]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 41.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -349,6 +378,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 7.1)
+[TVA Rio Branco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 44 (virtual 44.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
@@ -407,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 50.1)
-[Boas Novas]
+# Physical channel 49 (virtual 50.2)
+[Rede TV!, Boas Novas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-ac-SenadorGuiomard b/isdb-t/br-ac-SenadorGuiomard
index 656bcb13..ea4b67be 100644
--- a/isdb-t/br-ac-SenadorGuiomard
+++ b/isdb-t/br-ac-SenadorGuiomard
@@ -1,8 +1,37 @@
 # Channel table for Senador Guiomard - AC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/712
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=712
 
-# Physical channel 26 (virtual 27.1)
-[TV Diocese]
+# Physical channel 25 (virtual 25.1)
+[TV Quinari]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -30,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 8.1)
+[TV Rio Branco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 11.1)
 [TV Gazeta AC]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 21.1)
-[ABC TV Rio Branco]
+# Physical channel 42 (virtual 7.1)
+[TVA Rio Branco]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-al-Arapiraca b/isdb-t/br-al-Arapiraca
index 79b3b9ca..8274abac 100644
--- a/isdb-t/br-al-Arapiraca
+++ b/isdb-t/br-al-Arapiraca
@@ -1,5 +1,5 @@
 # Channel table for Arapiraca - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/543
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=543
 
 # Physical channel 32 (virtual 5.1)
 [TV Ponta Verde]
@@ -117,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[Band Maceió]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-al-Atalaia b/isdb-t/br-al-Atalaia
index 4e21b927..b3d9d489 100644
--- a/isdb-t/br-al-Atalaia
+++ b/isdb-t/br-al-Atalaia
@@ -1,5 +1,5 @@
 # Channel table for Atalaia - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2244
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2244
 
 # Physical channel 21 (virtual 7.1)
 [TV Gazeta AL]
diff --git a/isdb-t/br-al-BarraDeSaoMiguel b/isdb-t/br-al-BarraDeSaoMiguel
index 74a212e3..4ffc0f0f 100644
--- a/isdb-t/br-al-BarraDeSaoMiguel
+++ b/isdb-t/br-al-BarraDeSaoMiguel
@@ -1,5 +1,5 @@
-# Channel table for Barra De São Miguel - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3641
+# Channel table for Barra De S�o Miguel - AL - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3641
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 33.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-al-Batalha b/isdb-t/br-al-Batalha
index 47aced61..4c6fc3bd 100644
--- a/isdb-t/br-al-Batalha
+++ b/isdb-t/br-al-Batalha
@@ -1,5 +1,5 @@
 # Channel table for Batalha - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2245
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2245
 
 # Physical channel 21 (virtual 21.1)
 [TV Gazeta AL]
diff --git a/isdb-t/br-al-BocaDaMata b/isdb-t/br-al-BocaDaMata
index eae21df5..59b21f05 100644
--- a/isdb-t/br-al-BocaDaMata
+++ b/isdb-t/br-al-BocaDaMata
@@ -1,5 +1,5 @@
 # Channel table for Boca Da Mata - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2246
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2246
 
 # Physical channel 19 (virtual 5.1)
 [TV Ponta Verde]
diff --git a/isdb-t/br-al-Branquinha b/isdb-t/br-al-Branquinha
index 5b11a910..c986fb5c 100644
--- a/isdb-t/br-al-Branquinha
+++ b/isdb-t/br-al-Branquinha
@@ -1,5 +1,5 @@
 # Channel table for Branquinha - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2247
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2247
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
diff --git a/isdb-t/br-al-CoqueiroSeco b/isdb-t/br-al-CoqueiroSeco
index 8388656a..f26cc240 100644
--- a/isdb-t/br-al-CoqueiroSeco
+++ b/isdb-t/br-al-CoqueiroSeco
@@ -1,5 +1,5 @@
 # Channel table for Coqueiro Seco - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3636
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3636
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 27.1)
-[Rede Vida]
+# Physical channel 26 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 33.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-al-Coruripe b/isdb-t/br-al-Coruripe
index a6280922..2356f5a7 100644
--- a/isdb-t/br-al-Coruripe
+++ b/isdb-t/br-al-Coruripe
@@ -1,5 +1,5 @@
 # Channel table for Coruripe - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2250
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2250
 
 # Physical channel 41 (virtual 36.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-al-Craibas b/isdb-t/br-al-Craibas
index 6b7b7b40..33df4b20 100644
--- a/isdb-t/br-al-Craibas
+++ b/isdb-t/br-al-Craibas
@@ -1,5 +1,5 @@
-# Channel table for Craíbas - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3058
+# Channel table for Cra�bas - AL - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3058
 
 # Physical channel 43 (virtual 9.1)
 [TV Pajuçara]
diff --git a/isdb-t/br-al-DelmiroGouveia b/isdb-t/br-al-DelmiroGouveia
index e8e5b6e4..540cca73 100644
--- a/isdb-t/br-al-DelmiroGouveia
+++ b/isdb-t/br-al-DelmiroGouveia
@@ -1,8 +1,8 @@
 # Channel table for Delmiro Gouveia - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1258
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1258
 
 # Physical channel 26 (virtual 26.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
diff --git a/isdb-t/br-al-FeiraGrande b/isdb-t/br-al-FeiraGrande
index 61e9d09d..f0e9c925 100644
--- a/isdb-t/br-al-FeiraGrande
+++ b/isdb-t/br-al-FeiraGrande
@@ -1,5 +1,5 @@
 # Channel table for Feira Grande - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3432
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3432
 
 # Physical channel 43 (virtual 9.1)
 [TV Pajuçara]
diff --git a/isdb-t/br-al-GirauDoPonciano b/isdb-t/br-al-GirauDoPonciano
index 5b9812df..a2925e9c 100644
--- a/isdb-t/br-al-GirauDoPonciano
+++ b/isdb-t/br-al-GirauDoPonciano
@@ -1,5 +1,5 @@
 # Channel table for Girau Do Ponciano - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3301
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3301
 
 # Physical channel 41 (virtual 34.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-al-Junqueiro b/isdb-t/br-al-Junqueiro
index 8e4de27d..8e88dfbe 100644
--- a/isdb-t/br-al-Junqueiro
+++ b/isdb-t/br-al-Junqueiro
@@ -1,5 +1,5 @@
 # Channel table for Junqueiro - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1261
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1261
 
 # Physical channel 43 (virtual 9.1)
 [TV Pajuçara]
diff --git a/isdb-t/br-al-Maceio b/isdb-t/br-al-Maceio
index 6bf94602..e0c02b88 100644
--- a/isdb-t/br-al-Maceio
+++ b/isdb-t/br-al-Maceio
@@ -1,5 +1,5 @@
-# Channel table for Maceió - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/155
+# Channel table for Macei� - AL - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=155
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 27.1)
-[Rede Vida]
+# Physical channel 26 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 33.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -320,6 +320,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 8.4)
+[TV UFAL, TV Brasil 2, TV Escola, Canal Saúde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 13.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -379,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-al-Maragogi b/isdb-t/br-al-Maragogi
index f24b140d..a86216e6 100644
--- a/isdb-t/br-al-Maragogi
+++ b/isdb-t/br-al-Maragogi
@@ -1,5 +1,5 @@
 # Channel table for Maragogi - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1263
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1263
 
 # Physical channel 40 (virtual 40.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-al-MarechalDeodoro b/isdb-t/br-al-MarechalDeodoro
index 5e52749a..0cdbc85e 100644
--- a/isdb-t/br-al-MarechalDeodoro
+++ b/isdb-t/br-al-MarechalDeodoro
@@ -1,5 +1,5 @@
 # Channel table for Marechal Deodoro - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3630
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3630
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 33.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -349,35 +349,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 44.1)
-[Rede Brasil]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 45 (virtual 9.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-al-MatrizDeCamaragibe b/isdb-t/br-al-MatrizDeCamaragibe
index ec68e08d..837e1c3e 100644
--- a/isdb-t/br-al-MatrizDeCamaragibe
+++ b/isdb-t/br-al-MatrizDeCamaragibe
@@ -1,5 +1,5 @@
 # Channel table for Matriz De Camaragibe - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1264
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1264
 
 # Physical channel 28 (virtual 2.1)
 [TV Jornal]
diff --git a/isdb-t/br-al-Messias b/isdb-t/br-al-Messias
index c5183db8..e0ac3bc4 100644
--- a/isdb-t/br-al-Messias
+++ b/isdb-t/br-al-Messias
@@ -1,5 +1,5 @@
 # Channel table for Messias - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3840
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3840
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-al-Murici b/isdb-t/br-al-Murici
index 0638290f..38465397 100644
--- a/isdb-t/br-al-Murici
+++ b/isdb-t/br-al-Murici
@@ -1,5 +1,5 @@
 # Channel table for Murici - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/554
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=554
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-al-PalmeiraDosIndios b/isdb-t/br-al-PalmeiraDosindios
index 4258aded..eb5b7908 100644
--- a/isdb-t/br-al-PalmeiraDosIndios
+++ b/isdb-t/br-al-PalmeiraDosindios
@@ -1,5 +1,5 @@
-# Channel table for Palmeira Dos Índios - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1004
+# Channel table for Palmeira Dos �ndios - AL - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1004
 
 # Physical channel 22 (virtual 22.1)
 [TV Gazeta AL]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 24.1)
-[Rede Vida]
+# Physical channel 26 (virtual 24.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
diff --git a/isdb-t/br-al-PaoDeAcucar b/isdb-t/br-al-PaoDeAcucar
index 0413a664..d845f277 100644
--- a/isdb-t/br-al-PaoDeAcucar
+++ b/isdb-t/br-al-PaoDeAcucar
@@ -1,5 +1,5 @@
-# Channel table for Pão De Açúcar - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2255
+# Channel table for P�o De A��car - AL - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2255
 
 # Physical channel 22 (virtual 54.1)
 [TV Gazeta AL]
diff --git a/isdb-t/br-al-Penedo b/isdb-t/br-al-Penedo
index ccde65d6..2405e798 100644
--- a/isdb-t/br-al-Penedo
+++ b/isdb-t/br-al-Penedo
@@ -1,5 +1,5 @@
 # Channel table for Penedo - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/555
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=555
 
 # Physical channel 21 (virtual 17.1)
 [TV Gazeta AL]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
diff --git a/isdb-t/br-al-Piacabucu b/isdb-t/br-al-Piacabucu
index d686347b..78ec6425 100644
--- a/isdb-t/br-al-Piacabucu
+++ b/isdb-t/br-al-Piacabucu
@@ -1,5 +1,5 @@
-# Channel table for Piaçabuçu - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2256
+# Channel table for Pia�abu�u - AL - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2256
 
 # Physical channel 21 (virtual 17.1)
 [TV Gazeta AL]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
diff --git a/isdb-t/br-al-Pilar b/isdb-t/br-al-Pilar
index f1f711de..fc1e3751 100644
--- a/isdb-t/br-al-Pilar
+++ b/isdb-t/br-al-Pilar
@@ -1,5 +1,5 @@
 # Channel table for Pilar - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3642
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3642
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -175,8 +175,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 49.1)
+[TV Sul Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 33 (virtual 33.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -321,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-al-Piranhas b/isdb-t/br-al-Piranhas
index 5377fc5a..a7436a60 100644
--- a/isdb-t/br-al-Piranhas
+++ b/isdb-t/br-al-Piranhas
@@ -1,8 +1,8 @@
 # Channel table for Piranhas - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/635
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=635
 
-# Physical channel 32 (virtual 11.1)
-[TV Sergipe]
+# Physical channel 32 (virtual 11.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-al-PortoCalvo b/isdb-t/br-al-PortoCalvo
index 0d0968d3..744d5f45 100644
--- a/isdb-t/br-al-PortoCalvo
+++ b/isdb-t/br-al-PortoCalvo
@@ -1,5 +1,5 @@
 # Channel table for Porto Calvo - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1672
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1672
 
 # Physical channel 41 (virtual 28.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-al-RioLargo b/isdb-t/br-al-RioLargo
index 505db5f9..0e36327f 100644
--- a/isdb-t/br-al-RioLargo
+++ b/isdb-t/br-al-RioLargo
@@ -1,5 +1,5 @@
 # Channel table for Rio Largo - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2241
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2241
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 33.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-al-Roteiro b/isdb-t/br-al-Roteiro
index f762e1c8..9b88879c 100644
--- a/isdb-t/br-al-Roteiro
+++ b/isdb-t/br-al-Roteiro
@@ -1,5 +1,5 @@
 # Channel table for Roteiro - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3461
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3461
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 33.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-al-SantaLuziaDoNorte b/isdb-t/br-al-SantaLuziaDoNorte
index 5b7c2611..9f68a5eb 100644
--- a/isdb-t/br-al-SantaLuziaDoNorte
+++ b/isdb-t/br-al-SantaLuziaDoNorte
@@ -1,5 +1,5 @@
 # Channel table for Santa Luzia Do Norte - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3637
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3637
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 27.1)
-[Rede Vida]
+# Physical channel 26 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 33.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-al-SantanaDoIpanema b/isdb-t/br-al-SantanaDoIpanema
index 6bebf15a..82538f03 100644
--- a/isdb-t/br-al-SantanaDoIpanema
+++ b/isdb-t/br-al-SantanaDoIpanema
@@ -1,5 +1,5 @@
 # Channel table for Santana Do Ipanema - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2258
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2258
 
 # Physical channel 49 (virtual 29.1)
 [RIT]
diff --git a/isdb-t/br-al-SaoBras b/isdb-t/br-al-SaoBras
index d3334734..684ef7f6 100644
--- a/isdb-t/br-al-SaoBras
+++ b/isdb-t/br-al-SaoBras
@@ -1,5 +1,5 @@
-# Channel table for São Brás - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2259
+# Channel table for S�o Br�s - AL - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2259
 
 # Physical channel 43 (virtual 9.1)
 [TV Pajuçara]
diff --git a/isdb-t/br-al-SaoMiguelDosCampos b/isdb-t/br-al-SaoMiguelDosCampos
index 112c84b7..4d35e6e1 100644
--- a/isdb-t/br-al-SaoMiguelDosCampos
+++ b/isdb-t/br-al-SaoMiguelDosCampos
@@ -1,5 +1,5 @@
-# Channel table for São Miguel Dos Campos - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1266
+# Channel table for S�o Miguel Dos Campos - AL - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1266
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 27.1)
-[Rede Vida]
+# Physical channel 26 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 51.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-al-SaoSebastiao b/isdb-t/br-al-SaoSebastiao
index 2479c39a..5836d407 100644
--- a/isdb-t/br-al-SaoSebastiao
+++ b/isdb-t/br-al-SaoSebastiao
@@ -1,5 +1,5 @@
-# Channel table for São Sebastião - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2242
+# Channel table for S�o Sebasti�o - AL - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2242
 
 # Physical channel 43 (virtual 9.1)
 [TV Pajuçara]
diff --git a/isdb-t/br-al-Satuba b/isdb-t/br-al-Satuba
index 63f4bcc3..f6d44b25 100644
--- a/isdb-t/br-al-Satuba
+++ b/isdb-t/br-al-Satuba
@@ -1,5 +1,5 @@
 # Channel table for Satuba - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3638
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3638
 
 # Physical channel 14 (virtual 3.1)
 [TVE Alagoas]
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 27.1)
-[Rede Vida]
+# Physical channel 26 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 33.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Band Natal]
+[Band Maceió]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-al-UniaoDosPalmares b/isdb-t/br-al-UniaoDosPalmares
index e6179077..6ada7b4f 100644
--- a/isdb-t/br-al-UniaoDosPalmares
+++ b/isdb-t/br-al-UniaoDosPalmares
@@ -1,5 +1,5 @@
-# Channel table for União Dos Palmares - AL - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/949
+# Channel table for Uni�o Dos Palmares - AL - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=949
 
 # Physical channel 41 (virtual 41.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-am-Autazes b/isdb-t/br-am-Autazes
new file mode 100644
index 00000000..76f1701f
--- /dev/null
+++ b/isdb-t/br-am-Autazes
@@ -0,0 +1,32 @@
+# Channel table for Autazes - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1988
+
+# Physical channel 32 (virtual 16.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-Barcelos b/isdb-t/br-am-Barcelos
index d8ef6ca9..108b5053 100644
--- a/isdb-t/br-am-Barcelos
+++ b/isdb-t/br-am-Barcelos
@@ -1,5 +1,5 @@
 # Channel table for Barcelos - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1991
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1991
 
 # Physical channel 22 (virtual 13.1)
 [Band Amazonas]
diff --git a/isdb-t/br-am-BenjaminConstant b/isdb-t/br-am-BenjaminConstant
index 17bbbf1c..30bc36df 100644
--- a/isdb-t/br-am-BenjaminConstant
+++ b/isdb-t/br-am-BenjaminConstant
@@ -1,5 +1,5 @@
 # Channel table for Benjamin Constant - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1406
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1406
 
 # Physical channel 22 (virtual 2.1)
 [Band Amazonas]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 6.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-BocaDoAcre b/isdb-t/br-am-BocaDoAcre
index 3fc368c0..cc5b605d 100644
--- a/isdb-t/br-am-BocaDoAcre
+++ b/isdb-t/br-am-BocaDoAcre
@@ -1,5 +1,5 @@
 # Channel table for Boca Do Acre - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1407
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1407
 
 # Physical channel 22 (virtual 12.1)
 [Band Amazonas]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 7.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-Borba b/isdb-t/br-am-Borba
index 5e2bd444..9fe28ef6 100644
--- a/isdb-t/br-am-Borba
+++ b/isdb-t/br-am-Borba
@@ -1,5 +1,5 @@
 # Channel table for Borba - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2089
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2089
 
 # Physical channel 23 (virtual 9.1)
 [Band Amazonas]
diff --git a/isdb-t/br-am-Canutama b/isdb-t/br-am-Canutama
new file mode 100644
index 00000000..ab6c0b0f
--- /dev/null
+++ b/isdb-t/br-am-Canutama
@@ -0,0 +1,32 @@
+# Channel table for Canutama - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2428
+
+# Physical channel 32 (virtual 3.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-Carauari b/isdb-t/br-am-Carauari
index 120d1045..820f626e 100644
--- a/isdb-t/br-am-Carauari
+++ b/isdb-t/br-am-Carauari
@@ -1,5 +1,5 @@
 # Channel table for Carauari - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1993
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1993
 
 # Physical channel 21 (virtual 7.1)
 [Band Amazonas]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 6.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-CareiroDaVarzea b/isdb-t/br-am-CareiroDaVarzea
index 6983df32..003c03d9 100644
--- a/isdb-t/br-am-CareiroDaVarzea
+++ b/isdb-t/br-am-CareiroDaVarzea
@@ -1,8 +1,8 @@
-# Channel table for Careiro Da Várzea - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2447
+# Channel table for Careiro Da V�rzea - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2447
 
 # Physical channel 15 (virtual 5.1)
-[TV Amazonas]
+[Rede Amazônica Manaus]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,6 +59,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 20.1)
+[TV Tiradentes]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 13.1)
 [Band Amazonas]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,6 +146,122 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 23.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 26.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 27.1)
+[Record News AM]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 29.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 8.1)
 [Boas Novas]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +291,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 2.5)
+[TV Encontro das Águas, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 6.4)
+[TV Senado, TV ALEAM, TV Câmara Municipal Manaus]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 10.1)
-[TV em Tempo]
+[TV Norte Amazonas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -175,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 40.1)
-[Rede Vida]
+# Physical channel 39 (virtual 40.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,6 +436,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 44.1)
+[AmazonSat]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 18.1)
+[Inova TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 50 (virtual 50.1)
 [Local TV]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-am-Coari b/isdb-t/br-am-Coari
index 38eb490b..988c5cff 100644
--- a/isdb-t/br-am-Coari
+++ b/isdb-t/br-am-Coari
@@ -1,5 +1,5 @@
 # Channel table for Coari - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/597
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=597
 
 # Physical channel 22 (virtual 13.1)
 [Band Amazonas]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 11.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 9.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-am-Codajas b/isdb-t/br-am-Codajas
new file mode 100644
index 00000000..35c654a5
--- /dev/null
+++ b/isdb-t/br-am-Codajas
@@ -0,0 +1,32 @@
+# Channel table for Codaj�s - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=953
+
+# Physical channel 32 (virtual 13.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-Eirunepe b/isdb-t/br-am-Eirunepe
index 6435516b..2bff2485 100644
--- a/isdb-t/br-am-Eirunepe
+++ b/isdb-t/br-am-Eirunepe
@@ -1,5 +1,5 @@
-# Channel table for Eirunepé - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/595
+# Channel table for Eirunep� - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=595
 
 # Physical channel 22 (virtual 4.1)
 [Band Amazonas]
diff --git a/isdb-t/br-am-Envira b/isdb-t/br-am-Envira
index 039073c3..4c599e35 100644
--- a/isdb-t/br-am-Envira
+++ b/isdb-t/br-am-Envira
@@ -1,5 +1,5 @@
 # Channel table for Envira - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2433
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2433
 
 # Physical channel 22 (virtual 12.1)
 [Band Amazonas]
diff --git a/isdb-t/br-am-FonteBoa b/isdb-t/br-am-FonteBoa
index 850aee03..ebdfdab0 100644
--- a/isdb-t/br-am-FonteBoa
+++ b/isdb-t/br-am-FonteBoa
@@ -1,5 +1,5 @@
 # Channel table for Fonte Boa - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2434
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2434
 
 # Physical channel 22 (virtual 2.1)
 [Band Amazonas]
diff --git a/isdb-t/br-am-Humaita b/isdb-t/br-am-Humaita
index c59bd541..a8fb9264 100644
--- a/isdb-t/br-am-Humaita
+++ b/isdb-t/br-am-Humaita
@@ -1,5 +1,5 @@
-# Channel table for Humaitá - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/583
+# Channel table for Humait� - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=583
 
 # Physical channel 22 (virtual 7.1)
 [Band Amazonas]
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 13.1)
-[Rede Vida]
+# Physical channel 33 (virtual 9.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 13.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-am-Iranduba b/isdb-t/br-am-Iranduba
index 0dcdfd83..b6ff5f34 100644
--- a/isdb-t/br-am-Iranduba
+++ b/isdb-t/br-am-Iranduba
@@ -1,8 +1,8 @@
 # Channel table for Iranduba - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2411
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2411
 
 # Physical channel 15 (virtual 5.1)
-[TV Amazonas]
+[Rede Amazônica Manaus]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,6 +59,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 20.1)
+[TV Tiradentes]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 13.1)
 [Band Amazonas]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,6 +146,122 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 23.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 26.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 27.1)
+[Record News AM]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 29.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 8.1)
 [Boas Novas]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +291,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 2.5)
+[TV Encontro das Águas, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 6.4)
+[TV Senado, TV ALEAM, TV Câmara Municipal Manaus]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 10.1)
-[TV em Tempo]
+[TV Norte Amazonas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -175,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 40.1)
-[Rede Vida]
+# Physical channel 39 (virtual 40.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,3 +436,90 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 44.1)
+[AmazonSat]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 18.1)
+[Inova TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 50.1)
+[Local TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-Itacoatiara b/isdb-t/br-am-Itacoatiara
index 0c8512a9..a9267ad5 100644
--- a/isdb-t/br-am-Itacoatiara
+++ b/isdb-t/br-am-Itacoatiara
@@ -1,8 +1,8 @@
 # Channel table for Itacoatiara - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/332
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=332
 
 # Physical channel 16 (virtual 11.1)
-[TV Itacoatiara]
+[Rede Amazônica Itacoatiara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 6.1)
+[Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 38 (virtual 8.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-am-Labrea b/isdb-t/br-am-Labrea
index 4289e8fc..d5b70b39 100644
--- a/isdb-t/br-am-Labrea
+++ b/isdb-t/br-am-Labrea
@@ -1,5 +1,5 @@
-# Channel table for Lábrea - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1441
+# Channel table for L�brea - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1441
 
 # Physical channel 22 (virtual 5.1)
 [Band Amazonas]
diff --git a/isdb-t/br-am-Manacapuru b/isdb-t/br-am-Manacapuru
index 65c699ae..9162fe35 100644
--- a/isdb-t/br-am-Manacapuru
+++ b/isdb-t/br-am-Manacapuru
@@ -1,5 +1,5 @@
 # Channel table for Manacapuru - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/331
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=331
 
 # Physical channel 22 (virtual 13.1)
 [Band Amazonas]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 6.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-Manaus b/isdb-t/br-am-Manaus
index 64415986..098ac9bc 100644
--- a/isdb-t/br-am-Manaus
+++ b/isdb-t/br-am-Manaus
@@ -1,8 +1,8 @@
 # Channel table for Manaus - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/201
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=201
 
 # Physical channel 15 (virtual 5.1)
-[TV Amazonas]
+[Rede Amazônica Manaus]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 20.1)
-[TV Tiradentes]
+# Physical channel 19 (virtual 20.4)
+[TV Tiradentes, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 23.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 2.1)
-[TV Encontro das Águas]
+# Physical channel 32 (virtual 2.4)
+[TV Encontro das Águas, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 55.3)
-[TV Senado, TV Câmara, TV ALEAM]
+# Physical channel 33 (virtual 6.4)
+[TV Senado, TV ALEAM, TV Câmara Municipal Manaus]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 10.1)
-[TV em Tempo]
+[TV Norte Amazonas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 40.1)
-[Rede Vida]
+# Physical channel 39 (virtual 40.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -582,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 48.1)
-[Rede Brasil]
+[Rede Brasil Manaus]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-am-Manicore b/isdb-t/br-am-Manicore
index 0779a15e..0f793387 100644
--- a/isdb-t/br-am-Manicore
+++ b/isdb-t/br-am-Manicore
@@ -1,5 +1,5 @@
-# Channel table for Manicoré - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/594
+# Channel table for Manicor� - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=594
 
 # Physical channel 22 (virtual 13.1)
 [Band Amazonas]
diff --git a/isdb-t/br-am-Maues b/isdb-t/br-am-Maues
index 4ed23a4f..cb1aae60 100644
--- a/isdb-t/br-am-Maues
+++ b/isdb-t/br-am-Maues
@@ -1,5 +1,34 @@
-# Channel table for Maués - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/190
+# Channel table for Mau�s - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=190
+
+# Physical channel 32 (virtual 13.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 5.1)
 [TV Mundurucânia]
diff --git a/isdb-t/br-am-NovoAirao b/isdb-t/br-am-NovoAirao
new file mode 100644
index 00000000..862ab224
--- /dev/null
+++ b/isdb-t/br-am-NovoAirao
@@ -0,0 +1,32 @@
+# Channel table for Novo Air�o - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2441
+
+# Physical channel 32 (virtual 11.1)
+[Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-Parintins b/isdb-t/br-am-Parintins
index 68656210..730a5f6b 100644
--- a/isdb-t/br-am-Parintins
+++ b/isdb-t/br-am-Parintins
@@ -1,8 +1,8 @@
 # Channel table for Parintins - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/122
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=122
 
 # Physical channel 15 (virtual 7.1)
-[TV Parintins]
+[Rede Amazônica Parintins]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,6 +59,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 27.1)
+[TV Nazaré]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 5.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 43.1)
 [Band Amazonas]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-am-PresidenteFigueiredo b/isdb-t/br-am-PresidenteFigueiredo
index 5cfab7fd..4c7f3a99 100644
--- a/isdb-t/br-am-PresidenteFigueiredo
+++ b/isdb-t/br-am-PresidenteFigueiredo
@@ -1,5 +1,5 @@
 # Channel table for Presidente Figueiredo - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/508
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=508
 
 # Physical channel 20 (virtual 3.1)
 [Band Amazonas]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 6.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-RioPretoDaEva b/isdb-t/br-am-RioPretoDaEva
new file mode 100644
index 00000000..f66283e2
--- /dev/null
+++ b/isdb-t/br-am-RioPretoDaEva
@@ -0,0 +1,32 @@
+# Channel table for Rio Preto Da Eva - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2443
+
+# Physical channel 31 (virtual 7.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-SaoGabrielDaCachoeira b/isdb-t/br-am-SaoGabrielDaCachoeira
index bf6f7d46..a58621e9 100644
--- a/isdb-t/br-am-SaoGabrielDaCachoeira
+++ b/isdb-t/br-am-SaoGabrielDaCachoeira
@@ -1,5 +1,5 @@
-# Channel table for São Gabriel Da Cachoeira - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/396
+# Channel table for S�o Gabriel Da Cachoeira - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=396
 
 # Physical channel 38 (virtual 7.1)
 [Rede Vida]
diff --git a/isdb-t/br-am-Silves b/isdb-t/br-am-Silves
new file mode 100644
index 00000000..298bb958
--- /dev/null
+++ b/isdb-t/br-am-Silves
@@ -0,0 +1,32 @@
+# Channel table for Silves - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2446
+
+# Physical channel 31 (virtual 7.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-Tabatinga b/isdb-t/br-am-Tabatinga
new file mode 100644
index 00000000..0e1b4691
--- /dev/null
+++ b/isdb-t/br-am-Tabatinga
@@ -0,0 +1,32 @@
+# Channel table for Tabatinga - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=397
+
+# Physical channel 32 (virtual 23.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-am-Tefe b/isdb-t/br-am-Tefe
index eb6ddd23..d1d61f42 100644
--- a/isdb-t/br-am-Tefe
+++ b/isdb-t/br-am-Tefe
@@ -1,5 +1,5 @@
-# Channel table for Tefé - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/596
+# Channel table for Tef� - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=596
 
 # Physical channel 22 (virtual 4.1)
 [Band Amazonas]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 9.2)
+[Boas Novas, Rádio Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 38 (virtual 2.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-am-Urucara b/isdb-t/br-am-Urucara
index 0a193d9f..540ebabc 100644
--- a/isdb-t/br-am-Urucara
+++ b/isdb-t/br-am-Urucara
@@ -1,5 +1,5 @@
-# Channel table for Urucará - AM - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1343
+# Channel table for Urucar� - AM - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1343
 
 # Physical channel 21 (virtual 13.1)
 [Band Amazonas]
diff --git a/isdb-t/br-ap-LaranjalDoJari b/isdb-t/br-ap-LaranjalDoJari
new file mode 100644
index 00000000..f30abf71
--- /dev/null
+++ b/isdb-t/br-ap-LaranjalDoJari
@@ -0,0 +1,32 @@
+# Channel table for Laranjal Do Jari - AP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=360
+
+# Physical channel 38 (virtual 7.1)
+[TV Verdade Jari]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ap-Macapa b/isdb-t/br-ap-Macapa
index 1f3c17c6..a76dd4e6 100644
--- a/isdb-t/br-ap-Macapa
+++ b/isdb-t/br-ap-Macapa
@@ -1,5 +1,34 @@
-# Channel table for Macapá - AP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/102
+# Channel table for Macap� - AP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=102
+
+# Physical channel 14 (virtual 14.1)
+[TV Equatorial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 15.1)
 [TV Marco Zero]
@@ -30,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 20.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 22.1)
 [TV Verdade]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 57.3)
+# Physical channel 27 (virtual 7.4)
 [TV Senado, TV Assembleia AP, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TV Amapá]
+[Rede Amazônica Macapá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -176,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 2.1)
-[TV Eldorado]
+[TV Cidade Macapá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -291,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 40.1)
-[Rede Vida]
+# Physical channel 39 (virtual 40.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -349,6 +407,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 50.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 51.1)
 [TV Nazaré]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ap-Santana b/isdb-t/br-ap-Santana
index 518344d9..02b74ccb 100644
--- a/isdb-t/br-ap-Santana
+++ b/isdb-t/br-ap-Santana
@@ -1,5 +1,5 @@
 # Channel table for Santana - AP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/725
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=725
 
 # Physical channel 15 (virtual 15.1)
 [TV Marco Zero]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 57.3)
+# Physical channel 27 (virtual 7.4)
 [TV Senado, TV Assembleia AP, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TV Amapá]
+[Rede Amazônica Macapá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 2.1)
+[TV Cidade Macapá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 4.1)
 [TV Macapá]
 	DELIVERY_SYSTEM = ISDBT
@@ -291,6 +320,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 50.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 51.1)
 [TV Nazaré]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Alagoinhas b/isdb-t/br-ba-Alagoinhas
index a13531df..026f31e5 100644
--- a/isdb-t/br-ba-Alagoinhas
+++ b/isdb-t/br-ba-Alagoinhas
@@ -1,8 +1,8 @@
 # Channel table for Alagoinhas - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/479
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=479
 
-# Physical channel 15 (virtual 14.1)
-[Rede Vida]
+# Physical channel 15 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 17 (virtual 17.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 5.1)
+# Physical channel 22 (virtual 13.1)
 [Record TV Itapoan]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 4.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 11.1)
 [Band Bahia]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 7.1)
+[TV Sul Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Alcobaca b/isdb-t/br-ba-Alcobaca
index 8b38e8cb..0bb9bd8c 100644
--- a/isdb-t/br-ba-Alcobaca
+++ b/isdb-t/br-ba-Alcobaca
@@ -1,5 +1,5 @@
-# Channel table for Alcobaça - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/724
+# Channel table for Alcoba�a - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=724
 
 # Physical channel 40 (virtual 5.1)
 [TV Sul Bahia]
diff --git a/isdb-t/br-ba-Almadina b/isdb-t/br-ba-Almadina
index 17b433ab..d2564b08 100644
--- a/isdb-t/br-ba-Almadina
+++ b/isdb-t/br-ba-Almadina
@@ -1,5 +1,5 @@
 # Channel table for Almadina - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3132
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3132
 
 # Physical channel 30 (virtual 4.1)
 [TV Santa Cruz]
diff --git a/isdb-t/br-ba-Amargosa b/isdb-t/br-ba-Amargosa
index 51502aa7..56e47a81 100644
--- a/isdb-t/br-ba-Amargosa
+++ b/isdb-t/br-ba-Amargosa
@@ -1,8 +1,8 @@
 # Channel table for Amargosa - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1345
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1345
 
-# Physical channel 15 (virtual 14.1)
-[Rede Vida]
+# Physical channel 15 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,3 +30,119 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 17 (virtual 18.1)
+[CNT Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 10.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 11.1)
+[TV Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Subaé]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-AmeliaRodrigues b/isdb-t/br-ba-AmeliaRodrigues
index 87b385a9..09c949ae 100644
--- a/isdb-t/br-ba-AmeliaRodrigues
+++ b/isdb-t/br-ba-AmeliaRodrigues
@@ -1,8 +1,8 @@
-# Channel table for Amélia Rodrigues - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3080
+# Channel table for Am�lia Rodrigues - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3080
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -349,7 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
+# Physical channel 35 (virtual 12.4)
 [TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -466,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -494,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-Anage b/isdb-t/br-ba-Anage
index 43ae9498..28c11b5d 100644
--- a/isdb-t/br-ba-Anage
+++ b/isdb-t/br-ba-Anage
@@ -1,5 +1,5 @@
-# Channel table for Anagé - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1346
+# Channel table for Anag� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1346
 
 # Physical channel 30 (virtual 8.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-Angical b/isdb-t/br-ba-Angical
new file mode 100644
index 00000000..97403d33
--- /dev/null
+++ b/isdb-t/br-ba-Angical
@@ -0,0 +1,32 @@
+# Channel table for Angical - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3134
+
+# Physical channel 29 (virtual 5.1)
+[TV Oeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Anguera b/isdb-t/br-ba-Anguera
index fac49df3..e2d6c3b8 100644
--- a/isdb-t/br-ba-Anguera
+++ b/isdb-t/br-ba-Anguera
@@ -1,8 +1,8 @@
 # Channel table for Anguera - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3119
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3119
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Antas b/isdb-t/br-ba-Antas
index 742ecadf..297cd803 100644
--- a/isdb-t/br-ba-Antas
+++ b/isdb-t/br-ba-Antas
@@ -1,5 +1,5 @@
 # Channel table for Antas - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1247
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1247
 
 # Physical channel 27 (virtual 7.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-AntonioCardoso b/isdb-t/br-ba-AntonioCardoso
index c476482c..6ba0cdfa 100644
--- a/isdb-t/br-ba-AntonioCardoso
+++ b/isdb-t/br-ba-AntonioCardoso
@@ -1,8 +1,8 @@
-# Channel table for Antônio Cardoso - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3120
+# Channel table for Ant�nio Cardoso - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3120
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Aracatu b/isdb-t/br-ba-Aracatu
index 551cb18a..06cc2d02 100644
--- a/isdb-t/br-ba-Aracatu
+++ b/isdb-t/br-ba-Aracatu
@@ -1,5 +1,5 @@
 # Channel table for Aracatu - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1530
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1530
 
 # Physical channel 28 (virtual 5.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-Araci b/isdb-t/br-ba-Araci
index b8697d16..8a967e86 100644
--- a/isdb-t/br-ba-Araci
+++ b/isdb-t/br-ba-Araci
@@ -1,5 +1,34 @@
 # Channel table for Araci - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/788
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=788
+
+# Physical channel 24 (virtual 5.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 3.1)
 [TV Subaé]
diff --git a/isdb-t/br-ba-Aramari b/isdb-t/br-ba-Aramari
new file mode 100644
index 00000000..2323a254
--- /dev/null
+++ b/isdb-t/br-ba-Aramari
@@ -0,0 +1,148 @@
+# Channel table for Aramari - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4043
+
+# Physical channel 15 (virtual 14.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 17.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 13.1)
+[Record TV Itapoan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 4.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 3.1)
+[TV Subaé]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Aratuipe b/isdb-t/br-ba-Aratuipe
index 12b0955a..14459cd1 100644
--- a/isdb-t/br-ba-Aratuipe
+++ b/isdb-t/br-ba-Aratuipe
@@ -1,8 +1,8 @@
-# Channel table for Aratuípe - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3224
+# Channel table for Aratu�pe - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3224
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia/TV Anísio Teixeira, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia/TV Anísio Teixeira, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.2)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-AurelinoLeal b/isdb-t/br-ba-AurelinoLeal
index dbdb5614..7bde734a 100644
--- a/isdb-t/br-ba-AurelinoLeal
+++ b/isdb-t/br-ba-AurelinoLeal
@@ -1,5 +1,5 @@
 # Channel table for Aurelino Leal - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1249
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1249
 
 # Physical channel 29 (virtual 5.1)
 [TV Santa Cruz]
diff --git a/isdb-t/br-ba-BaixaGrande b/isdb-t/br-ba-BaixaGrande
index 8d06a89d..96463418 100644
--- a/isdb-t/br-ba-BaixaGrande
+++ b/isdb-t/br-ba-BaixaGrande
@@ -1,5 +1,5 @@
 # Channel table for Baixa Grande - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1250
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1250
 
 # Physical channel 22 (virtual 3.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Barra b/isdb-t/br-ba-Barra
index a51a9c38..2481c55f 100644
--- a/isdb-t/br-ba-Barra
+++ b/isdb-t/br-ba-Barra
@@ -1,5 +1,5 @@
 # Channel table for Barra - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/789
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=789
 
 # Physical channel 14 (virtual 7.1)
 [Rede Vida]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 11.1)
 [TV Oeste]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-BarraDaEstiva b/isdb-t/br-ba-BarraDaEstiva
index f8f0b736..603766c2 100644
--- a/isdb-t/br-ba-BarraDaEstiva
+++ b/isdb-t/br-ba-BarraDaEstiva
@@ -1,5 +1,5 @@
 # Channel table for Barra Da Estiva - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1371
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1371
 
 # Physical channel 28 (virtual 2.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-BarraDoChoca b/isdb-t/br-ba-BarraDoChoca
index 514b2661..ba9ab21c 100644
--- a/isdb-t/br-ba-BarraDoChoca
+++ b/isdb-t/br-ba-BarraDoChoca
@@ -1,11 +1,69 @@
-# Channel table for Barra Do Choça - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1370
+# Channel table for Barra Do Cho�a - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1370
 
-# Physical channel 30 (virtual 9.1)
+# Physical channel 22 (virtual 10.1)
+[Record TV Cabrália]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 25.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 9.1)
 [TV Sudoeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV UESB]
+# Physical channel 33 (virtual 4.2)
+[TV UESB, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -59,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 35.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 2.1)
 [Band Bahia]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 14.1)
-[Rede Vida]
+# Physical channel 43 (virtual 43.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-Barreiras b/isdb-t/br-ba-Barreiras
index 5969a75c..34fb00eb 100644
--- a/isdb-t/br-ba-Barreiras
+++ b/isdb-t/br-ba-Barreiras
@@ -1,8 +1,8 @@
 # Channel table for Barreiras - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/192
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=192
 
-# Physical channel 15 (virtual 14.1)
-[Rede Vida]
+# Physical channel 15 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 10.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 5.1)
 [TV Oeste]
 	DELIVERY_SYSTEM = ISDBT
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 33.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -117,8 +146,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 4.4)
-[Canal sem transmissão, TV Câmara Municipal Barreiras, Canal sem transmissão]
+# Physical channel 35 (virtual 7.1)
+[Band Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 40.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Barreiras, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
diff --git a/isdb-t/br-ba-BeloCampo b/isdb-t/br-ba-BeloCampo
index f0bab18d..2a0ac0ef 100644
--- a/isdb-t/br-ba-BeloCampo
+++ b/isdb-t/br-ba-BeloCampo
@@ -1,5 +1,5 @@
 # Channel table for Belo Campo - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1254
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1254
 
 # Physical channel 22 (virtual 10.1)
 [Record TV Cabrália]
diff --git a/isdb-t/br-ba-Biritinga b/isdb-t/br-ba-Biritinga
index febeb553..6b652adc 100644
--- a/isdb-t/br-ba-Biritinga
+++ b/isdb-t/br-ba-Biritinga
@@ -1,5 +1,34 @@
 # Channel table for Biritinga - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1255
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1255
+
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 6.1)
 [TV Subaé]
diff --git a/isdb-t/br-ba-BomJesusDaLapa b/isdb-t/br-ba-BomJesusDaLapa
index 22e75b92..f9cb180d 100644
--- a/isdb-t/br-ba-BomJesusDaLapa
+++ b/isdb-t/br-ba-BomJesusDaLapa
@@ -1,8 +1,8 @@
 # Channel table for Bom Jesus Da Lapa - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1373
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1373
 
-# Physical channel 15 (virtual 14.1)
-[Rede Vida]
+# Physical channel 15 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 10.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 9.1)
 [TV Oeste]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Brejoes b/isdb-t/br-ba-Brejoes
index 83ebd43f..b5932f2e 100644
--- a/isdb-t/br-ba-Brejoes
+++ b/isdb-t/br-ba-Brejoes
@@ -1,5 +1,5 @@
-# Channel table for Brejões - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1374
+# Channel table for Brej�es - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1374
 
 # Physical channel 21 (virtual 10.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-to-Filadelfia b/isdb-t/br-ba-Brejolandia
index 696684ad..ecb721ff 100644
--- a/isdb-t/br-to-Filadelfia
+++ b/isdb-t/br-ba-Brejolandia
@@ -1,8 +1,8 @@
-# Channel table for Filadélfia - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2518
+# Channel table for Brejol�ndia - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3139
 
-# Physical channel 24 (virtual 11.1)
-[TV Anhanguera Araguaína]
+# Physical channel 24 (virtual 7.1)
+[TVE Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
diff --git a/isdb-t/br-ba-Brumado b/isdb-t/br-ba-Brumado
index 51d1ecca..33181145 100644
--- a/isdb-t/br-ba-Brumado
+++ b/isdb-t/br-ba-Brumado
@@ -1,5 +1,5 @@
 # Channel table for Brumado - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/858
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=858
 
 # Physical channel 21 (virtual 13.1)
 [Record TV Itapoan]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 9.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 4.1)
 [TV Sudoeste]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Cachoeira b/isdb-t/br-ba-Cachoeira
new file mode 100644
index 00000000..cbfe8d48
--- /dev/null
+++ b/isdb-t/br-ba-Cachoeira
@@ -0,0 +1,32 @@
+# Channel table for Cachoeira - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1273
+
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Caetite b/isdb-t/br-ba-Caetite
index ad828864..4179ce27 100644
--- a/isdb-t/br-ba-Caetite
+++ b/isdb-t/br-ba-Caetite
@@ -1,5 +1,5 @@
-# Channel table for Caetité - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/326
+# Channel table for Caetit� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=326
 
 # Physical channel 15 (virtual 14.1)
 [Rede Vida]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 8.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 6.1)
 [TV Sudoeste]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Cairu b/isdb-t/br-ba-Cairu
index 8180458d..efebd1f2 100644
--- a/isdb-t/br-ba-Cairu
+++ b/isdb-t/br-ba-Cairu
@@ -1,8 +1,8 @@
 # Channel table for Cairu - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3566
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3566
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-CaldeiraoGrande b/isdb-t/br-ba-CaldeiraoGrande
index 1119b2f9..a162e342 100644
--- a/isdb-t/br-ba-CaldeiraoGrande
+++ b/isdb-t/br-ba-CaldeiraoGrande
@@ -1,5 +1,5 @@
-# Channel table for Caldeirão Grande - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3142
+# Channel table for Caldeir�o Grande - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3142
 
 # Physical channel 22 (virtual 10.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Camacan b/isdb-t/br-ba-Camacan
index 88279e62..69583d30 100644
--- a/isdb-t/br-ba-Camacan
+++ b/isdb-t/br-ba-Camacan
@@ -1,5 +1,5 @@
 # Channel table for Camacan - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1239
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1239
 
 # Physical channel 22 (virtual 10.1)
 [Record TV Cabrália]
diff --git a/isdb-t/br-ba-Camacari b/isdb-t/br-ba-Camacari
index aad8e4d0..83f6087d 100644
--- a/isdb-t/br-ba-Camacari
+++ b/isdb-t/br-ba-Camacari
@@ -1,8 +1,8 @@
-# Channel table for Camaçari - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/328
+# Channel table for Cama�ari - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=328
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia/TV Anísio Teixeira, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia/TV Anísio Teixeira, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,6 +233,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 26.1)
+[Top TV Nordeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 11.1)
 [TV Bahia]
 	DELIVERY_SYSTEM = ISDBT
@@ -349,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -437,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -495,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 45 (virtual 45.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ba-Camamu b/isdb-t/br-ba-Camamu
index 99ec6ce2..b86a085c 100644
--- a/isdb-t/br-ba-Camamu
+++ b/isdb-t/br-ba-Camamu
@@ -1,5 +1,5 @@
 # Channel table for Camamu - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1277
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1277
 
 # Physical channel 29 (virtual 9.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-CampoFormoso b/isdb-t/br-ba-CampoFormoso
index febb609b..37463ebd 100644
--- a/isdb-t/br-ba-CampoFormoso
+++ b/isdb-t/br-ba-CampoFormoso
@@ -1,5 +1,34 @@
 # Channel table for Campo Formoso - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1280
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1280
+
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 2.1)
 [TV São Francisco]
diff --git a/isdb-t/br-ba-Canavieiras b/isdb-t/br-ba-Canavieiras
index 7ac8e7d4..31758d20 100644
--- a/isdb-t/br-ba-Canavieiras
+++ b/isdb-t/br-ba-Canavieiras
@@ -1,5 +1,5 @@
 # Channel table for Canavieiras - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3145
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3145
 
 # Physical channel 30 (virtual 4.1)
 [TV Santa Cruz]
diff --git a/isdb-t/br-ba-Candeal b/isdb-t/br-ba-Candeal
index a7c21871..9eb99754 100644
--- a/isdb-t/br-ba-Candeal
+++ b/isdb-t/br-ba-Candeal
@@ -1,5 +1,5 @@
 # Channel table for Candeal - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3121
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3121
 
 # Physical channel 14 (virtual 14.1)
 [Rede Vida]
@@ -175,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Candeias b/isdb-t/br-ba-Candeias
index 4a7b7214..868c496d 100644
--- a/isdb-t/br-ba-Candeias
+++ b/isdb-t/br-ba-Candeias
@@ -1,8 +1,8 @@
 # Channel table for Candeias - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3093
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3093
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.2)
+[TV Baiana, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-CandidoSales b/isdb-t/br-ba-CandidoSales
index 79f43da3..13b13e60 100644
--- a/isdb-t/br-ba-CandidoSales
+++ b/isdb-t/br-ba-CandidoSales
@@ -1,5 +1,5 @@
-# Channel table for Cândido Sales - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1282
+# Channel table for C�ndido Sales - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1282
 
 # Physical channel 22 (virtual 10.1)
 [Record TV Cabrália]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 4.2)
+[TV UESB, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 2.1)
 [Band Bahia]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 13.1)
 [TV Aratu]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Cansancao b/isdb-t/br-ba-Cansancao
index d1b6b2c4..366e4665 100644
--- a/isdb-t/br-ba-Cansancao
+++ b/isdb-t/br-ba-Cansancao
@@ -1,5 +1,5 @@
-# Channel table for Cansanção - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1283
+# Channel table for Cansan��o - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1283
 
 # Physical channel 28 (virtual 5.1)
 [TV São Francisco]
diff --git a/isdb-t/br-ba-CapimGrosso b/isdb-t/br-ba-CapimGrosso
index ee747009..26cbb90f 100644
--- a/isdb-t/br-ba-CapimGrosso
+++ b/isdb-t/br-ba-CapimGrosso
@@ -1,5 +1,5 @@
 # Channel table for Capim Grosso - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1285
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1285
 
 # Physical channel 27 (virtual 6.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-Caraibas b/isdb-t/br-ba-Caraibas
index 115fb9f0..c39961b2 100644
--- a/isdb-t/br-ba-Caraibas
+++ b/isdb-t/br-ba-Caraibas
@@ -1,5 +1,5 @@
-# Channel table for Caraíbas - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1286
+# Channel table for Cara�bas - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1286
 
 # Physical channel 28 (virtual 5.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-CasaNova b/isdb-t/br-ba-CasaNova
index eb075d87..b0c177d0 100644
--- a/isdb-t/br-ba-CasaNova
+++ b/isdb-t/br-ba-CasaNova
@@ -1,5 +1,34 @@
 # Channel table for Casa Nova - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3149
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3149
+
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 13.1)
 [TV São Francisco]
diff --git a/isdb-t/br-sc-CampoAlegre b/isdb-t/br-ba-Catu
index 7327000d..b73b6ef9 100644
--- a/isdb-t/br-sc-CampoAlegre
+++ b/isdb-t/br-ba-Catu
@@ -1,11 +1,11 @@
-# Channel table for Campo Alegre - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2021
+# Channel table for Catu - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1376
 
-# Physical channel 24 (virtual 9.1)
-[NSC Joinville]
+# Physical channel 21 (virtual 5.1)
+[Record TV Itapoan]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 13.1)
-[RICTV Joinville]
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ba-Central b/isdb-t/br-ba-Central
index b40ed59e..52f44b47 100644
--- a/isdb-t/br-ba-Central
+++ b/isdb-t/br-ba-Central
@@ -1,5 +1,5 @@
 # Channel table for Central - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1288
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1288
 
 # Physical channel 22 (virtual 7.1)
 [Record TV Itapoan]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 5.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-CiceroDantas b/isdb-t/br-ba-CiceroDantas
index f66afa7e..f4bf80cb 100644
--- a/isdb-t/br-ba-CiceroDantas
+++ b/isdb-t/br-ba-CiceroDantas
@@ -1,5 +1,5 @@
-# Channel table for Cícero Dantas - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1290
+# Channel table for C�cero Dantas - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1290
 
 # Physical channel 20 (virtual 3.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-ConceicaoDaFeira b/isdb-t/br-ba-ConceicaoDaFeira
index 89f331b8..93430fb4 100644
--- a/isdb-t/br-ba-ConceicaoDaFeira
+++ b/isdb-t/br-ba-ConceicaoDaFeira
@@ -1,8 +1,8 @@
-# Channel table for Conceição Da Feira - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1291
+# Channel table for Concei��o Da Feira - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1291
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-ConceicaoDoAlmeida b/isdb-t/br-ba-ConceicaoDoAlmeida
index dc6584e0..77af1fa8 100644
--- a/isdb-t/br-ba-ConceicaoDoAlmeida
+++ b/isdb-t/br-ba-ConceicaoDoAlmeida
@@ -1,5 +1,5 @@
-# Channel table for Conceição Do Almeida - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3864
+# Channel table for Concei��o Do Almeida - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3864
 
 # Physical channel 45 (virtual 45.1)
 [TV Subaé]
diff --git a/isdb-t/br-ba-ConceicaoDoCoite b/isdb-t/br-ba-ConceicaoDoCoite
index d42e3cfa..74572ccf 100644
--- a/isdb-t/br-ba-ConceicaoDoCoite
+++ b/isdb-t/br-ba-ConceicaoDoCoite
@@ -1,7 +1,7 @@
-# Channel table for Conceição Do Coité - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/291
+# Channel table for Concei��o Do Coit� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=291
 
-# Physical channel 21 (virtual 5.1)
+# Physical channel 21 (virtual 6.1)
 [Record TV Itapoan]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 4.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 33 (virtual 3.1)
 [TV Subaé]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-ConceicaoDoJacuipe b/isdb-t/br-ba-ConceicaoDoJacuipe
index 7f589842..c862b16e 100644
--- a/isdb-t/br-ba-ConceicaoDoJacuipe
+++ b/isdb-t/br-ba-ConceicaoDoJacuipe
@@ -1,8 +1,8 @@
-# Channel table for Conceição Do Jacuípe - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1292
+# Channel table for Concei��o Do Jacu�pe - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1292
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Conde b/isdb-t/br-ba-Conde
index 6c2694d6..b3a102d1 100644
--- a/isdb-t/br-ba-Conde
+++ b/isdb-t/br-ba-Conde
@@ -1,5 +1,5 @@
 # Channel table for Conde - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1278
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1278
 
 # Physical channel 21 (virtual 12.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-CoracaoDeMaria b/isdb-t/br-ba-CoracaoDeMaria
index cb94b636..e2c61cde 100644
--- a/isdb-t/br-ba-CoracaoDeMaria
+++ b/isdb-t/br-ba-CoracaoDeMaria
@@ -1,8 +1,8 @@
-# Channel table for Coração De Maria - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3122
+# Channel table for Cora��o De Maria - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3122
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -233,3 +233,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Coribe b/isdb-t/br-ba-Coribe
new file mode 100644
index 00000000..1055c9f3
--- /dev/null
+++ b/isdb-t/br-ba-Coribe
@@ -0,0 +1,32 @@
+# Channel table for Coribe - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3152
+
+# Physical channel 27 (virtual 9.1)
+[TV Oeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-CruzDasAlmas b/isdb-t/br-ba-CruzDasAlmas
index ccb1d1f1..c78107e7 100644
--- a/isdb-t/br-ba-CruzDasAlmas
+++ b/isdb-t/br-ba-CruzDasAlmas
@@ -1,8 +1,8 @@
 # Channel table for Cruz Das Almas - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/432
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=432
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 18.1)
-[CNT Bahia]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 485142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 5.1)
-[Record TV Itapoan]
+# Physical channel 17 (virtual 18.1)
+[CNT Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 21 (virtual 5.1)
+[Record TV Itapoan]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Aparecida]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 3.1)
-[TV Aratu]
+# Physical channel 23 (virtual 23.1)
+[TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 57.1)
-[Rede Família]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 575142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 31.1)
-[Record News]
+# Physical channel 29 (virtual 11.1)
+[TV Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 34.1)
-[TV Canção Nova]
+# Physical channel 31 (virtual 57.1)
+[Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 575142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.1)
-[TV Novo Tempo]
+# Physical channel 32 (virtual 31.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 38.1)
+# Physical channel 33 (virtual 34.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[TV Subaé]
+# Physical channel 40 (virtual 50.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 9 (virtual 9.1)
-[TV Ouro Negro]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 189142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ba-DiasD'Avila b/isdb-t/br-ba-DiasD'avila
index 804e4e44..3f30d122 100644
--- a/isdb-t/br-ba-DiasD'Avila
+++ b/isdb-t/br-ba-DiasD'avila
@@ -1,8 +1,8 @@
-# Channel table for Dias D´ Ávila - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3094
+# Channel table for Dias D� �vila - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3094
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,6 +233,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 26.1)
+[Top TV Nordeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 11.1)
 [TV Bahia]
 	DELIVERY_SYSTEM = ISDBT
@@ -349,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -437,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -495,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 45 (virtual 45.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ba-EntreRios b/isdb-t/br-ba-EntreRios
index 783d7ed6..e82c42a7 100644
--- a/isdb-t/br-ba-EntreRios
+++ b/isdb-t/br-ba-EntreRios
@@ -1,5 +1,5 @@
 # Channel table for Entre Rios - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1295
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1295
 
 # Physical channel 30 (virtual 10.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-Esplanada b/isdb-t/br-ba-Esplanada
index b066c209..ea17fdfb 100644
--- a/isdb-t/br-ba-Esplanada
+++ b/isdb-t/br-ba-Esplanada
@@ -1,5 +1,5 @@
 # Channel table for Esplanada - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/793
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=793
 
 # Physical channel 27 (virtual 7.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-EuclidesDaCunha b/isdb-t/br-ba-EuclidesDaCunha
index 777f1376..17707320 100644
--- a/isdb-t/br-ba-EuclidesDaCunha
+++ b/isdb-t/br-ba-EuclidesDaCunha
@@ -1,5 +1,5 @@
 # Channel table for Euclides Da Cunha - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1377
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1377
 
 # Physical channel 21 (virtual 7.1)
 [Record TV Itapoan]
@@ -30,7 +30,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 3.1)
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 5.1)
 [TV Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ba-Eunapolis b/isdb-t/br-ba-Eunapolis
index cdc1d32c..9fc22eb8 100644
--- a/isdb-t/br-ba-Eunapolis
+++ b/isdb-t/br-ba-Eunapolis
@@ -1,5 +1,5 @@
-# Channel table for Eunápolis - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/557
+# Channel table for Eun�polis - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=557
 
 # Physical channel 17 (virtual 38.1)
 [Record TV Cabrália]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 7.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 9.1)
 [TV Santa Cruz]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-FeiraDeSantana b/isdb-t/br-ba-FeiraDeSantana
index 53d7b585..6d148b98 100644
--- a/isdb-t/br-ba-FeiraDeSantana
+++ b/isdb-t/br-ba-FeiraDeSantana
@@ -1,8 +1,8 @@
 # Channel table for Feira De Santana - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/18
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=18
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Gandu b/isdb-t/br-ba-Gandu
index 2e86b449..f196ac8e 100644
--- a/isdb-t/br-ba-Gandu
+++ b/isdb-t/br-ba-Gandu
@@ -1,5 +1,5 @@
 # Channel table for Gandu - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1298
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1298
 
 # Physical channel 29 (virtual 8.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-Gloria b/isdb-t/br-ba-Gloria
index 360460dd..b3f7bee1 100644
--- a/isdb-t/br-ba-Gloria
+++ b/isdb-t/br-ba-Gloria
@@ -1,5 +1,5 @@
-# Channel table for Glória - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/642
+# Channel table for Gl�ria - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=642
 
 # Physical channel 28 (virtual 6.1)
 [TV São Francisco]
diff --git a/isdb-t/br-ba-Guanambi b/isdb-t/br-ba-Guanambi
index d922e13d..82a41e57 100644
--- a/isdb-t/br-ba-Guanambi
+++ b/isdb-t/br-ba-Guanambi
@@ -1,5 +1,5 @@
 # Channel table for Guanambi - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/293
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=293
 
 # Physical channel 22 (virtual 3.1)
 [Record TV Itapoan]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 4.1)
-[TVE Bahia]
+# Physical channel 23 (virtual 4.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-ba-Iacu b/isdb-t/br-ba-Iacu
index c66def8f..12115ffb 100644
--- a/isdb-t/br-ba-Iacu
+++ b/isdb-t/br-ba-Iacu
@@ -1,5 +1,5 @@
-# Channel table for Iaçu - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/794
+# Channel table for Ia�u - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=794
 
 # Physical channel 22 (virtual 6.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Ibirataia b/isdb-t/br-ba-Ibirataia
index 22a024fe..3d7063c7 100644
--- a/isdb-t/br-ba-Ibirataia
+++ b/isdb-t/br-ba-Ibirataia
@@ -1,5 +1,5 @@
 # Channel table for Ibirataia - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1307
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1307
 
 # Physical channel 24 (virtual 4.1)
 [TVE Bahia]
diff --git a/isdb-t/br-ba-Ibotirama b/isdb-t/br-ba-Ibotirama
index 7a57b7df..3278bfcb 100644
--- a/isdb-t/br-ba-Ibotirama
+++ b/isdb-t/br-ba-Ibotirama
@@ -1,7 +1,7 @@
 # Channel table for Ibotirama - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1378
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1378
 
-# Physical channel 22 (virtual 11.1)
+# Physical channel 22 (virtual 5.1)
 [Record TV Itapoan]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ba-Ichu b/isdb-t/br-ba-Ichu
index 0ed0cbe7..0390b991 100644
--- a/isdb-t/br-ba-Ichu
+++ b/isdb-t/br-ba-Ichu
@@ -1,5 +1,5 @@
 # Channel table for Ichu - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/385
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=385
 
 # Physical channel 21 (virtual 12.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Ilheus b/isdb-t/br-ba-Ilheus
index 1834e51a..a94539c6 100644
--- a/isdb-t/br-ba-Ilheus
+++ b/isdb-t/br-ba-Ilheus
@@ -1,5 +1,5 @@
-# Channel table for Ilhéus - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1379
+# Channel table for Ilh�us - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1379
 
 # Physical channel 14 (virtual 15.1)
 [Rede Vida]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 13.1)
 [TV Santa Cruz]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 6.1)
+[Band Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Inhambupe b/isdb-t/br-ba-Inhambupe
index 2798baf5..af7aafae 100644
--- a/isdb-t/br-ba-Inhambupe
+++ b/isdb-t/br-ba-Inhambupe
@@ -1,5 +1,5 @@
 # Channel table for Inhambupe - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1309
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1309
 
 # Physical channel 27 (virtual 3.1)
 [TV Subaé]
diff --git a/isdb-t/br-ba-Ipecaeta b/isdb-t/br-ba-Ipecaeta
index 11ea7180..7445569b 100644
--- a/isdb-t/br-ba-Ipecaeta
+++ b/isdb-t/br-ba-Ipecaeta
@@ -1,8 +1,8 @@
-# Channel table for Ipecaetá - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3123
+# Channel table for Ipecaet� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3123
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Ipiau b/isdb-t/br-ba-Ipiau
index 58543e39..833089f4 100644
--- a/isdb-t/br-ba-Ipiau
+++ b/isdb-t/br-ba-Ipiau
@@ -1,5 +1,5 @@
-# Channel table for Ipiaú - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1310
+# Channel table for Ipia� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1310
 
 # Physical channel 22 (virtual 3.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Ipira b/isdb-t/br-ba-Ipira
index e103091b..51dbbe83 100644
--- a/isdb-t/br-ba-Ipira
+++ b/isdb-t/br-ba-Ipira
@@ -1,8 +1,8 @@
-# Channel table for Ipirá - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1311
+# Channel table for Ipir� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1311
 
-# Physical channel 24 (virtual 10.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 10.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
diff --git a/isdb-t/br-ba-Irara b/isdb-t/br-ba-Irara
index eccad576..0dadad0d 100644
--- a/isdb-t/br-ba-Irara
+++ b/isdb-t/br-ba-Irara
@@ -1,8 +1,8 @@
-# Channel table for Irará - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3124
+# Channel table for Irar� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3124
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Irece b/isdb-t/br-ba-Irece
index 4b472c31..b4948fd5 100644
--- a/isdb-t/br-ba-Irece
+++ b/isdb-t/br-ba-Irece
@@ -1,5 +1,5 @@
-# Channel table for Irecê - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1533
+# Channel table for Irec� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1533
 
 # Physical channel 15 (virtual 14.1)
 [Rede Vida]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 5.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 4.1)
 [TV São Francisco]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 35 (virtual 13.1)
+[Band Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Itaberaba b/isdb-t/br-ba-Itaberaba
index 6c55feca..736a40ff 100644
--- a/isdb-t/br-ba-Itaberaba
+++ b/isdb-t/br-ba-Itaberaba
@@ -1,5 +1,5 @@
 # Channel table for Itaberaba - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1369
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1369
 
 # Physical channel 21 (virtual 10.1)
 [Record TV Itapoan]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 8.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 27 (virtual 4.1)
 [TV Subaé]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Itabuna b/isdb-t/br-ba-Itabuna
index 287281c8..aeb4a137 100644
--- a/isdb-t/br-ba-Itabuna
+++ b/isdb-t/br-ba-Itabuna
@@ -1,8 +1,8 @@
 # Channel table for Itabuna - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/144
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=144
 
-# Physical channel 15 (virtual 14.1)
-[Rede Vida]
+# Physical channel 15 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 6.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 4.1)
 [TV Santa Cruz]
 	DELIVERY_SYSTEM = ISDBT
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 35.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -175,3 +204,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 11.1)
+[Band Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Itaete b/isdb-t/br-ba-Itaete
new file mode 100644
index 00000000..0f9e3e46
--- /dev/null
+++ b/isdb-t/br-ba-Itaete
@@ -0,0 +1,32 @@
+# Channel table for Itaet� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1313
+
+# Physical channel 24 (virtual 7.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Itagiba b/isdb-t/br-ba-Itagiba
index ad29ea68..71484d3f 100644
--- a/isdb-t/br-ba-Itagiba
+++ b/isdb-t/br-ba-Itagiba
@@ -1,5 +1,5 @@
-# Channel table for Itagibá - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/776
+# Channel table for Itagib� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=776
 
 # Physical channel 24 (virtual 4.1)
 [TVE Bahia]
diff --git a/isdb-t/br-ba-Itamaraju b/isdb-t/br-ba-Itamaraju
index 314cd8ad..3eb9bbf1 100644
--- a/isdb-t/br-ba-Itamaraju
+++ b/isdb-t/br-ba-Itamaraju
@@ -1,5 +1,5 @@
 # Channel table for Itamaraju - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1241
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1241
 
 # Physical channel 17 (virtual 8.1)
 [Record TV Cabrália]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 4.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 3.1)
 [TV Santa Cruz]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Itambe b/isdb-t/br-ba-Itambe
index 133024aa..f5265445 100644
--- a/isdb-t/br-ba-Itambe
+++ b/isdb-t/br-ba-Itambe
@@ -1,5 +1,5 @@
-# Channel table for Itambé - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2528
+# Channel table for Itamb� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2528
 
 # Physical channel 30 (virtual 9.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-Itaparica b/isdb-t/br-ba-Itaparica
index bdbc7980..89f37065 100644
--- a/isdb-t/br-ba-Itaparica
+++ b/isdb-t/br-ba-Itaparica
@@ -1,8 +1,8 @@
 # Channel table for Itaparica - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3098
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3098
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-Itapetinga b/isdb-t/br-ba-Itapetinga
index a80182fb..0c2eac00 100644
--- a/isdb-t/br-ba-Itapetinga
+++ b/isdb-t/br-ba-Itapetinga
@@ -1,5 +1,5 @@
 # Channel table for Itapetinga - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/743
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=743
 
 # Physical channel 21 (virtual 2.1)
 [Record TV Cabrália]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 8.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 27 (virtual 11.1)
 [TV Sudoeste]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Itirucu b/isdb-t/br-ba-Itirucu
index 6a842d10..7721439d 100644
--- a/isdb-t/br-ba-Itirucu
+++ b/isdb-t/br-ba-Itirucu
@@ -1,5 +1,5 @@
-# Channel table for Itiruçu - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2409
+# Channel table for Itiru�u - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2409
 
 # Physical channel 28 (virtual 6.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-Jaborandi b/isdb-t/br-ba-Jaborandi
index 5bed20e9..312ea087 100644
--- a/isdb-t/br-ba-Jaborandi
+++ b/isdb-t/br-ba-Jaborandi
@@ -1,5 +1,5 @@
 # Channel table for Jaborandi - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3171
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3171
 
 # Physical channel 28 (virtual 27.1)
 [Record TV Cabrália]
diff --git a/isdb-t/br-ba-Jacobina b/isdb-t/br-ba-Jacobina
index da7edef2..ec81f22c 100644
--- a/isdb-t/br-ba-Jacobina
+++ b/isdb-t/br-ba-Jacobina
@@ -1,5 +1,5 @@
 # Channel table for Jacobina - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/511
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=511
 
 # Physical channel 21 (virtual 4.1)
 [Record TV Itapoan]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 3.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 5.1)
 [TV São Francisco]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Jaguaquara b/isdb-t/br-ba-Jaguaquara
index ff147f8d..d6663d7a 100644
--- a/isdb-t/br-ba-Jaguaquara
+++ b/isdb-t/br-ba-Jaguaquara
@@ -1,5 +1,34 @@
 # Channel table for Jaguaquara - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/775
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=775
+
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 11.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-Jaguarari b/isdb-t/br-ba-Jaguarari
index 5465afcf..dc888169 100644
--- a/isdb-t/br-ba-Jaguarari
+++ b/isdb-t/br-ba-Jaguarari
@@ -1,5 +1,5 @@
 # Channel table for Jaguarari - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/673
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=673
 
 # Physical channel 30 (virtual 2.1)
 [TV São Francisco]
diff --git a/isdb-t/br-ba-Jaguarari(pilar) b/isdb-t/br-ba-Jaguarari(pilar)
index 04ae4bd6..f6378f29 100644
--- a/isdb-t/br-ba-Jaguarari(pilar)
+++ b/isdb-t/br-ba-Jaguarari(pilar)
@@ -1,5 +1,5 @@
 # Channel table for Jaguarari (pilar) - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1829
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1829
 
 # Physical channel 22 (virtual 10.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Jaguaripe b/isdb-t/br-ba-Jaguaripe
index b2de8df1..8a6a065a 100644
--- a/isdb-t/br-ba-Jaguaripe
+++ b/isdb-t/br-ba-Jaguaripe
@@ -1,8 +1,8 @@
 # Channel table for Jaguaripe - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1436
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1436
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia/TV Anísio Teixeira, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia/TV Anísio Teixeira, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-Jequie b/isdb-t/br-ba-Jequie
index 291aa677..b52574c6 100644
--- a/isdb-t/br-ba-Jequie
+++ b/isdb-t/br-ba-Jequie
@@ -1,5 +1,34 @@
-# Channel table for Jequié - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/387
+# Channel table for Jequi� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=387
+
+# Physical channel 14 (virtual 15.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 8.1)
 [Record TV Cabrália]
@@ -59,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 7.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 12.1)
 [Band Bahia]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Jeremoabo b/isdb-t/br-ba-Jeremoabo
index 8eb31626..fd7762d6 100644
--- a/isdb-t/br-ba-Jeremoabo
+++ b/isdb-t/br-ba-Jeremoabo
@@ -1,5 +1,5 @@
 # Channel table for Jeremoabo - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3172
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3172
 
 # Physical channel 29 (virtual 9.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-Juazeiro b/isdb-t/br-ba-Juazeiro
index a98c7738..d8cc85bb 100644
--- a/isdb-t/br-ba-Juazeiro
+++ b/isdb-t/br-ba-Juazeiro
@@ -1,5 +1,5 @@
 # Channel table for Juazeiro - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/171
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=171
 
 # Physical channel 18 (virtual 19.1)
 [TV Grande Rio]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 9.1)
-[TV Clube]
+# Physical channel 22 (virtual 36.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 46.1)
-[TV Verdade]
+# Physical channel 23 (virtual 8.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 7.1)
-[TV São Francisco]
+# Physical channel 26 (virtual 9.1)
+[TV Clube]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 46.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[RCI]
+# Physical channel 28 (virtual 7.1)
+[TV São Francisco]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 38.2)
+# Physical channel 38 (virtual 38.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -233,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 14.1)
-[Rede Vida]
+# Physical channel 43 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -262,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 34.1)
+# Physical channel 44 (virtual 30.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -349,3 +378,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 50.1)
+[TV Sul Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Lapao b/isdb-t/br-ba-Lapao
new file mode 100644
index 00000000..8010955a
--- /dev/null
+++ b/isdb-t/br-ba-Lapao
@@ -0,0 +1,61 @@
+# Channel table for Lap�o - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4055
+
+# Physical channel 24 (virtual 5.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 4.1)
+[TV São Francisco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-LauroDeFreitas b/isdb-t/br-ba-LauroDeFreitas
index fa6fa950..877cd94d 100644
--- a/isdb-t/br-ba-LauroDeFreitas
+++ b/isdb-t/br-ba-LauroDeFreitas
@@ -1,8 +1,8 @@
 # Channel table for Lauro De Freitas - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3089
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3089
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,6 +233,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 26.1)
+[Top TV Nordeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 11.1)
 [TV Bahia]
 	DELIVERY_SYSTEM = ISDBT
@@ -349,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -378,6 +407,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 36.1)
+[Rede Gênesis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 39.1)
 [TV Novo Tempo]
 	DELIVERY_SYSTEM = ISDBT
@@ -408,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -437,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -465,8 +523,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -495,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 45 (virtual 45.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ba-LivramentoDeNossaSenhora b/isdb-t/br-ba-LivramentoDeNossaSenhora
index 963f3589..4913d4f9 100644
--- a/isdb-t/br-ba-LivramentoDeNossaSenhora
+++ b/isdb-t/br-ba-LivramentoDeNossaSenhora
@@ -1,5 +1,5 @@
 # Channel table for Livramento De Nossa Senhora - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3395
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3395
 
 # Physical channel 33 (virtual 33.1)
 [TV Evangelizar]
diff --git a/isdb-t/br-ba-LuisEduardoMagalhaes b/isdb-t/br-ba-LuisEduardoMagalhaes
index da4ffed7..d360a5e4 100644
--- a/isdb-t/br-ba-LuisEduardoMagalhaes
+++ b/isdb-t/br-ba-LuisEduardoMagalhaes
@@ -1,5 +1,5 @@
-# Channel table for Luís Eduardo Magalhães - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1365
+# Channel table for Lu�s Eduardo Magalh�es - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1365
 
 # Physical channel 22 (virtual 22.1)
 [TV Verdade]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 6.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 7.1)
 [TV Oeste]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,3 +88,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 44.1)
+[TV Novo Tempo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 8.1)
+[Band Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Macaubas b/isdb-t/br-ba-Macaubas
index 7cde25f5..4161ab4f 100644
--- a/isdb-t/br-ba-Macaubas
+++ b/isdb-t/br-ba-Macaubas
@@ -1,5 +1,34 @@
-# Channel table for Macaúbas - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1476
+# Channel table for Maca�bas - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1476
+
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 5.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-MadreDeDeus b/isdb-t/br-ba-MadreDeDeus
index 23fcc501..b3908e14 100644
--- a/isdb-t/br-ba-MadreDeDeus
+++ b/isdb-t/br-ba-MadreDeDeus
@@ -1,8 +1,8 @@
 # Channel table for Madre De Deus - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3101
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3101
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-ManoelVitorino b/isdb-t/br-ba-ManoelVitorino
index f6aa9dc7..e4b5d786 100644
--- a/isdb-t/br-ba-ManoelVitorino
+++ b/isdb-t/br-ba-ManoelVitorino
@@ -1,5 +1,5 @@
 # Channel table for Manoel Vitorino - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/777
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=777
 
 # Physical channel 28 (virtual 6.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-Maragogipe b/isdb-t/br-ba-Maragogipe
index faea3ae4..f6234e59 100644
--- a/isdb-t/br-ba-Maragogipe
+++ b/isdb-t/br-ba-Maragogipe
@@ -1,8 +1,8 @@
 # Channel table for Maragogipe - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1445
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1445
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia/TV Anísio Teixeira, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia/TV Anísio Teixeira, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-MataDeSaoJoao b/isdb-t/br-ba-MataDeSaoJoao
index 8add0c04..c0f3e8f1 100644
--- a/isdb-t/br-ba-MataDeSaoJoao
+++ b/isdb-t/br-ba-MataDeSaoJoao
@@ -1,8 +1,8 @@
-# Channel table for Mata De São João - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3102
+# Channel table for Mata De S�o Jo�o - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3102
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 23 (virtual 23.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -291,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
+# Physical channel 35 (virtual 12.4)
 [TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -379,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-ba-MataDeSaoJoao(praiaDoForte) b/isdb-t/br-ba-MataDeSaoJoao(praiaDoForte)
index ad6a7cf4..0f42c560 100644
--- a/isdb-t/br-ba-MataDeSaoJoao(praiaDoForte)
+++ b/isdb-t/br-ba-MataDeSaoJoao(praiaDoForte)
@@ -1,5 +1,34 @@
-# Channel table for Mata De São João (praia Do Forte) - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3318
+# Channel table for Mata De S�o Jo�o (praia Do Forte) - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3318
+
+# Physical channel 21 (virtual 5.1)
+[Record TV Itapoan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 11.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-MonteSanto b/isdb-t/br-ba-MonteSanto
index 3b80d596..498e8069 100644
--- a/isdb-t/br-ba-MonteSanto
+++ b/isdb-t/br-ba-MonteSanto
@@ -1,5 +1,5 @@
 # Channel table for Monte Santo - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/799
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=799
 
 # Physical channel 27 (virtual 3.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-MorroDoChapeu b/isdb-t/br-ba-MorroDoChapeu
index 274e5121..d3f0a565 100644
--- a/isdb-t/br-ba-MorroDoChapeu
+++ b/isdb-t/br-ba-MorroDoChapeu
@@ -1,5 +1,5 @@
-# Channel table for Morro Do Chapéu - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1485
+# Channel table for Morro Do Chap�u - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1485
 
 # Physical channel 22 (virtual 12.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Mucuri b/isdb-t/br-ba-Mucuri
index b70fdac0..1491104f 100644
--- a/isdb-t/br-ba-Mucuri
+++ b/isdb-t/br-ba-Mucuri
@@ -1,5 +1,34 @@
 # Channel table for Mucuri - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/733
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=733
+
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 11.1)
 [TV Santa Cruz]
@@ -30,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 49.1)
+[TV Sul Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-MunizFerreira b/isdb-t/br-ba-MunizFerreira
new file mode 100644
index 00000000..f8b4fbde
--- /dev/null
+++ b/isdb-t/br-ba-MunizFerreira
@@ -0,0 +1,438 @@
+# Channel table for Muniz Ferreira - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4141
+
+# Physical channel 14 (virtual 14.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 18.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 5.1)
+[Record TV Itapoan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia/TV Anísio Teixeira, TV Kirimurê, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 11.1)
+[TV Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 31.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 39.1)
+[TV Novo Tempo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 50.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 13.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 7.1)
+[Band Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Muritiba b/isdb-t/br-ba-Muritiba
index fc7f80ab..b895de81 100644
--- a/isdb-t/br-ba-Muritiba
+++ b/isdb-t/br-ba-Muritiba
@@ -1,5 +1,5 @@
 # Channel table for Muritiba - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3430
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3430
 
 # Physical channel 22 (virtual 5.1)
 [Record TV Itapoan]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 27 (virtual 10.1)
 [TV Subaé]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Nazare b/isdb-t/br-ba-Nazare
index 1ab62663..5db74868 100644
--- a/isdb-t/br-ba-Nazare
+++ b/isdb-t/br-ba-Nazare
@@ -1,8 +1,8 @@
-# Channel table for Nazaré - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3109
+# Channel table for Nazar� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3109
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia/TV Anísio Teixeira, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia/TV Anísio Teixeira, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-NovaVicosa b/isdb-t/br-ba-NovaVicosa
index babf90f4..94708483 100644
--- a/isdb-t/br-ba-NovaVicosa
+++ b/isdb-t/br-ba-NovaVicosa
@@ -1,5 +1,5 @@
-# Channel table for Nova Viçosa - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1380
+# Channel table for Nova Vi�osa - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1380
 
 # Physical channel 28 (virtual 8.1)
 [TV Santa Cruz]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 11.1)
+[TV Sul Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Ouricangas b/isdb-t/br-ba-Ouricangas
new file mode 100644
index 00000000..c4000f32
--- /dev/null
+++ b/isdb-t/br-ba-Ouricangas
@@ -0,0 +1,206 @@
+# Channel table for Ouri�angas - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4073
+
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 5.1)
+[Record TV Itapoan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 3.1)
+[TV Aratu]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 10.1)
+[TV Subaé]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 38.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-PalmasDeMonteAlto b/isdb-t/br-ba-PalmasDeMonteAlto
index 05685e8d..676b733b 100644
--- a/isdb-t/br-ba-PalmasDeMonteAlto
+++ b/isdb-t/br-ba-PalmasDeMonteAlto
@@ -1,5 +1,5 @@
 # Channel table for Palmas De Monte Alto - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1493
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1493
 
 # Physical channel 22 (virtual 13.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Paramirim b/isdb-t/br-ba-Paramirim
index 420038c0..60745f77 100644
--- a/isdb-t/br-ba-Paramirim
+++ b/isdb-t/br-ba-Paramirim
@@ -1,5 +1,5 @@
 # Channel table for Paramirim - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/801
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=801
 
 # Physical channel 21 (virtual 11.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-PauloAfonso b/isdb-t/br-ba-PauloAfonso
index 94e3d334..1fc45873 100644
--- a/isdb-t/br-ba-PauloAfonso
+++ b/isdb-t/br-ba-PauloAfonso
@@ -1,5 +1,5 @@
 # Channel table for Paulo Afonso - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/261
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=261
 
 # Physical channel 21 (virtual 10.1)
 [Record TV Itapoan]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 8.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 6.1)
 [TV São Francisco]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 14.1)
-[Rede Vida]
+# Physical channel 43 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-PeDeSerra b/isdb-t/br-ba-PeDeSerra
index 2e13a498..4d8b7e1d 100644
--- a/isdb-t/br-ba-PeDeSerra
+++ b/isdb-t/br-ba-PeDeSerra
@@ -1,5 +1,5 @@
-# Channel table for Pé De Serra - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1494
+# Channel table for P� De Serra - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1494
 
 # Physical channel 22 (virtual 10.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Piripa b/isdb-t/br-ba-Piripa
index 1331fc46..9e29b371 100644
--- a/isdb-t/br-ba-Piripa
+++ b/isdb-t/br-ba-Piripa
@@ -1,5 +1,5 @@
-# Channel table for Piripá - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2604
+# Channel table for Pirip� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2604
 
 # Physical channel 22 (virtual 10.1)
 [Record TV Cabrália]
diff --git a/isdb-t/br-ba-Planalto b/isdb-t/br-ba-Planalto
index f764caeb..0e2dc14d 100644
--- a/isdb-t/br-ba-Planalto
+++ b/isdb-t/br-ba-Planalto
@@ -1,5 +1,5 @@
 # Channel table for Planalto - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1498
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1498
 
 # Physical channel 22 (virtual 9.1)
 [Record TV Itapoan]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV UESB]
+# Physical channel 33 (virtual 4.2)
+[TV UESB, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 35.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 2.1)
 [Band Bahia]
 	DELIVERY_SYSTEM = ISDBT
@@ -175,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 43.2)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 13.1)
 [TV Aratu]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Pocoes b/isdb-t/br-ba-Pocoes
index 012df4cc..1b6ecd21 100644
--- a/isdb-t/br-ba-Pocoes
+++ b/isdb-t/br-ba-Pocoes
@@ -1,5 +1,5 @@
-# Channel table for Poções - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1359
+# Channel table for Po��es - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1359
 
 # Physical channel 21 (virtual 11.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Pojuca b/isdb-t/br-ba-Pojuca
index 6b3bcbe8..d84c2ab3 100644
--- a/isdb-t/br-ba-Pojuca
+++ b/isdb-t/br-ba-Pojuca
@@ -1,5 +1,5 @@
 # Channel table for Pojuca - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1486
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1486
 
 # Physical channel 17 (virtual 18.1)
 [CNT Bahia]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-PortoSeguro b/isdb-t/br-ba-PortoSeguro
index 8a03ac0d..1afbb8ee 100644
--- a/isdb-t/br-ba-PortoSeguro
+++ b/isdb-t/br-ba-PortoSeguro
@@ -1,5 +1,5 @@
 # Channel table for Porto Seguro - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/159
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=159
 
 # Physical channel 20 (virtual 7.1)
 [Record TV Cabrália]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 8.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 9.1)
 [TV Santa Cruz]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Prado b/isdb-t/br-ba-Prado
new file mode 100644
index 00000000..d1666436
--- /dev/null
+++ b/isdb-t/br-ba-Prado
@@ -0,0 +1,61 @@
+# Channel table for Prado - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=802
+
+# Physical channel 31 (virtual 5.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 40.1)
+[TV Sul Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-PresidenteDutra b/isdb-t/br-ba-PresidenteDutra
new file mode 100644
index 00000000..bd470a18
--- /dev/null
+++ b/isdb-t/br-ba-PresidenteDutra
@@ -0,0 +1,61 @@
+# Channel table for Presidente Dutra - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3196
+
+# Physical channel 24 (virtual 5.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 4.1)
+[TV São Francisco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-PresidenteJanioQuadros b/isdb-t/br-ba-PresidenteJanioQuadros
index 92d11d55..fb64fa11 100644
--- a/isdb-t/br-ba-PresidenteJanioQuadros
+++ b/isdb-t/br-ba-PresidenteJanioQuadros
@@ -1,5 +1,5 @@
-# Channel table for Presidente Jânio Quadros - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1500
+# Channel table for Presidente J�nio Quadros - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1500
 
 # Physical channel 28 (virtual 5.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-RafaelJambeiro b/isdb-t/br-ba-RafaelJambeiro
index 8974665d..400c89a1 100644
--- a/isdb-t/br-ba-RafaelJambeiro
+++ b/isdb-t/br-ba-RafaelJambeiro
@@ -1,5 +1,5 @@
 # Channel table for Rafael Jambeiro - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3245
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3245
 
 # Physical channel 27 (virtual 10.1)
 [TV Subaé]
diff --git a/isdb-t/br-ba-Remanso b/isdb-t/br-ba-Remanso
index 5ea66070..81881c83 100644
--- a/isdb-t/br-ba-Remanso
+++ b/isdb-t/br-ba-Remanso
@@ -1,5 +1,5 @@
 # Channel table for Remanso - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/779
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=779
 
 # Physical channel 21 (virtual 5.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-RiachaoDoJacuipe b/isdb-t/br-ba-RiachaoDoJacuipe
index e5149bea..48cbe9cc 100644
--- a/isdb-t/br-ba-RiachaoDoJacuipe
+++ b/isdb-t/br-ba-RiachaoDoJacuipe
@@ -1,5 +1,5 @@
-# Channel table for Riachão Do Jacuípe - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1503
+# Channel table for Riach�o Do Jacu�pe - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1503
 
 # Physical channel 32 (virtual 6.1)
 [TV Subaé]
diff --git a/isdb-t/br-ba-RibeiraDoPombal b/isdb-t/br-ba-RibeiraDoPombal
index 16cbc5e1..7bfec5f9 100644
--- a/isdb-t/br-ba-RibeiraDoPombal
+++ b/isdb-t/br-ba-RibeiraDoPombal
@@ -1,5 +1,5 @@
 # Channel table for Ribeira Do Pombal - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1360
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1360
 
 # Physical channel 22 (virtual 6.1)
 [Record TV Itapoan]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 10.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 12.1)
 [TV Bahia]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-RioReal b/isdb-t/br-ba-RioReal
index aab14642..10be3b7e 100644
--- a/isdb-t/br-ba-RioReal
+++ b/isdb-t/br-ba-RioReal
@@ -1,5 +1,5 @@
 # Channel table for Rio Real - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1357
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1357
 
 # Physical channel 29 (virtual 11.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-RuyBarbosa b/isdb-t/br-ba-RuyBarbosa
index cc7301cb..f5b2fbb8 100644
--- a/isdb-t/br-ba-RuyBarbosa
+++ b/isdb-t/br-ba-RuyBarbosa
@@ -1,5 +1,5 @@
 # Channel table for Ruy Barbosa - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1358
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1358
 
 # Physical channel 16 (virtual 5.1)
 [Rede Vida]
diff --git a/isdb-t/br-ba-SalinasDaMargarida b/isdb-t/br-ba-SalinasDaMargarida
index 360f93f2..30e00032 100644
--- a/isdb-t/br-ba-SalinasDaMargarida
+++ b/isdb-t/br-ba-SalinasDaMargarida
@@ -1,8 +1,8 @@
 # Channel table for Salinas Da Margarida - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3112
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3112
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-Salvador b/isdb-t/br-ba-Salvador
index e0720d71..72089620 100644
--- a/isdb-t/br-ba-Salvador
+++ b/isdb-t/br-ba-Salvador
@@ -1,8 +1,8 @@
 # Channel table for Salvador - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/19
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=19
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia/TV Anísio Teixeira, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia/TV Anísio Teixeira, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 26.1)
-[Top TV]
+[Top TV Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -466,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -523,8 +523,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -553,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 45 (virtual 45.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ba-SantaBarbara b/isdb-t/br-ba-SantaBarbara
index 33f59a5a..deaec3f7 100644
--- a/isdb-t/br-ba-SantaBarbara
+++ b/isdb-t/br-ba-SantaBarbara
@@ -1,8 +1,8 @@
-# Channel table for Santa Bárbara - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3125
+# Channel table for Santa B�rbara - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3125
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-SantaCruzCabralia b/isdb-t/br-ba-SantaCruzCabralia
index e6b7bc4e..63c02f4f 100644
--- a/isdb-t/br-ba-SantaCruzCabralia
+++ b/isdb-t/br-ba-SantaCruzCabralia
@@ -1,5 +1,34 @@
-# Channel table for Santa Cruz Cabrália - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1488
+# Channel table for Santa Cruz Cabr�lia - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1488
+
+# Physical channel 24 (virtual 8.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 9.1)
 [TV Santa Cruz]
diff --git a/isdb-t/br-ba-SantaLuzia b/isdb-t/br-ba-SantaLuzia
new file mode 100644
index 00000000..b3dab3ac
--- /dev/null
+++ b/isdb-t/br-ba-SantaLuzia
@@ -0,0 +1,32 @@
+# Channel table for Santa Luzia - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4066
+
+# Physical channel 38 (virtual 38.1)
+[TV Sul Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-SantaMariaDaVitoria b/isdb-t/br-ba-SantaMariaDaVitoria
index 45b8a5dc..f8127a66 100644
--- a/isdb-t/br-ba-SantaMariaDaVitoria
+++ b/isdb-t/br-ba-SantaMariaDaVitoria
@@ -1,5 +1,5 @@
-# Channel table for Santa Maria Da Vitória - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1352
+# Channel table for Santa Maria Da Vit�ria - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1352
 
 # Physical channel 28 (virtual 10.1)
 [TV Oeste]
diff --git a/isdb-t/br-ba-Santaluz b/isdb-t/br-ba-Santaluz
index 220bb434..caa0f8ea 100644
--- a/isdb-t/br-ba-Santaluz
+++ b/isdb-t/br-ba-Santaluz
@@ -1,5 +1,63 @@
 # Channel table for Santaluz - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1540
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1540
+
+# Physical channel 21 (virtual 6.1)
+[Record TV Itapoan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 4.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 2.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-Santanopolis b/isdb-t/br-ba-Santanopolis
index eef38b89..a024ecef 100644
--- a/isdb-t/br-ba-Santanopolis
+++ b/isdb-t/br-ba-Santanopolis
@@ -1,8 +1,8 @@
-# Channel table for Santanópolis - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3127
+# Channel table for Santan�polis - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3127
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-SantoAmaro b/isdb-t/br-ba-SantoAmaro
index 62f81b57..69fc3497 100644
--- a/isdb-t/br-ba-SantoAmaro
+++ b/isdb-t/br-ba-SantoAmaro
@@ -1,8 +1,8 @@
 # Channel table for Santo Amaro - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3090
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3090
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -320,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
+# Physical channel 35 (virtual 12.4)
 [TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-SantoAntonioDeJesus b/isdb-t/br-ba-SantoAntonioDeJesus
index db1601b7..0df991c3 100644
--- a/isdb-t/br-ba-SantoAntonioDeJesus
+++ b/isdb-t/br-ba-SantoAntonioDeJesus
@@ -1,5 +1,92 @@
-# Channel table for Santo Antônio De Jesus - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/722
+# Channel table for Santo Ant�nio De Jesus - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=722
+
+# Physical channel 14 (virtual 14.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 18.1)
+[CNT Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 5.1)
 [Record TV Itapoan]
@@ -59,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -88,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -117,8 +204,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 32 (virtual 31.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -146,8 +262,124 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 36 (virtual 36.1)
+[Rede Gênesis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 39.1)
+[TV Novo Tempo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 50.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 13.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -204,3 +436,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 48.1)
+[Rede 21]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-SantoEstevao b/isdb-t/br-ba-SantoEstevao
index d7b75853..58c887cd 100644
--- a/isdb-t/br-ba-SantoEstevao
+++ b/isdb-t/br-ba-SantoEstevao
@@ -1,8 +1,8 @@
-# Channel table for Santo Estêvão - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3099
+# Channel table for Santo Est�v�o - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3099
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 40.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-SaoDesiderio b/isdb-t/br-ba-SaoDesiderio
index 968ab8a0..3df70a7c 100644
--- a/isdb-t/br-ba-SaoDesiderio
+++ b/isdb-t/br-ba-SaoDesiderio
@@ -1,5 +1,5 @@
-# Channel table for São Desidério - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1541
+# Channel table for S�o Desid�rio - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1541
 
 # Physical channel 27 (virtual 12.1)
 [TV Oeste]
diff --git a/isdb-t/br-ba-SaoDomingos b/isdb-t/br-ba-SaoDomingos
index 51bc20c1..13c715b1 100644
--- a/isdb-t/br-ba-SaoDomingos
+++ b/isdb-t/br-ba-SaoDomingos
@@ -1,5 +1,5 @@
-# Channel table for São Domingos - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1542
+# Channel table for S�o Domingos - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1542
 
 # Physical channel 21 (virtual 5.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-SaoFelix b/isdb-t/br-ba-SaoFelix
new file mode 100644
index 00000000..3ecba723
--- /dev/null
+++ b/isdb-t/br-ba-SaoFelix
@@ -0,0 +1,32 @@
+# Channel table for S�o F�lix - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3340
+
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-SaoFelixDoCoribe b/isdb-t/br-ba-SaoFelixDoCoribe
index ba808336..7bd515c6 100644
--- a/isdb-t/br-ba-SaoFelixDoCoribe
+++ b/isdb-t/br-ba-SaoFelixDoCoribe
@@ -1,5 +1,5 @@
-# Channel table for São Félix Do Coribe - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1353
+# Channel table for S�o F�lix Do Coribe - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1353
 
 # Physical channel 28 (virtual 10.1)
 [TV Oeste]
diff --git a/isdb-t/br-ba-SaoFranciscoDoConde b/isdb-t/br-ba-SaoFranciscoDoConde
index eaf109a2..a6c95e8d 100644
--- a/isdb-t/br-ba-SaoFranciscoDoConde
+++ b/isdb-t/br-ba-SaoFranciscoDoConde
@@ -1,8 +1,8 @@
-# Channel table for São Francisco Do Conde - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3104
+# Channel table for S�o Francisco Do Conde - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3104
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-SaoGoncaloDosCampos b/isdb-t/br-ba-SaoGoncaloDosCampos
index 0a04e4ba..d02b0966 100644
--- a/isdb-t/br-ba-SaoGoncaloDosCampos
+++ b/isdb-t/br-ba-SaoGoncaloDosCampos
@@ -1,8 +1,8 @@
-# Channel table for São Gonçalo Dos Campos - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3128
+# Channel table for S�o Gon�alo Dos Campos - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3128
 
-# Physical channel 14 (virtual 14.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[TVE Bahia]
+# Physical channel 24 (virtual 9.2)
+[TVE Bahia, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 32.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-SaoSebastiaoDoPasse b/isdb-t/br-ba-SaoSebastiaoDoPasse
index 2c92dd99..9158b5b5 100644
--- a/isdb-t/br-ba-SaoSebastiaoDoPasse
+++ b/isdb-t/br-ba-SaoSebastiaoDoPasse
@@ -1,8 +1,8 @@
-# Channel table for São Sebastião Do Passé - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3108
+# Channel table for S�o Sebasti�o Do Pass� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3108
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-Saubara b/isdb-t/br-ba-Saubara
index a933e95c..11675c22 100644
--- a/isdb-t/br-ba-Saubara
+++ b/isdb-t/br-ba-Saubara
@@ -1,8 +1,8 @@
 # Channel table for Saubara - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3436
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3436
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Record News ES]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia/TV Anísio Teixeira, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia/TV Anísio Teixeira, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-Seabra b/isdb-t/br-ba-Seabra
index f5f6245e..0a29b0ab 100644
--- a/isdb-t/br-ba-Seabra
+++ b/isdb-t/br-ba-Seabra
@@ -1,5 +1,34 @@
 # Channel table for Seabra - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/805
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=805
+
+# Physical channel 23 (virtual 10.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 12.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-SenhorDoBonfim b/isdb-t/br-ba-SenhorDoBonfim
index 2b479735..18cea885 100644
--- a/isdb-t/br-ba-SenhorDoBonfim
+++ b/isdb-t/br-ba-SenhorDoBonfim
@@ -1,5 +1,5 @@
 # Channel table for Senhor Do Bonfim - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/669
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=669
 
 # Physical channel 15 (virtual 14.1)
 [Rede Vida]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 11.1)
 [TV São Francisco]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-SerraPreta b/isdb-t/br-ba-SerraPreta
index cd3994fe..f1d64daf 100644
--- a/isdb-t/br-ba-SerraPreta
+++ b/isdb-t/br-ba-SerraPreta
@@ -1,5 +1,5 @@
 # Channel table for Serra Preta - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3129
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3129
 
 # Physical channel 14 (virtual 14.1)
 [Rede Vida]
@@ -175,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Serrinha b/isdb-t/br-ba-Serrinha
index 6df2a170..24997515 100644
--- a/isdb-t/br-ba-Serrinha
+++ b/isdb-t/br-ba-Serrinha
@@ -1,5 +1,5 @@
 # Channel table for Serrinha - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/633
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=633
 
 # Physical channel 22 (virtual 13.1)
 [Record TV Itapoan]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 6.1)
 [TV Subaé]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ba-Serrolandia b/isdb-t/br-ba-Serrolandia
index 2455c0a2..000c4e3c 100644
--- a/isdb-t/br-ba-Serrolandia
+++ b/isdb-t/br-ba-Serrolandia
@@ -1,5 +1,5 @@
-# Channel table for Serrolândia - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1545
+# Channel table for Serrol�ndia - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1545
 
 # Physical channel 22 (virtual 5.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-SimoesFilho b/isdb-t/br-ba-SimoesFilho
index 154ff21f..50b31637 100644
--- a/isdb-t/br-ba-SimoesFilho
+++ b/isdb-t/br-ba-SimoesFilho
@@ -1,8 +1,8 @@
-# Channel table for Simões Filho - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3110
+# Channel table for Sim�es Filho - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3110
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,6 +233,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 26.1)
+[Top TV Nordeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 11.1)
 [TV Bahia]
 	DELIVERY_SYSTEM = ISDBT
@@ -349,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -437,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -465,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -495,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 45 (virtual 45.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ba-SitioDoMato b/isdb-t/br-ba-SitioDoMato
new file mode 100644
index 00000000..cf7232c5
--- /dev/null
+++ b/isdb-t/br-ba-SitioDoMato
@@ -0,0 +1,32 @@
+# Channel table for S�tio Do Mato - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1354
+
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Sobradinho b/isdb-t/br-ba-Sobradinho
index 4fe12ce1..6f1b2490 100644
--- a/isdb-t/br-ba-Sobradinho
+++ b/isdb-t/br-ba-Sobradinho
@@ -1,5 +1,5 @@
 # Channel table for Sobradinho - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3201
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3201
 
 # Physical channel 18 (virtual 19.1)
 [TV Grande Rio]
@@ -59,11 +59,69 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 7.1)
-[TV São Francisco]
+# Physical channel 22 (virtual 36.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 8.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 9.1)
+[TV Clube]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[RCI]
+# Physical channel 28 (virtual 7.1)
+[TV São Francisco]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,3 +233,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 34.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 13.1)
+[TV Pernambuco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-Tanhacu b/isdb-t/br-ba-Tanhacu
index 62f6c4b8..6ff65c15 100644
--- a/isdb-t/br-ba-Tanhacu
+++ b/isdb-t/br-ba-Tanhacu
@@ -1,5 +1,5 @@
-# Channel table for Tanhaçu - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3202
+# Channel table for Tanha�u - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3202
 
 # Physical channel 28 (virtual 5.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-Tanquinho b/isdb-t/br-ba-Tanquinho
index 15ab071e..6fb66a36 100644
--- a/isdb-t/br-ba-Tanquinho
+++ b/isdb-t/br-ba-Tanquinho
@@ -1,5 +1,5 @@
 # Channel table for Tanquinho - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3130
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3130
 
 # Physical channel 14 (virtual 14.1)
 [Rede Vida]
@@ -175,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ba-TeixeiraDeFreitas b/isdb-t/br-ba-TeixeiraDeFreitas
index 80b4b336..0cdf53e1 100644
--- a/isdb-t/br-ba-TeixeiraDeFreitas
+++ b/isdb-t/br-ba-TeixeiraDeFreitas
@@ -1,5 +1,5 @@
 # Channel table for Teixeira De Freitas - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/668
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=668
 
 # Physical channel 15 (virtual 14.1)
 [Rede Vida]
@@ -59,8 +59,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 8.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
diff --git a/isdb-t/br-ba-Teofilandia b/isdb-t/br-ba-Teofilandia
index caa2a188..83b394ae 100644
--- a/isdb-t/br-ba-Teofilandia
+++ b/isdb-t/br-ba-Teofilandia
@@ -1,5 +1,34 @@
-# Channel table for Teofilândia - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1546
+# Channel table for Teofil�ndia - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1546
+
+# Physical channel 24 (virtual 10.1)
+[TVE Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 6.1)
 [TV Subaé]
diff --git a/isdb-t/br-ba-TerraNova b/isdb-t/br-ba-TerraNova
index dde49676..7b35318d 100644
--- a/isdb-t/br-ba-TerraNova
+++ b/isdb-t/br-ba-TerraNova
@@ -1,5 +1,5 @@
 # Channel table for Terra Nova - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3725
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3725
 
 # Physical channel 17 (virtual 18.1)
 [CNT Bahia]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia/TV Anísio Teixeira, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia/TV Anísio Teixeira, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
diff --git a/isdb-t/br-ba-Tremedal b/isdb-t/br-ba-Tremedal
index 69bdb220..71896f2e 100644
--- a/isdb-t/br-ba-Tremedal
+++ b/isdb-t/br-ba-Tremedal
@@ -1,5 +1,5 @@
 # Channel table for Tremedal - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1547
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1547
 
 # Physical channel 28 (virtual 5.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-ba-Tucano b/isdb-t/br-ba-Tucano
index fab8b0aa..22393e9e 100644
--- a/isdb-t/br-ba-Tucano
+++ b/isdb-t/br-ba-Tucano
@@ -1,5 +1,5 @@
 # Channel table for Tucano - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/723
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=723
 
 # Physical channel 27 (virtual 13.1)
 [TV Bahia]
diff --git a/isdb-t/br-ba-Uaua b/isdb-t/br-ba-Uaua
index 4b2e3e0f..66ba112c 100644
--- a/isdb-t/br-ba-Uaua
+++ b/isdb-t/br-ba-Uaua
@@ -1,5 +1,5 @@
-# Channel table for Uauá - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3206
+# Channel table for Uau� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3206
 
 # Physical channel 27 (virtual 7.1)
 [TV São Francisco]
diff --git a/isdb-t/br-ba-Ubaitaba b/isdb-t/br-ba-Ubaitaba
index cd78884d..349e6116 100644
--- a/isdb-t/br-ba-Ubaitaba
+++ b/isdb-t/br-ba-Ubaitaba
@@ -1,5 +1,5 @@
 # Channel table for Ubaitaba - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1361
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1361
 
 # Physical channel 29 (virtual 5.1)
 [TV Santa Cruz]
diff --git a/isdb-t/br-ba-Ubata b/isdb-t/br-ba-Ubata
index 115c515b..338a3877 100644
--- a/isdb-t/br-ba-Ubata
+++ b/isdb-t/br-ba-Ubata
@@ -1,5 +1,5 @@
-# Channel table for Ubatã - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1549
+# Channel table for Ubat� - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1549
 
 # Physical channel 21 (virtual 13.1)
 [Record TV Cabrália]
diff --git a/isdb-t/br-ba-Utinga b/isdb-t/br-ba-Utinga
index 7cbde5d1..af908051 100644
--- a/isdb-t/br-ba-Utinga
+++ b/isdb-t/br-ba-Utinga
@@ -1,5 +1,5 @@
 # Channel table for Utinga - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1535
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1535
 
 # Physical channel 21 (virtual 11.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-Valenca b/isdb-t/br-ba-Valenca
index e34569a0..582f12e8 100644
--- a/isdb-t/br-ba-Valenca
+++ b/isdb-t/br-ba-Valenca
@@ -1,8 +1,8 @@
-# Channel table for Valença - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3290
+# Channel table for Valen�a - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3290
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia/TV Anísio Teixeira, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia/TV Anísio Teixeira, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-Valente b/isdb-t/br-ba-Valente
index b58e3494..9a22c4ba 100644
--- a/isdb-t/br-ba-Valente
+++ b/isdb-t/br-ba-Valente
@@ -1,5 +1,5 @@
 # Channel table for Valente - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1536
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1536
 
 # Physical channel 21 (virtual 5.1)
 [Record TV Itapoan]
diff --git a/isdb-t/br-ba-VeraCruz b/isdb-t/br-ba-VeraCruz
index 25ff7bf4..9ccb732a 100644
--- a/isdb-t/br-ba-VeraCruz
+++ b/isdb-t/br-ba-VeraCruz
@@ -1,8 +1,8 @@
 # Channel table for Vera Cruz - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3111
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3111
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 6.1)
-[TV Baiana]
+# Physical channel 16 (virtual 6.3)
+[TV Baiana, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede TV!]
+# Physical channel 22 (virtual 22.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 10.2)
-[TVE Bahia, TV Kirimurê]
+# Physical channel 24 (virtual 10.3)
+[TVE Bahia, Educa Bahia, TV Kirimurê]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[TV Aratu]
+# Physical channel 25 (virtual 4.3)
+[TV Aratu, Nossa Rede na TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 61.4)
-[TV Câmara, TV Assembleia BA, TV Senado, TV Câmara Municipal Salvador]
+# Physical channel 35 (virtual 12.4)
+[TV Câmara, TV Assembleia BA, TV Câmara Municipal Salvador, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 13.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ba-VitoriaDaConquista b/isdb-t/br-ba-VitoriaDaConquista
index d446a284..dc9f8917 100644
--- a/isdb-t/br-ba-VitoriaDaConquista
+++ b/isdb-t/br-ba-VitoriaDaConquista
@@ -1,5 +1,5 @@
-# Channel table for Vitória Da Conquista - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/605
+# Channel table for Vit�ria Da Conquista - BA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=605
 
 # Physical channel 22 (virtual 10.1)
 [Record TV Cabrália]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV UESB]
+# Physical channel 33 (virtual 4.2)
+[TV UESB, Educa Bahia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 35.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 14.1)
-[Rede Vida]
+# Physical channel 43 (virtual 43.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -262,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
+# Physical channel 49 (virtual 19.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ba-Xique-xique b/isdb-t/br-ba-Xique-xique
index 84c0655b..cabe61ec 100644
--- a/isdb-t/br-ba-Xique-xique
+++ b/isdb-t/br-ba-Xique-xique
@@ -1,5 +1,5 @@
 # Channel table for Xique-xique - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/512
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=512
 
 # Physical channel 21 (virtual 7.1)
 [Record TV Itapoan]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 4.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 3.1)
 [TV Oeste]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ce-Acarape b/isdb-t/br-ce-Acarape
index 2929cb32..7f0beab2 100644
--- a/isdb-t/br-ce-Acarape
+++ b/isdb-t/br-ce-Acarape
@@ -1,5 +1,5 @@
 # Channel table for Acarape - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3106
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3106
 
 # Physical channel 18 (virtual 17.1)
 [TV União]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 2.1)
+[Rede TV! Fortaleza]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 5.1)
 [TV Ceará]
 	DELIVERY_SYSTEM = ISDBT
@@ -176,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -233,6 +262,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 2.2)
+[Universo EADTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 12.1)
 [TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ce-Acarau b/isdb-t/br-ce-Acarau
index 8d16976a..02f3b22d 100644
--- a/isdb-t/br-ce-Acarau
+++ b/isdb-t/br-ce-Acarau
@@ -1,8 +1,8 @@
-# Channel table for Acaraú - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/602
+# Channel table for Acara� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=602
 
 # Physical channel 27 (virtual 27.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
diff --git a/isdb-t/br-ce-Alcantaras b/isdb-t/br-ce-Alcantaras
index c0bbd087..f4fcca1e 100644
--- a/isdb-t/br-ce-Alcantaras
+++ b/isdb-t/br-ce-Alcantaras
@@ -1,8 +1,8 @@
-# Channel table for Alcântaras - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2547
+# Channel table for Alc�ntaras - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2547
 
 # Physical channel 39 (virtual 48.1)
-[NordesTV]
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-ce-AltoSanto b/isdb-t/br-ce-AltoSanto
new file mode 100644
index 00000000..4ec4ba33
--- /dev/null
+++ b/isdb-t/br-ce-AltoSanto
@@ -0,0 +1,32 @@
+# Channel table for Alto Santo - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4323
+
+# Physical channel 27 (virtual 8.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Aquiraz b/isdb-t/br-ce-Aquiraz
index c737b6a1..62eb0a73 100644
--- a/isdb-t/br-ce-Aquiraz
+++ b/isdb-t/br-ce-Aquiraz
@@ -1,5 +1,5 @@
 # Channel table for Aquiraz - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/653
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=653
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 27.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 5.1)
 [TV Ceará]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 61.4)
-[TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
+# Physical channel 30 (virtual 7.4)
+[TV Câmara, TV Fortaleza, TV Assembleia CE, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -320,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV! Fortaleza]
+# Physical channel 34 (virtual 2.2)
+[Rede TV! Fortaleza, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -465,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -495,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[TV O Povo]
+[Canal FDR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-ce-Aracati b/isdb-t/br-ce-Aracati
index 641f539b..64d6277d 100644
--- a/isdb-t/br-ce-Aracati
+++ b/isdb-t/br-ce-Aracati
@@ -1,5 +1,5 @@
 # Channel table for Aracati - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/393
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=393
 
 # Physical channel 14 (virtual 14.1)
 [TV Sinal]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 10.1)
+# Physical channel 34 (virtual 10.1)
 [TV Verdes Mares]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ce-Barbalha b/isdb-t/br-ce-Barbalha
index 0e568e10..3f8c8c7b 100644
--- a/isdb-t/br-ce-Barbalha
+++ b/isdb-t/br-ce-Barbalha
@@ -1,5 +1,34 @@
 # Channel table for Barbalha - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1650
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1650
+
+# Physical channel 21 (virtual 21.1)
+[Band Ceará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
 [TV Diário]
@@ -88,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 36.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 44 (virtual 5.1)
 [TV Ceará]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[Rede Vida]
+# Physical channel 45 (virtual 45.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ce-Barro b/isdb-t/br-ce-Barro
new file mode 100644
index 00000000..ca67e762
--- /dev/null
+++ b/isdb-t/br-ce-Barro
@@ -0,0 +1,32 @@
+# Channel table for Barro - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4259
+
+# Physical channel 25 (virtual 25.1)
+[TV Verdes Mares Cariri]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Beberibe b/isdb-t/br-ce-Beberibe
index 0ef01156..ac9f0dc7 100644
--- a/isdb-t/br-ce-Beberibe
+++ b/isdb-t/br-ce-Beberibe
@@ -1,8 +1,8 @@
 # Channel table for Beberibe - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1326
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1326
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 6.1)
-[TV Jangadeiro]
+# Physical channel 29 (virtual 5.1)
+[TV Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 5.1)
-[TV Ceará]
+# Physical channel 31 (virtual 31.1)
+[TV Assembleia CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 575142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.1)
-[TV Assembleia CE]
+# Physical channel 33 (virtual 10.1)
+[TV Verdes Mares]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 575142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 10.1)
-[TV Verdes Mares]
+# Physical channel 35 (virtual 12.1)
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ce-BelaCruz b/isdb-t/br-ce-BelaCruz
index c8d4ca13..f5f49c36 100644
--- a/isdb-t/br-ce-BelaCruz
+++ b/isdb-t/br-ce-BelaCruz
@@ -1,8 +1,8 @@
 # Channel table for Bela Cruz - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1651
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1651
 
 # Physical channel 27 (virtual 27.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
diff --git a/isdb-t/br-ce-BoaViagem b/isdb-t/br-ce-BoaViagem
index c509bac4..a65492fc 100644
--- a/isdb-t/br-ce-BoaViagem
+++ b/isdb-t/br-ce-BoaViagem
@@ -1,8 +1,8 @@
 # Channel table for Boa Viagem - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1327
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1327
 
 # Physical channel 27 (virtual 27.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
diff --git a/isdb-t/br-ce-BrejoSanto b/isdb-t/br-ce-BrejoSanto
new file mode 100644
index 00000000..bdbb85c7
--- /dev/null
+++ b/isdb-t/br-ce-BrejoSanto
@@ -0,0 +1,32 @@
+# Channel table for Brejo Santo - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1328
+
+# Physical channel 34 (virtual 34.1)
+[TV Verdes Mares Cariri]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Camocim b/isdb-t/br-ce-Camocim
index b92ee3b4..a8a35d44 100644
--- a/isdb-t/br-ce-Camocim
+++ b/isdb-t/br-ce-Camocim
@@ -1,5 +1,5 @@
 # Channel table for Camocim - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/545
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=545
 
 # Physical channel 33 (virtual 10.1)
 [TV Verdes Mares]
diff --git a/isdb-t/br-ce-Caninde b/isdb-t/br-ce-Caninde
index 241044b6..f6bf565a 100644
--- a/isdb-t/br-ce-Caninde
+++ b/isdb-t/br-ce-Caninde
@@ -1,8 +1,8 @@
-# Channel table for Canindé - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/588
+# Channel table for Canind� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=588
 
-# Physical channel 30 (virtual 30.1)
-[TV Cidade]
+# Physical channel 30 (virtual 8.1)
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -30,7 +30,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.1)
+# Physical channel 33 (virtual 33.1)
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 15.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ce-Carire b/isdb-t/br-ce-Carire
index e293019f..1d7147be 100644
--- a/isdb-t/br-ce-Carire
+++ b/isdb-t/br-ce-Carire
@@ -1,8 +1,8 @@
-# Channel table for Cariré - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3408
+# Channel table for Carir� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3408
 
 # Physical channel 39 (virtual 48.1)
-[NordesTV]
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-ce-Caririacu b/isdb-t/br-ce-Caririacu
index 4c1a7053..9c591634 100644
--- a/isdb-t/br-ce-Caririacu
+++ b/isdb-t/br-ce-Caririacu
@@ -1,5 +1,5 @@
-# Channel table for Caririaçu - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1330
+# Channel table for Cariria�u - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1330
 
 # Physical channel 22 (virtual 22.1)
 [TV Diário]
diff --git a/isdb-t/br-ce-Cascavel b/isdb-t/br-ce-Cascavel
index 99e2c818..c5844ef2 100644
--- a/isdb-t/br-ce-Cascavel
+++ b/isdb-t/br-ce-Cascavel
@@ -1,8 +1,8 @@
 # Channel table for Cascavel - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3587
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3587
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-ce-Caucaia b/isdb-t/br-ce-Caucaia
index fbf2a997..9ea993e4 100644
--- a/isdb-t/br-ce-Caucaia
+++ b/isdb-t/br-ce-Caucaia
@@ -1,8 +1,8 @@
 # Channel table for Caucaia - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3585
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3585
 
 # Physical channel 11 (virtual 11.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 201142857
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 16.1)
+# Physical channel 16 (virtual 16.2)
 [TV Metrópole]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 61.4)
-[TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
+# Physical channel 30 (virtual 7.4)
+[TV Câmara, TV Fortaleza, TV Assembleia CE, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV!]
+# Physical channel 34 (virtual 2.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -581,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -611,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[TV O Povo]
+[Canal FDR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-ce-Chorozinho b/isdb-t/br-ce-Chorozinho
index af60d970..066eda1e 100644
--- a/isdb-t/br-ce-Chorozinho
+++ b/isdb-t/br-ce-Chorozinho
@@ -1,5 +1,5 @@
 # Channel table for Chorozinho - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2088
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2088
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -204,32 +204,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 11.1)
-[TV da Gente]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-ce-Coreau(ubauna) b/isdb-t/br-ce-Coreau(ubauna)
new file mode 100644
index 00000000..5c58568a
--- /dev/null
+++ b/isdb-t/br-ce-Coreau(ubauna)
@@ -0,0 +1,32 @@
+# Channel table for Corea� (uba�na) - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3295
+
+# Physical channel 32 (virtual 32.1)
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Crateus b/isdb-t/br-ce-Crateus
index 11ce877f..e5189686 100644
--- a/isdb-t/br-ce-Crateus
+++ b/isdb-t/br-ce-Crateus
@@ -1,5 +1,5 @@
-# Channel table for Crateús - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/506
+# Channel table for Crate�s - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=506
 
 # Physical channel 16 (virtual 15.1)
 [Rede Vida]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 27.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
diff --git a/isdb-t/br-ce-Crato b/isdb-t/br-ce-Crato
index d9d409dd..06fac360 100644
--- a/isdb-t/br-ce-Crato
+++ b/isdb-t/br-ce-Crato
@@ -1,5 +1,5 @@
 # Channel table for Crato - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/85
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=85
 
 # Physical channel 15 (virtual 31.1)
 [Rede Vida]
@@ -30,6 +30,93 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 19.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 7.4)
+[TV Senado, TV Juazeiro do Norte, TV Assembleia CE, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[Band Ceará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 25 (virtual 25.1)
 [TV Diário]
 	DELIVERY_SYSTEM = ISDBT
@@ -118,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-ce-Eusebio b/isdb-t/br-ce-Eusebio
index c7193f5d..34c04f43 100644
--- a/isdb-t/br-ce-Eusebio
+++ b/isdb-t/br-ce-Eusebio
@@ -1,5 +1,5 @@
-# Channel table for Eusébio - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3584
+# Channel table for Eus�bio - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3584
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 27.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 5.1)
 [TV Ceará]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 61.4)
-[TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
+# Physical channel 30 (virtual 7.4)
+[TV Câmara, TV Fortaleza, TV Assembleia CE, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -320,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV! Fortaleza]
+# Physical channel 34 (virtual 2.2)
+[Rede TV! Fortaleza, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -436,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[TV O Povo]
+[Canal FDR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-ce-Forquilha b/isdb-t/br-ce-Forquilha
index f65edf87..1cf68bb3 100644
--- a/isdb-t/br-ce-Forquilha
+++ b/isdb-t/br-ce-Forquilha
@@ -1,5 +1,63 @@
 # Channel table for Forquilha - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2600
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2600
+
+# Physical channel 14 (virtual 8.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 22.1)
+[TV Diário]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 10.1)
 [TV Verdes Mares]
@@ -31,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 48.1)
-[NordesTV]
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -59,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 43.1)
+[TV Ceará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Fortaleza b/isdb-t/br-ce-Fortaleza
index 3c18ffa3..824d3af6 100644
--- a/isdb-t/br-ce-Fortaleza
+++ b/isdb-t/br-ce-Fortaleza
@@ -1,8 +1,8 @@
 # Channel table for Fortaleza - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/27
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=27
 
 # Physical channel 11 (virtual 11.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 201142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 30.4)
-[TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
+# Physical channel 30 (virtual 7.5)
+[TV Câmara, TV Fortaleza, TV Assembleia CE, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV! Fortaleza]
+# Physical channel 34 (virtual 2.2)
+[Rede TV! Fortaleza, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -581,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 9.1)
-[TV Capital]
+# Physical channel 41 (virtual 9.2)
+[TV Capital, Canal sem transmissão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -610,8 +610,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 42 (virtual 42.1)
+[TV Terra do Sol]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -640,7 +669,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[TV O Povo]
+[Canal FDR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-ce-Frecheirinha b/isdb-t/br-ce-Frecheirinha
new file mode 100644
index 00000000..8e8c4440
--- /dev/null
+++ b/isdb-t/br-ce-Frecheirinha
@@ -0,0 +1,32 @@
+# Channel table for Frecheirinha - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1335
+
+# Physical channel 32 (virtual 32.1)
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Groairas b/isdb-t/br-ce-Groairas
index 18f26703..1fde23e1 100644
--- a/isdb-t/br-ce-Groairas
+++ b/isdb-t/br-ce-Groairas
@@ -1,5 +1,63 @@
-# Channel table for Groaíras - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3445
+# Channel table for Groa�ras - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3445
+
+# Physical channel 14 (virtual 8.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 22.1)
+[TV Diário]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 10.1)
 [TV Verdes Mares]
@@ -31,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 48.1)
-[NordesTV]
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -59,3 +117,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 43.1)
+[TV Ceará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Guaiuba b/isdb-t/br-ce-Guaiuba
index f3910687..39b296ae 100644
--- a/isdb-t/br-ce-Guaiuba
+++ b/isdb-t/br-ce-Guaiuba
@@ -1,5 +1,5 @@
-# Channel table for Guaiúba - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3589
+# Channel table for Guai�ba - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3589
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 61.4)
-[TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
+# Physical channel 30 (virtual 7.4)
+[TV Câmara, TV Fortaleza, TV Assembleia CE, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV!]
+# Physical channel 34 (virtual 2.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ce-Horizonte b/isdb-t/br-ce-Horizonte
index 0e0e417a..757b707f 100644
--- a/isdb-t/br-ce-Horizonte
+++ b/isdb-t/br-ce-Horizonte
@@ -1,5 +1,5 @@
 # Channel table for Horizonte - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/674
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=674
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[TV Ceará]
+# Physical channel 25 (virtual 25.1)
+[TV da Gente]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 29.1)
-[TV Canção Nova]
+# Physical channel 27 (virtual 27.1)
+[TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.1)
-[TV Assembleia CE]
+# Physical channel 28 (virtual 5.1)
+[TV Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 575142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 8.1)
-[TV Cidade]
+# Physical channel 29 (virtual 29.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 10.1)
-[TV Verdes Mares]
+# Physical channel 31 (virtual 31.1)
+[TV Assembleia CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 575142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV!]
+# Physical channel 32 (virtual 8.1)
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 12.1)
-[TV Jangadeiro]
+# Physical channel 33 (virtual 10.1)
+[TV Verdes Mares]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 38.1)
-[TV Aparecida]
+# Physical channel 34 (virtual 2.2)
+[Rede TV! Fortaleza, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -378,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 9.1)
-[TV Capital]
+# Physical channel 35 (virtual 12.1)
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -407,11 +407,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 11.1)
-[TV da Gente]
+# Physical channel 38 (virtual 38.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 9.1)
+[TV Capital]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -436,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[TV O Povo]
+[Canal FDR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-ce-Ibiapina b/isdb-t/br-ce-Ibiapina
new file mode 100644
index 00000000..981669ee
--- /dev/null
+++ b/isdb-t/br-ce-Ibiapina
@@ -0,0 +1,32 @@
+# Channel table for Ibiapina - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1778
+
+# Physical channel 32 (virtual 32.1)
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Ico b/isdb-t/br-ce-Ico
index ab63d300..f353b39a 100644
--- a/isdb-t/br-ce-Ico
+++ b/isdb-t/br-ce-Ico
@@ -1,5 +1,5 @@
-# Channel table for Icó - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/548
+# Channel table for Ic� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=548
 
 # Physical channel 33 (virtual 9.1)
 [TV Verdes Mares Cariri]
diff --git a/isdb-t/br-ce-Iguatu b/isdb-t/br-ce-Iguatu
index bbc25d31..d2ac4a25 100644
--- a/isdb-t/br-ce-Iguatu
+++ b/isdb-t/br-ce-Iguatu
@@ -1,5 +1,34 @@
 # Channel table for Iguatu - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/314
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=314
+
+# Physical channel 26 (virtual 26.1)
+[TV Diário]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 9.1)
 [TV Verdes Mares Cariri]
diff --git a/isdb-t/br-ce-Itaitinga b/isdb-t/br-ce-Itaitinga
index 7bc9064a..d50f4f19 100644
--- a/isdb-t/br-ce-Itaitinga
+++ b/isdb-t/br-ce-Itaitinga
@@ -1,5 +1,5 @@
 # Channel table for Itaitinga - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3351
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3351
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 22.1)
-[TV União]
+[TV Diário]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -175,6 +175,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 25.1)
+[TV da Gente]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 27.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 5.1)
 [TV Ceará]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 61.4)
-[TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
+# Physical channel 30 (virtual 7.4)
+[TV Câmara, TV Fortaleza, TV Assembleia CE, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -292,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -349,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV!]
+# Physical channel 34 (virtual 2.2)
+[Rede TV! Fortaleza, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -437,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -494,37 +552,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 11.1)
-[TV da Gente]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -553,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 47.1)
-[TV O Povo]
+[Canal FDR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-ce-Itapaje b/isdb-t/br-ce-Itapaje
index cf714ec4..b0cab46e 100644
--- a/isdb-t/br-ce-Itapaje
+++ b/isdb-t/br-ce-Itapaje
@@ -1,8 +1,8 @@
-# Channel table for Itapajé - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1336
+# Channel table for Itapaj� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1336
 
-# Physical channel 26 (virtual 26.1)
-[TV Cidade]
+# Physical channel 26 (virtual 8.1)
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
diff --git a/isdb-t/br-ce-Itapipoca b/isdb-t/br-ce-Itapipoca
index de347ce5..9be504e2 100644
--- a/isdb-t/br-ce-Itapipoca
+++ b/isdb-t/br-ce-Itapipoca
@@ -1,8 +1,8 @@
 # Channel table for Itapipoca - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/547
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=547
 
-# Physical channel 17 (virtual 35.1)
-[Rede Vida]
+# Physical channel 17 (virtual 35.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
diff --git a/isdb-t/br-ce-JuazeiroDoNorte b/isdb-t/br-ce-JuazeiroDoNorte
index 41267d47..23710fe1 100644
--- a/isdb-t/br-ce-JuazeiroDoNorte
+++ b/isdb-t/br-ce-JuazeiroDoNorte
@@ -1,11 +1,11 @@
 # Channel table for Juazeiro Do Norte - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1404
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1404
 
-# Physical channel 25 (virtual 25.1)
-[TV Diário]
+# Physical channel 19 (virtual 19.1)
+[TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 503142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 9.1)
-[TV Verdes Mares Cariri]
+# Physical channel 20 (virtual 7.4)
+[TV Senado, TV Juazeiro do Norte, TV Assembleia CE, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 12.1)
-[TV Jangadeiro]
+# Physical channel 21 (virtual 21.1)
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[TV Cidade]
+# Physical channel 25 (virtual 25.1)
+[TV Diário]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,69 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.1)
-[TV Evangelizar]
+# Physical channel 33 (virtual 9.1)
+[TV Verdes Mares Cariri]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 12.1)
+[TV Jangadeiro]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 36.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 2.1)
-[TV Canção Nova]
+# Physical channel 39 (virtual 39.1)
+[TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[Rede Vida]
+# Physical channel 45 (virtual 45.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ce-LimoeiroDoNorte b/isdb-t/br-ce-LimoeiroDoNorte
index fd9a38ca..4b111529 100644
--- a/isdb-t/br-ce-LimoeiroDoNorte
+++ b/isdb-t/br-ce-LimoeiroDoNorte
@@ -1,5 +1,5 @@
 # Channel table for Limoeiro Do Norte - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/505
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=505
 
 # Physical channel 17 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-ce-Maracanau b/isdb-t/br-ce-Maracanau
index 0e72363f..4d35c0ee 100644
--- a/isdb-t/br-ce-Maracanau
+++ b/isdb-t/br-ce-Maracanau
@@ -1,5 +1,5 @@
-# Channel table for Maracanaú - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2623
+# Channel table for Maracana� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2623
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 61.4)
-[TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
+# Physical channel 30 (virtual 7.4)
+[TV Câmara, TV Fortaleza, TV Assembleia CE, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV!]
+# Physical channel 34 (virtual 2.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -466,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -523,8 +523,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -553,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[TV O Povo]
+[Canal FDR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-ce-Maranguape(itapebussu) b/isdb-t/br-ce-Maranguape(itapebussu)
index 756edc41..9e4b51fa 100644
--- a/isdb-t/br-ce-Maranguape(itapebussu)
+++ b/isdb-t/br-ce-Maranguape(itapebussu)
@@ -1,5 +1,5 @@
 # Channel table for Maranguape (itapebussu) - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3230
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3230
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 61.4)
-[TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
+# Physical channel 30 (virtual 7.4)
+[TV Câmara, TV Fortaleza, TV Assembleia CE, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV! Fortaleza]
+# Physical channel 34 (virtual 2.2)
+[Rede TV! Fortaleza, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ce-Massape b/isdb-t/br-ce-Massape
index ac0c803f..6d48f74c 100644
--- a/isdb-t/br-ce-Massape
+++ b/isdb-t/br-ce-Massape
@@ -1,8 +1,95 @@
-# Channel table for Massapê - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1019
+# Channel table for Massap� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1019
+
+# Physical channel 14 (virtual 8.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 22.1)
+[TV Diário]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 10.1)
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 48.1)
-[NordesTV]
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -30,3 +117,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 43.1)
+[TV Ceará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Meruoca b/isdb-t/br-ce-Meruoca
index bf9c8ff5..920ba12e 100644
--- a/isdb-t/br-ce-Meruoca
+++ b/isdb-t/br-ce-Meruoca
@@ -1,5 +1,5 @@
 # Channel table for Meruoca - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2548
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2548
 
 # Physical channel 34 (virtual 10.1)
 [TV Verdes Mares]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 48.1)
-[NordesTV]
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-ce-MissaoVelha b/isdb-t/br-ce-MissaoVelha
index 546648c3..6af2aab9 100644
--- a/isdb-t/br-ce-MissaoVelha
+++ b/isdb-t/br-ce-MissaoVelha
@@ -1,5 +1,34 @@
-# Channel table for Missão Velha - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1655
+# Channel table for Miss�o Velha - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1655
+
+# Physical channel 21 (virtual 21.1)
+[Band Ceará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
 [TV Diário]
@@ -88,8 +117,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[Rede Vida]
+# Physical channel 36 (virtual 36.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 5.1)
+[TV Ceará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -117,3 +204,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 13.1)
+[TV Verde Vale]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-MoradaNova b/isdb-t/br-ce-MoradaNova
new file mode 100644
index 00000000..a52c39b9
--- /dev/null
+++ b/isdb-t/br-ce-MoradaNova
@@ -0,0 +1,32 @@
+# Channel table for Morada Nova - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1331
+
+# Physical channel 34 (virtual 5.1)
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Mucambo b/isdb-t/br-ce-Mucambo
new file mode 100644
index 00000000..78292911
--- /dev/null
+++ b/isdb-t/br-ce-Mucambo
@@ -0,0 +1,32 @@
+# Channel table for Mucambo - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3211
+
+# Physical channel 32 (virtual 32.1)
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Pacajus b/isdb-t/br-ce-Pacajus
index 27105c01..a3b9f750 100644
--- a/isdb-t/br-ce-Pacajus
+++ b/isdb-t/br-ce-Pacajus
@@ -1,5 +1,5 @@
 # Channel table for Pacajus - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/375
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=375
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -175,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 25.1)
+[TV da Gente]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 27 (virtual 27.1)
 [TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
@@ -262,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 61.4)
-[TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
+# Physical channel 30 (virtual 7.4)
+[TV Câmara, TV Fortaleza, TV Assembleia CE, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -321,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -378,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV! Fortaleza]
+# Physical channel 34 (virtual 2.2)
+[Rede TV! Fortaleza, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -494,37 +523,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 11.1)
-[TV da Gente]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -553,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[TV O Povo]
+[Canal FDR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-ce-Pacatuba b/isdb-t/br-ce-Pacatuba
index 3a0b5bce..ebfc0648 100644
--- a/isdb-t/br-ce-Pacatuba
+++ b/isdb-t/br-ce-Pacatuba
@@ -1,5 +1,5 @@
 # Channel table for Pacatuba - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3586
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3586
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 25.1)
+[TV da Gente]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 5.1)
 [TV Ceará]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 61.4)
-[TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
+# Physical channel 30 (virtual 7.4)
+[TV Câmara, TV Fortaleza, TV Assembleia CE, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 9.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -320,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV!]
+# Physical channel 34 (virtual 2.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -465,37 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 11.1)
-[TV da Gente]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[TV O Povo]
+[Canal FDR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -581,7 +581,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 50;1)
+# Physical channel 51 (virtual 50.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ce-Pacoti b/isdb-t/br-ce-Pacoti
new file mode 100644
index 00000000..9c03a79b
--- /dev/null
+++ b/isdb-t/br-ce-Pacoti
@@ -0,0 +1,32 @@
+# Channel table for Pacoti - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4260
+
+# Physical channel 41 (virtual 41.1)
+[TV Diário]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Paracuru b/isdb-t/br-ce-Paracuru
index 4b38c797..8551452c 100644
--- a/isdb-t/br-ce-Paracuru
+++ b/isdb-t/br-ce-Paracuru
@@ -1,5 +1,5 @@
 # Channel table for Paracuru - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1656
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1656
 
 # Physical channel 26 (virtual 26.1)
 [TV Verdes Mares]
diff --git a/isdb-t/br-ce-Paraipaba b/isdb-t/br-ce-Paraipaba
new file mode 100644
index 00000000..de78f75a
--- /dev/null
+++ b/isdb-t/br-ce-Paraipaba
@@ -0,0 +1,235 @@
+# Channel table for Paraipaba - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4312
+
+# Physical channel 15 (virtual 14.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 17.1)
+[TV União]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 20.1)
+[Band Ceará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 22.1)
+[TV Diário]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 26.1)
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 2.2)
+[Rede TV! Fortaleza, Universo EADTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 12.1)
+[TV Jangadeiro]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Pindoretama b/isdb-t/br-ce-Pindoretama
index 3fb0a007..25cfd88e 100644
--- a/isdb-t/br-ce-Pindoretama
+++ b/isdb-t/br-ce-Pindoretama
@@ -1,5 +1,5 @@
 # Channel table for Pindoretama - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3588
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3588
 
 # Physical channel 15 (virtual 14.1)
 [Record News]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -175,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 61.4)
+# Physical channel 30 (virtual 7.4)
 [TV Câmara, TV Senado, TV Assembleia CE, TV Fortaleza]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.1)
-[Rede TV!]
+# Physical channel 34 (virtual 2.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ce-Quixada b/isdb-t/br-ce-Quixada
index 87715d0d..62614d4f 100644
--- a/isdb-t/br-ce-Quixada
+++ b/isdb-t/br-ce-Quixada
@@ -1,8 +1,8 @@
-# Channel table for Quixadá - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1332
+# Channel table for Quixad� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1332
 
-# Physical channel 16 (virtual 19.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
diff --git a/isdb-t/br-ce-Quixeramobim b/isdb-t/br-ce-Quixeramobim
index d92187d4..a10ea3f1 100644
--- a/isdb-t/br-ce-Quixeramobim
+++ b/isdb-t/br-ce-Quixeramobim
@@ -1,5 +1,34 @@
 # Channel table for Quixeramobim - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/546
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=546
+
+# Physical channel 32 (virtual 32.1)
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 22.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-ce-Russas b/isdb-t/br-ce-Russas
index c8bb2ee2..0dd848d0 100644
--- a/isdb-t/br-ce-Russas
+++ b/isdb-t/br-ce-Russas
@@ -1,11 +1,11 @@
 # Channel table for Russas - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1646
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1646
 
-# Physical channel 17 (virtual 15.1)
-[Rede Vida]
+# Physical channel 20
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
+# Physical channel 25 (virtual 25.1)
 [TV Verdes Mares]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ce-SantanaDoAcarau b/isdb-t/br-ce-SantanaDoAcarau
index 388c1df9..5bedcef8 100644
--- a/isdb-t/br-ce-SantanaDoAcarau
+++ b/isdb-t/br-ce-SantanaDoAcarau
@@ -1,8 +1,37 @@
-# Channel table for Santana Do Acaraú - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2549
+# Channel table for Santana Do Acara� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2549
 
-# Physical channel 17 (virtual 17.1)
-[Rede Vida]
+# Physical channel 14 (virtual 8.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -30,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 22.1)
+[TV Diário]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 33 (virtual 33.1)
 [TV Verdes Mares]
 	DELIVERY_SYSTEM = ISDBT
@@ -60,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 48.1)
-[NordesTV]
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -88,3 +146,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 43.1)
+[TV Ceará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-SantanaDoCariri b/isdb-t/br-ce-SantanaDoCariri
new file mode 100644
index 00000000..fd6fe8ea
--- /dev/null
+++ b/isdb-t/br-ce-SantanaDoCariri
@@ -0,0 +1,32 @@
+# Channel table for Santana Do Cariri - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4258
+
+# Physical channel 34 (virtual 34.1)
+[TV Verdes Mares Cariri]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-SaoGoncaloDoAmarante b/isdb-t/br-ce-SaoGoncaloDoAmarante
index 65bf35e1..3545abba 100644
--- a/isdb-t/br-ce-SaoGoncaloDoAmarante
+++ b/isdb-t/br-ce-SaoGoncaloDoAmarante
@@ -1,5 +1,5 @@
-# Channel table for São Gonçalo Do Amarante - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3215
+# Channel table for S�o Gon�alo Do Amarante - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3215
 
 # Physical channel 18 (virtual 17.1)
 [TV União]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 20.1)
-[NordesTV]
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[Rede Vida]
+# Physical channel 45 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ce-SenadorPompeu b/isdb-t/br-ce-SenadorPompeu
new file mode 100644
index 00000000..e01530cf
--- /dev/null
+++ b/isdb-t/br-ce-SenadorPompeu
@@ -0,0 +1,32 @@
+# Channel table for Senador Pompeu - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4335
+
+# Physical channel 27 (virtual 8.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Sobral b/isdb-t/br-ce-Sobral
index 64314646..6435351a 100644
--- a/isdb-t/br-ce-Sobral
+++ b/isdb-t/br-ce-Sobral
@@ -1,8 +1,8 @@
 # Channel table for Sobral - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/253
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=253
 
-# Physical channel 14 (virtual 14.1)
-[TV Cidade]
+# Physical channel 14 (virtual 8.1)
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 17.1)
-[Rede Vida]
+# Physical channel 17 (virtual 17.3)
+[Rede Vida, Canal sem transmissão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
+# Physical channel 24 (virtual 22.1)
 [TV Diário]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,37 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 12.1)
-[TV Jangadeiro]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 39 (virtual 48.1)
-[NordesTV]
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-ce-Taua b/isdb-t/br-ce-Taua
new file mode 100644
index 00000000..99e3f24e
--- /dev/null
+++ b/isdb-t/br-ce-Taua
@@ -0,0 +1,32 @@
+# Channel table for Tau� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1647
+
+# Physical channel 40 (virtual 40.1)
+[TV Sinal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Tiangua b/isdb-t/br-ce-Tiangua
index 2292aaae..fd814dfd 100644
--- a/isdb-t/br-ce-Tiangua
+++ b/isdb-t/br-ce-Tiangua
@@ -1,8 +1,8 @@
-# Channel table for Tianguá - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/603
+# Channel table for Tiangu� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=603
 
-# Physical channel 16 (virtual 19.1)
-[Rede Vida]
+# Physical channel 16 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 26.1)
-[TV Cidade]
+[TV Cidade/CE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
diff --git a/isdb-t/br-ce-Trairi b/isdb-t/br-ce-Trairi
new file mode 100644
index 00000000..2e50e94f
--- /dev/null
+++ b/isdb-t/br-ce-Trairi
@@ -0,0 +1,90 @@
+# Channel table for Trairi - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=988
+
+# Physical channel 18
+[TV Diário]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51
+[TV Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 7
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 177142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ce-Ubajara b/isdb-t/br-ce-Ubajara
index dcfa97e1..da0c852e 100644
--- a/isdb-t/br-ce-Ubajara
+++ b/isdb-t/br-ce-Ubajara
@@ -1,11 +1,69 @@
 # Channel table for Ubajara - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1649
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1649
 
-# Physical channel 34 (virtual 10.1)
+# Physical channel 18
+[TV Meio Norte]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 26.1)
+[TV Cidade/CE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
 [TV Verdes Mares]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ce-Varjota b/isdb-t/br-ce-Varjota
index 8dbad5ba..94c57489 100644
--- a/isdb-t/br-ce-Varjota
+++ b/isdb-t/br-ce-Varjota
@@ -1,8 +1,8 @@
 # Channel table for Varjota - CE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2599
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2599
 
 # Physical channel 39 (virtual 48.1)
-[NordesTV]
+[TV Jangadeiro]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-ce-VicosaDoCeara b/isdb-t/br-ce-VicosaDoCeara
new file mode 100644
index 00000000..32d06a30
--- /dev/null
+++ b/isdb-t/br-ce-VicosaDoCeara
@@ -0,0 +1,61 @@
+# Channel table for Vi�osa Do Cear� - CE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1319
+
+# Physical channel 16 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Verdes Mares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-df-Brasilia b/isdb-t/br-df-Brasilia
index 75a50f13..8cb6ecfc 100644
--- a/isdb-t/br-df-Brasilia
+++ b/isdb-t/br-df-Brasilia
@@ -1,8 +1,8 @@
-# Channel table for Brasília - DF - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/28
+# Channel table for Bras�lia - DF - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=28
 
 # Physical channel 14 (virtual 14.1)
-[Top TV]
+[MCI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 22.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -349,8 +349,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 35.1)
-[Rede Vida]
+# Physical channel 33 (virtual 33.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 35.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -379,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 13.1)
-[Rede Brasil]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Metropolitana]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -436,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 54.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 38 (virtual 38.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -581,7 +610,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
+# Physical channel 45 (virtual 42.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -668,7 +697,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 27.4)
+# Physical channel 49 (virtual 9.4)
 [TV Câmara, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -697,7 +726,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 51.4)
+# Physical channel 50 (virtual 7.4)
 [TV Senado, TV Senado 2, TV Senado 3, TV Senado 4]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -727,7 +756,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 11.1)
-[TV União]
+[TV União Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-df-Brasilia(brazlandia) b/isdb-t/br-df-Brasilia(brazlandia)
index e2a7769c..a27e82d7 100644
--- a/isdb-t/br-df-Brasilia(brazlandia)
+++ b/isdb-t/br-df-Brasilia(brazlandia)
@@ -1,5 +1,5 @@
-# Channel table for Brasília (brazlândia) - DF - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3488
+# Channel table for Bras�lia (brazl�ndia) - DF - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3488
 
 # Physical channel 16 (virtual 22.1)
 [TV Anhanguera Luziânia]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 13.1)
-[Rede Brasil]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 54.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-df-Brasilia(ceilandia) b/isdb-t/br-df-Brasilia(ceilandia)
index 35d4d216..c6c17bd2 100644
--- a/isdb-t/br-df-Brasilia(ceilandia)
+++ b/isdb-t/br-df-Brasilia(ceilandia)
@@ -1,5 +1,34 @@
-# Channel table for Brasília (ceilândia) - DF - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1800
+# Channel table for Bras�lia (ceil�ndia) - DF - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1800
+
+# Physical channel 14 (virtual 14.1)
+[MCI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 2.4)
 [TV Brasil, TV Brasil 2, TV Escola, Canal Saúde]
@@ -30,8 +59,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 18 (virtual 19.1)
+[CNT Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 19 (virtual 22.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -60,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -233,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 32.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 15.1)
 [Fonte TV]
 	DELIVERY_SYSTEM = ISDBT
@@ -262,8 +349,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 35.1)
-[Rede Vida]
+# Physical channel 33 (virtual 33.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 35.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -291,8 +407,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 35 (virtual 13.1)
+[RBTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 36.1)
-[TV Metropolitana]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -320,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 54.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 38 (virtual 38.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -349,6 +494,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 17.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 40 (virtual 40.1)
 [CBI]
 	DELIVERY_SYSTEM = ISDBT
@@ -378,6 +552,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 55.1)
+[TV Apoio]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 43 (virtual 43.1)
 [Rede Gospel]
 	DELIVERY_SYSTEM = ISDBT
@@ -407,6 +610,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 48.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 53.2)
 [TV Justiça, Ponto Jus]
 	DELIVERY_SYSTEM = ISDBT
@@ -436,7 +668,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 27.4)
+# Physical channel 49 (virtual 9.4)
 [TV Câmara, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -465,7 +697,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 51.4)
+# Physical channel 50 (virtual 7.4)
 [TV Senado, TV Senado 2, TV Senado 3, TV Senado 4]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -495,7 +727,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 11.1)
-[TV União]
+[TV União Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-df-Brasilia(gama) b/isdb-t/br-df-Brasilia(gama)
index 4c3a5ad0..92c23517 100644
--- a/isdb-t/br-df-Brasilia(gama)
+++ b/isdb-t/br-df-Brasilia(gama)
@@ -1,8 +1,8 @@
-# Channel table for Brasília (gama) - DF - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/53
+# Channel table for Bras�lia (gama) - DF - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=53
 
-# Physical channel 14 (virtual 2.2)
-[TV Brasil, TV Brasil 2]
+# Physical channel 14 (virtual 2.4)
+[TV Brasil, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 49.1)
-[Rede Vida]
+# Physical channel 34 (virtual 49.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -378,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 51.4)
+# Physical channel 50 (virtual 7.4)
 [TV Senado, TV Senado 2, TV Senado 3, TV Senado 4]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-df-Brasilia(planaltina) b/isdb-t/br-df-Brasilia(planaltina)
index 712de92e..fc1880c3 100644
--- a/isdb-t/br-df-Brasilia(planaltina)
+++ b/isdb-t/br-df-Brasilia(planaltina)
@@ -1,8 +1,8 @@
-# Channel table for Brasília (planaltina) - DF - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3475
+# Channel table for Bras�lia (planaltina) - DF - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3475
 
 # Physical channel 14 (virtual 14.1)
-[Top TV]
+[MCI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 22.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[TV Metropolitana]
+# Physical channel 35 (virtual 13.1)
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 27.4)
+# Physical channel 49 (virtual 9.4)
 [TV Câmara, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -349,7 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 51.4)
+# Physical channel 50 (virtual 7.4)
 [TV Senado, TV Senado 2, TV Senado 3, TV Senado 4]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-df-Brasilia(samambaia) b/isdb-t/br-df-Brasilia(samambaia)
index 7c1836ee..b904b369 100644
--- a/isdb-t/br-df-Brasilia(samambaia)
+++ b/isdb-t/br-df-Brasilia(samambaia)
@@ -1,8 +1,8 @@
-# Channel table for Brasília (samambaia) - DF - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3487
+# Channel table for Bras�lia (samambaia) - DF - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3487
 
 # Physical channel 14 (virtual 14.1)
-[Top TV]
+[MCI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 22.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -291,8 +291,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 35.1)
-[Rede Vida]
+# Physical channel 33 (virtual 33.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 35.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -320,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[TV Metropolitana]
+# Physical channel 35 (virtual 13.1)
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 54.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 38 (virtual 38.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -465,7 +494,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 27.4)
+# Physical channel 49 (virtual 9.4)
 [TV Câmara, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -495,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 11.1)
-[TV União]
+[TV União Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-df-Brasilia(sobradinho) b/isdb-t/br-df-Brasilia(sobradinho)
index a94ec0eb..7a33cca7 100644
--- a/isdb-t/br-df-Brasilia(sobradinho)
+++ b/isdb-t/br-df-Brasilia(sobradinho)
@@ -1,8 +1,8 @@
-# Channel table for Brasília (sobradinho) - DF - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1970
+# Channel table for Bras�lia (sobradinho) - DF - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1970
 
 # Physical channel 14 (virtual 14.1)
-[Top TV]
+[MCI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 22.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -262,8 +262,124 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 30.1)
+[Rede Gênesis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 33.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 35.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 13.1)
+[RBTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 36.1)
-[TV Metropolitana]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -291,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 54.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 38 (virtual 38.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -320,6 +436,151 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 17.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 40.1)
+[CBI]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 55.1)
+[TV Apoio]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 43.1)
+[Rede Gospel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 48.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 53.2)
 [TV Justiça, Ponto Jus]
 	DELIVERY_SYSTEM = ISDBT
@@ -349,7 +610,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 27.4)
+# Physical channel 49 (virtual 9.4)
 [TV Câmara, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -378,7 +639,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 51.4)
+# Physical channel 50 (virtual 7.4)
 [TV Senado, TV Senado 2, TV Senado 3, TV Senado 4]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -408,7 +669,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 11.1)
-[TV União]
+[TV União Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-df-Brasilia(taguatinga) b/isdb-t/br-df-Brasilia(taguatinga)
index c437d010..d6f16723 100644
--- a/isdb-t/br-df-Brasilia(taguatinga)
+++ b/isdb-t/br-df-Brasilia(taguatinga)
@@ -1,8 +1,8 @@
-# Channel table for Brasília (taguatinga) - DF - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3469
+# Channel table for Bras�lia (taguatinga) - DF - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3469
 
 # Physical channel 14 (virtual 14.1)
-[Top TV]
+[MCI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 22.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -349,8 +349,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 35.1)
-[Rede Vida]
+# Physical channel 33 (virtual 33.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 35.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -379,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 13.1)
-[Rede Brasil]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Metropolitana]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -436,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 54.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 38 (virtual 38.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -639,7 +668,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 27.4)
+# Physical channel 49 (virtual 9.4)
 [TV Câmara, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -668,7 +697,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 51.4)
+# Physical channel 50 (virtual 7.4)
 [TV Senado, TV Senado 2, TV Senado 3, TV Senado 4]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -698,7 +727,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 11.1)
-[TV União]
+[TV União Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-es-Alegre b/isdb-t/br-es-Alegre
new file mode 100644
index 00000000..fe2f88c1
--- /dev/null
+++ b/isdb-t/br-es-Alegre
@@ -0,0 +1,61 @@
+# Channel table for Alegre - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2605
+
+# Physical channel 31 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-AlfredoChaves b/isdb-t/br-es-AlfredoChaves
index 7e9202a0..66898ab7 100644
--- a/isdb-t/br-es-AlfredoChaves
+++ b/isdb-t/br-es-AlfredoChaves
@@ -1,5 +1,5 @@
 # Channel table for Alfredo Chaves - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1409
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1409
 
 # Physical channel 22 (virtual 4.1)
 [TV Gazeta Vitória]
diff --git a/isdb-t/br-es-Anchieta b/isdb-t/br-es-Anchieta
index 8f8bc90d..fce846ea 100644
--- a/isdb-t/br-es-Anchieta
+++ b/isdb-t/br-es-Anchieta
@@ -1,5 +1,5 @@
 # Channel table for Anchieta - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2539
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2539
 
 # Physical channel 21 (virtual 10.1)
 [TV Gazeta Sul]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 32.1)
-[Record News ES]
+# Physical channel 38 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-es-Aracruz b/isdb-t/br-es-Aracruz
index 6090a14b..3fae95f0 100644
--- a/isdb-t/br-es-Aracruz
+++ b/isdb-t/br-es-Aracruz
@@ -1,5 +1,5 @@
 # Channel table for Aracruz - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/639
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=639
 
 # Physical channel 23 (virtual 5.1)
 [TV Gazeta Norte]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 33.1)
-[Record News ES]
+# Physical channel 33 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-AtilioVivacqua b/isdb-t/br-es-AtilioVivacqua
new file mode 100644
index 00000000..55ac47d5
--- /dev/null
+++ b/isdb-t/br-es-AtilioVivacqua
@@ -0,0 +1,32 @@
+# Channel table for At�lio Vivacqua - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4334
+
+# Physical channel 43 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-BaixoGuandu b/isdb-t/br-es-BaixoGuandu
new file mode 100644
index 00000000..b46835bd
--- /dev/null
+++ b/isdb-t/br-es-BaixoGuandu
@@ -0,0 +1,32 @@
+# Channel table for Baixo Guandu - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3337
+
+# Physical channel 27 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-BarraDeSaoFrancisco b/isdb-t/br-es-BarraDeSaoFrancisco
index 3b4b2572..98db6f74 100644
--- a/isdb-t/br-es-BarraDeSaoFrancisco
+++ b/isdb-t/br-es-BarraDeSaoFrancisco
@@ -1,5 +1,5 @@
-# Channel table for Barra De São Francisco - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2135
+# Channel table for Barra De S�o Francisco - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2135
 
 # Physical channel 22 (virtual 24.1)
 [TV Gazeta Noroeste]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-CachoeiroDeItapemirim b/isdb-t/br-es-CachoeiroDeItapemirim
index c350e6c3..a9fc5755 100644
--- a/isdb-t/br-es-CachoeiroDeItapemirim
+++ b/isdb-t/br-es-CachoeiroDeItapemirim
@@ -1,5 +1,5 @@
 # Channel table for Cachoeiro De Itapemirim - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/239
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=239
 
 # Physical channel 18 (virtual 13.1)
 [Rede Brasil ES]
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 4.1)
-[Record News ES]
+# Physical channel 32 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-es-Cariacica b/isdb-t/br-es-Cariacica
index 1089a470..a6c9ca9c 100644
--- a/isdb-t/br-es-Cariacica
+++ b/isdb-t/br-es-Cariacica
@@ -1,5 +1,5 @@
 # Channel table for Cariacica - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3593
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3593
 
 # Physical channel 16 (virtual 10.1)
 [TV Capixaba]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 19.4)
-[TV Câmara, TV ALES, TV Senado, TV Câmara Municipal]
+# Physical channel 19 (virtual 3.4)
+[TV Câmara, TV Assembleia ES, TV Câmara Municipal, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 2.1)
-[TV Educativa ES]
+# Physical channel 20 (virtual 2.2)
+[TV Educativa ES, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -204,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 28.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 31 (virtual 31.1)
 [TV UVV]
 	DELIVERY_SYSTEM = ISDBT
@@ -262,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 36.1)
-[Rede Vida]
+# Physical channel 35 (virtual 36.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -320,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 8.1)
-[TV R Gallo]
+# Physical channel 40 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -350,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 47.1)
-[TV Novo Tempo]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-es-Castelo b/isdb-t/br-es-Castelo
index 0bc692a0..2bc2eb98 100644
--- a/isdb-t/br-es-Castelo
+++ b/isdb-t/br-es-Castelo
@@ -1,5 +1,5 @@
 # Channel table for Castelo - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1388
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1388
 
 # Physical channel 21 (virtual 10.1)
 [TV Gazeta Sul]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 28 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-Colatina b/isdb-t/br-es-Colatina
index 0fdb653d..8a9595fd 100644
--- a/isdb-t/br-es-Colatina
+++ b/isdb-t/br-es-Colatina
@@ -1,5 +1,5 @@
 # Channel table for Colatina - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/258
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=258
 
 # Physical channel 24 (virtual 9.1)
 [TV Gazeta Noroeste]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.1)
-[Record News ES]
+# Physical channel 27 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -59,8 +59,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 36.1)
-[Rede Vida]
+# Physical channel 32 (virtual 16.1)
+[TV Sim Colatina]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 36.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -117,3 +146,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-ConceicaoDaBarra b/isdb-t/br-es-ConceicaoDaBarra
index 15437b64..6b6ff057 100644
--- a/isdb-t/br-es-ConceicaoDaBarra
+++ b/isdb-t/br-es-ConceicaoDaBarra
@@ -1,5 +1,5 @@
-# Channel table for Conceição Da Barra - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2893
+# Channel table for Concei��o Da Barra - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2893
 
 # Physical channel 23 (virtual 5.1)
 [TV Gazeta Norte]
@@ -30,3 +30,90 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 12.1)
+[TV Sim São Mateus]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-DomingosMartins b/isdb-t/br-es-DomingosMartins
index 1689be5c..0fe0dd8b 100644
--- a/isdb-t/br-es-DomingosMartins
+++ b/isdb-t/br-es-DomingosMartins
@@ -1,5 +1,5 @@
 # Channel table for Domingos Martins - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3292
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3292
 
 # Physical channel 22 (virtual 4.1)
 [TV Gazeta Vitória]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-Ecoporanga b/isdb-t/br-es-Ecoporanga
new file mode 100644
index 00000000..05eeed89
--- /dev/null
+++ b/isdb-t/br-es-Ecoporanga
@@ -0,0 +1,32 @@
+# Channel table for Ecoporanga - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4150
+
+# Physical channel 39 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-Fundao b/isdb-t/br-es-Fundao
index 68b7bfbc..fa76dca6 100644
--- a/isdb-t/br-es-Fundao
+++ b/isdb-t/br-es-Fundao
@@ -1,5 +1,5 @@
-# Channel table for Fundão - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3592
+# Channel table for Fund�o - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3592
 
 # Physical channel 16 (virtual 15.1)
 [TV Capixaba]
diff --git a/isdb-t/br-es-GovernadorLindenberg(novoBrasil) b/isdb-t/br-es-GovernadorLindenberg(novoBrasil)
index 95e4ee29..678fbbd1 100644
--- a/isdb-t/br-es-GovernadorLindenberg(novoBrasil)
+++ b/isdb-t/br-es-GovernadorLindenberg(novoBrasil)
@@ -1,5 +1,34 @@
 # Channel table for Governador Lindenberg (novo Brasil) - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3310
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3310
+
+# Physical channel 15 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 9.1)
 [TV Gazeta Noroeste]
diff --git a/isdb-t/br-es-Guacui b/isdb-t/br-es-Guacui
new file mode 100644
index 00000000..1dc48cd2
--- /dev/null
+++ b/isdb-t/br-es-Guacui
@@ -0,0 +1,61 @@
+# Channel table for Gua�u� - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=585
+
+# Physical channel 26 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-Guarapari b/isdb-t/br-es-Guarapari
index e7518764..d5f92b76 100644
--- a/isdb-t/br-es-Guarapari
+++ b/isdb-t/br-es-Guarapari
@@ -1,5 +1,5 @@
 # Channel table for Guarapari - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/284
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=284
 
 # Physical channel 16 (virtual 10.1)
 [TV Capixaba]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 19.3)
-[TV Câmara, TV ALES, TV Senado]
+# Physical channel 19 (virtual 3.4)
+[TV Câmara, TV Assembleia ES, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 9.1)
-[TV Guarapari]
+# Physical channel 32 (virtual 9.3)
+[TV Guarapari, TV Brasil 2, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 36.1)
-[Rede Vida]
+# Physical channel 35 (virtual 36.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 8.1)
-[Record News ES]
+# Physical channel 40 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 50.1)
+# Physical channel 48 (virtual 48.1)
 [Rede Brasil ES]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 689142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-es-Ibiracu b/isdb-t/br-es-Ibiracu
index b6bb8bdc..df54e5e7 100644
--- a/isdb-t/br-es-Ibiracu
+++ b/isdb-t/br-es-Ibiracu
@@ -1,5 +1,5 @@
-# Channel table for Ibiraçu - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3833
+# Channel table for Ibira�u - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3833
 
 # Physical channel 21 (virtual 5.1)
 [TV Gazeta Norte]
@@ -30,3 +30,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-Itapemirim b/isdb-t/br-es-Itapemirim
index 3c6895c4..d8811d44 100644
--- a/isdb-t/br-es-Itapemirim
+++ b/isdb-t/br-es-Itapemirim
@@ -1,11 +1,11 @@
 # Channel table for Itapemirim - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1524
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1524
 
-# Physical channel 24 (virtual 10.1)
+# Physical channel 21 (virtual 10.1)
 [TV Gazeta Sul]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 32.1)
-[Record News ES]
+# Physical channel 33 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-Iuna b/isdb-t/br-es-Iuna
new file mode 100644
index 00000000..e046d4e3
--- /dev/null
+++ b/isdb-t/br-es-Iuna
@@ -0,0 +1,61 @@
+# Channel table for I�na - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2892
+
+# Physical channel 21 (virtual 10.1)
+[TV Gazeta Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-Jaguare b/isdb-t/br-es-Jaguare
new file mode 100644
index 00000000..393a1b77
--- /dev/null
+++ b/isdb-t/br-es-Jaguare
@@ -0,0 +1,61 @@
+# Channel table for Jaguar� - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4142
+
+# Physical channel 34 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-JoaoNeiva b/isdb-t/br-es-JoaoNeiva
index 313d2eb4..7e94b692 100644
--- a/isdb-t/br-es-JoaoNeiva
+++ b/isdb-t/br-es-JoaoNeiva
@@ -1,5 +1,5 @@
-# Channel table for João Neiva - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1408
+# Channel table for Jo�o Neiva - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1408
 
 # Physical channel 23 (virtual 5.1)
 [TV Gazeta Norte]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-Linhares b/isdb-t/br-es-Linhares
index 6795ca68..25472041 100644
--- a/isdb-t/br-es-Linhares
+++ b/isdb-t/br-es-Linhares
@@ -1,5 +1,34 @@
 # Channel table for Linhares - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/270
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=270
+
+# Physical channel 16 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 5.1)
 [TV Gazeta Norte]
@@ -117,3 +146,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-Marataizes b/isdb-t/br-es-Marataizes
index 9bb58ae7..f54c28c7 100644
--- a/isdb-t/br-es-Marataizes
+++ b/isdb-t/br-es-Marataizes
@@ -1,5 +1,5 @@
-# Channel table for Marataízes - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1521
+# Channel table for Marata�zes - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1521
 
 # Physical channel 21 (virtual 10.1)
 [TV Gazeta Sul]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 23.1)
-[Rede Vida]
+# Physical channel 33 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 32.1)
-[Record News ES]
+# Physical channel 35 (virtual 23.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-MarechalFloriano b/isdb-t/br-es-MarechalFloriano
index 4e221d03..ef613162 100644
--- a/isdb-t/br-es-MarechalFloriano
+++ b/isdb-t/br-es-MarechalFloriano
@@ -1,5 +1,5 @@
 # Channel table for Marechal Floriano - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3632
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3632
 
 # Physical channel 16 (virtual 10.1)
 [TV Capixaba]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-MimosoDoSul b/isdb-t/br-es-MimosoDoSul
index 3c117ba0..e7a31f9e 100644
--- a/isdb-t/br-es-MimosoDoSul
+++ b/isdb-t/br-es-MimosoDoSul
@@ -1,5 +1,5 @@
 # Channel table for Mimoso Do Sul - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1389
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1389
 
 # Physical channel 22 (virtual 10.1)
 [TV Gazeta Sul]
diff --git a/isdb-t/br-es-Montanha b/isdb-t/br-es-Montanha
index 8f2af1e3..435c2c8a 100644
--- a/isdb-t/br-es-Montanha
+++ b/isdb-t/br-es-Montanha
@@ -1,5 +1,5 @@
 # Channel table for Montanha - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/544
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=544
 
 # Physical channel 22 (virtual 41.1)
 [TV Gazeta Norte]
diff --git a/isdb-t/br-es-Mucurici b/isdb-t/br-es-Mucurici
index 2a262354..d7a248df 100644
--- a/isdb-t/br-es-Mucurici
+++ b/isdb-t/br-es-Mucurici
@@ -1,5 +1,5 @@
 # Channel table for Mucurici - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3824
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3824
 
 # Physical channel 22 (virtual 41.1)
 [TV Gazeta Norte]
diff --git a/isdb-t/br-es-MunizFreire b/isdb-t/br-es-MunizFreire
new file mode 100644
index 00000000..7e63acf5
--- /dev/null
+++ b/isdb-t/br-es-MunizFreire
@@ -0,0 +1,61 @@
+# Channel table for Muniz Freire - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2136
+
+# Physical channel 23 (virtual 10.1)
+[TV Gazeta Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-NovaVenecia b/isdb-t/br-es-NovaVenecia
index dd02bfa9..bb64cecd 100644
--- a/isdb-t/br-es-NovaVenecia
+++ b/isdb-t/br-es-NovaVenecia
@@ -1,5 +1,5 @@
-# Channel table for Nova Venécia - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2823
+# Channel table for Nova Ven�cia - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2823
 
 # Physical channel 22 (virtual 10.1)
 [TV Gazeta Noroeste]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 33 (virtual 33.1)
 [TV Verdade]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-es-Piuma b/isdb-t/br-es-Piuma
index d48e3651..97a505e2 100644
--- a/isdb-t/br-es-Piuma
+++ b/isdb-t/br-es-Piuma
@@ -1,5 +1,5 @@
-# Channel table for Piúma - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1523
+# Channel table for Pi�ma - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1523
 
 # Physical channel 21 (virtual 10.1)
 [TV Gazeta Sul]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 32.1)
-[Record News ES]
+# Physical channel 33 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-es-PontoBelo b/isdb-t/br-es-PontoBelo
index 40027a11..295998c2 100644
--- a/isdb-t/br-es-PontoBelo
+++ b/isdb-t/br-es-PontoBelo
@@ -1,5 +1,5 @@
 # Channel table for Ponto Belo - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3834
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3834
 
 # Physical channel 22 (virtual 41.1)
 [TV Gazeta Norte]
diff --git a/isdb-t/br-es-PresidenteKennedy b/isdb-t/br-es-PresidenteKennedy
index 10f916ff..1bbe72e4 100644
--- a/isdb-t/br-es-PresidenteKennedy
+++ b/isdb-t/br-es-PresidenteKennedy
@@ -1,5 +1,5 @@
 # Channel table for Presidente Kennedy - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3639
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3639
 
 # Physical channel 21 (virtual 10.1)
 [TV Gazeta Sul]
@@ -30,3 +30,90 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 6.1)
+[TV Vitória]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-RioBananal b/isdb-t/br-es-RioBananal
new file mode 100644
index 00000000..59bde2df
--- /dev/null
+++ b/isdb-t/br-es-RioBananal
@@ -0,0 +1,32 @@
+# Channel table for Rio Bananal - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4131
+
+# Physical channel 45 (virtual 8.4)
+[Record News, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-RioNovoDoSul b/isdb-t/br-es-RioNovoDoSul
index 28ffc89a..a9bce018 100644
--- a/isdb-t/br-es-RioNovoDoSul
+++ b/isdb-t/br-es-RioNovoDoSul
@@ -1,5 +1,5 @@
 # Channel table for Rio Novo Do Sul - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3378
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3378
 
 # Physical channel 21 (virtual 10.1)
 [TV Gazeta Sul]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 32.1)
-[Record News ES]
+# Physical channel 33 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-SantaLeopoldina b/isdb-t/br-es-SantaLeopoldina
new file mode 100644
index 00000000..dfc835d1
--- /dev/null
+++ b/isdb-t/br-es-SantaLeopoldina
@@ -0,0 +1,32 @@
+# Channel table for Santa Leopoldina - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4130
+
+# Physical channel 24 (virtual 8.4)
+[Record News, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-SaoDomingosDoNorte b/isdb-t/br-es-SaoDomingosDoNorte
index be155c05..c356fe5f 100644
--- a/isdb-t/br-es-SaoDomingosDoNorte
+++ b/isdb-t/br-es-SaoDomingosDoNorte
@@ -1,5 +1,34 @@
-# Channel table for São Domingos Do Norte - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3424
+# Channel table for S�o Domingos Do Norte - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3424
+
+# Physical channel 15 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 9.1)
 [TV Gazeta Noroeste]
diff --git a/isdb-t/br-es-SaoGabrielDaPalha b/isdb-t/br-es-SaoGabrielDaPalha
index b9bcc65d..c5314ba9 100644
--- a/isdb-t/br-es-SaoGabrielDaPalha
+++ b/isdb-t/br-es-SaoGabrielDaPalha
@@ -1,5 +1,5 @@
-# Channel table for São Gabriel Da Palha - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3823
+# Channel table for S�o Gabriel Da Palha - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3823
 
 # Physical channel 24 (virtual 13.1)
 [TV Gazeta Noroeste]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 32.1)
-[Record News ES]
+# Physical channel 32 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 575142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-es-SaoJoseDoCalcado b/isdb-t/br-es-SaoJoseDoCalcado
new file mode 100644
index 00000000..16c2a807
--- /dev/null
+++ b/isdb-t/br-es-SaoJoseDoCalcado
@@ -0,0 +1,61 @@
+# Channel table for S�o Jos� Do Cal�ado - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4251
+
+# Physical channel 31 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-SaoMateus b/isdb-t/br-es-SaoMateus
index 8f88aae3..a6093f94 100644
--- a/isdb-t/br-es-SaoMateus
+++ b/isdb-t/br-es-SaoMateus
@@ -1,7 +1,7 @@
-# Channel table for São Mateus - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/232
+# Channel table for S�o Mateus - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=232
 
-# Physical channel 23 (virtual 8.1)
+# Physical channel 23 (virtual 5.1)
 [TV Gazeta Norte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 5.1)
-[Record News ES]
+# Physical channel 30 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 12.1)
-[TV Sim Linhares]
+# Physical channel 35 (virtual 35.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 36.1)
-[Rede Vida]
+# Physical channel 42 (virtual 7.1)
+[TV Tribuna]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 16.1)
+[TV Sim São Mateus]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-es-Serra b/isdb-t/br-es-Serra
index c9d47f65..da199722 100644
--- a/isdb-t/br-es-Serra
+++ b/isdb-t/br-es-Serra
@@ -1,5 +1,34 @@
 # Channel table for Serra - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3591
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3591
+
+# Physical channel 16 (virtual 10.1)
+[TV Capixaba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 4.1)
 [TV Gazeta Vitória]
@@ -59,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 7.1)
-[TV Tribuna]
+# Physical channel 40 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 50.1)
-[Rede Brasil ES]
+# Physical channel 42 (virtual 7.1)
+[TV Tribuna]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 689142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-es-Sooretama b/isdb-t/br-es-Sooretama
new file mode 100644
index 00000000..abee7096
--- /dev/null
+++ b/isdb-t/br-es-Sooretama
@@ -0,0 +1,177 @@
+# Channel table for Sooretama - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4095
+
+# Physical channel 16 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 5.1)
+[TV Gazeta Norte]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 46.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 16.1)
+[TV Sim Linhares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 6.1)
+[TV Vitória]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 7.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-VendaNovaDoImigrante b/isdb-t/br-es-VendaNovaDoImigrante
index 0adeac60..0e422e74 100644
--- a/isdb-t/br-es-VendaNovaDoImigrante
+++ b/isdb-t/br-es-VendaNovaDoImigrante
@@ -1,5 +1,5 @@
 # Channel table for Venda Nova Do Imigrante - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/657
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=657
 
 # Physical channel 22 (virtual 4.1)
 [TV Gazeta Vitória]
diff --git a/isdb-t/br-es-Viana b/isdb-t/br-es-Viana
index 68ec320a..6a7e5f75 100644
--- a/isdb-t/br-es-Viana
+++ b/isdb-t/br-es-Viana
@@ -1,5 +1,5 @@
 # Channel table for Viana - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3594
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3594
 
 # Physical channel 16 (virtual 10.1)
 [TV Capixaba]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 19.4)
-[TV Câmara, TV ALES, TV Senado, TV Câmara Municipal]
+# Physical channel 19 (virtual 3.4)
+[TV Câmara, TV Assembleia ES, TV Câmara Municipal, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 2.1)
-[TV Educativa ES]
+# Physical channel 20 (virtual 2.2)
+[TV Educativa ES, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -204,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 28.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 31 (virtual 31.1)
 [TV UVV]
 	DELIVERY_SYSTEM = ISDBT
@@ -262,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 36.1)
-[Rede Vida]
+# Physical channel 35 (virtual 36.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -320,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 8.1)
-[TV R Gallo]
+# Physical channel 40 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -350,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 47.1)
-[TV Novo Tempo]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-es-VilaValerio b/isdb-t/br-es-VilaValerio
new file mode 100644
index 00000000..61f4a8ff
--- /dev/null
+++ b/isdb-t/br-es-VilaValerio
@@ -0,0 +1,32 @@
+# Channel table for Vila Val�rio - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4094
+
+# Physical channel 34 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-VilaVelha b/isdb-t/br-es-VilaVelha
index 2e86d832..dc7fe084 100644
--- a/isdb-t/br-es-VilaVelha
+++ b/isdb-t/br-es-VilaVelha
@@ -1,7 +1,7 @@
 # Channel table for Vila Velha - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3590
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3590
 
-# Physical channel 16 (virtual 15.1)
+# Physical channel 16 (virtual 10.1)
 [TV Capixaba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 19.4)
-[TV Câmara, TV ALES, TV Senado, TV Câmara Municipal]
+# Physical channel 19 (virtual 3.4)
+[TV Câmara, TV Assembleia ES, TV Câmara Municipal, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 2.1)
-[TV Educativa ES]
+# Physical channel 20 (virtual 2.2)
+[TV Educativa ES, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 36.1)
-[Rede Vida]
+# Physical channel 35 (virtual 36.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 8.1)
-[Record News ES]
+# Physical channel 40 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 13.1)
-[TV Mundial]
+[Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 47.1)
-[TV Novo Tempo]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 16.1)
-[TV Sim Colatina]
+[TV Sim Linhares]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-es-Vitoria b/isdb-t/br-es-Vitoria
index 40340517..dc9b84e3 100644
--- a/isdb-t/br-es-Vitoria
+++ b/isdb-t/br-es-Vitoria
@@ -1,5 +1,5 @@
-# Channel table for Vitória - ES - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/45
+# Channel table for Vit�ria - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=45
 
 # Physical channel 16 (virtual 10.1)
 [TV Capixaba]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 19.3)
-[TV Câmara, TV ALES, TV Senado]
+# Physical channel 19 (virtual 3.4)
+[TV Câmara, TV Assembleia ES, TV Câmara Municipal, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 2.1)
-[TV Educativa ES]
+# Physical channel 20 (virtual 2.2)
+[TV Educativa ES, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 36.1)
-[Rede Vida]
+# Physical channel 35 (virtual 36.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 8.1)
-[Record News ES]
+# Physical channel 40 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 13.1)
-[TV Mundial]
+[Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 47.1)
-[TV Novo Tempo]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 16.1)
-[TV Sim Colatina]
+[TV Sim Linhares]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-es-aguaDoceDoNorte b/isdb-t/br-es-aguaDoceDoNorte
new file mode 100644
index 00000000..62bef540
--- /dev/null
+++ b/isdb-t/br-es-aguaDoceDoNorte
@@ -0,0 +1,32 @@
+# Channel table for �gua Doce Do Norte - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4092
+
+# Physical channel 27 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-es-aguiaBranca b/isdb-t/br-es-aguiaBranca
new file mode 100644
index 00000000..2fd83527
--- /dev/null
+++ b/isdb-t/br-es-aguiaBranca
@@ -0,0 +1,32 @@
+# Channel table for �guia Branca - ES - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4093
+
+# Physical channel 27 (virtual 8.4)
+[Record News ES, Aula em Casa/Dever em Casa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-AbadiaDeGoias b/isdb-t/br-go-AbadiaDeGoias
index f8fad823..1e5fead9 100644
--- a/isdb-t/br-go-AbadiaDeGoias
+++ b/isdb-t/br-go-AbadiaDeGoias
@@ -1,8 +1,8 @@
-# Channel table for Abadia De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3531
+# Channel table for Abadia De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3531
 
-# Physical channel 14 (virtual 28.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 61.4)
-[TV Câmara, TV Assembleia GO, TV Senado, TV Câmara Municipal Goiânia]
+# Physical channel 36 (virtual 3.4)
+[TV Câmara, TV Assembleia GO, TV Câmara Municipal Goiânia, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -436,3 +436,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Abadiania b/isdb-t/br-go-Abadiania
index ad780e2f..f0bd733e 100644
--- a/isdb-t/br-go-Abadiania
+++ b/isdb-t/br-go-Abadiania
@@ -1,5 +1,5 @@
-# Channel table for Abadiânia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3532
+# Channel table for Abadi�nia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3532
 
 # Physical channel 20 (virtual 23.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Acreuna b/isdb-t/br-go-Acreuna
new file mode 100644
index 00000000..ca6ae4cd
--- /dev/null
+++ b/isdb-t/br-go-Acreuna
@@ -0,0 +1,32 @@
+# Channel table for Acre�na - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2614
+
+# Physical channel 20 (virtual 10.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Alexania b/isdb-t/br-go-Alexania
index 1dd869c7..864f5c1b 100644
--- a/isdb-t/br-go-Alexania
+++ b/isdb-t/br-go-Alexania
@@ -1,5 +1,5 @@
-# Channel table for Alexânia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2494
+# Channel table for Alex�nia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2494
 
 # Physical channel 30 (virtual 35.1)
 [TV Anhanguera Anápolis]
diff --git a/isdb-t/br-go-Aloandia b/isdb-t/br-go-Aloandia
index ab9fb947..aa91b0d9 100644
--- a/isdb-t/br-go-Aloandia
+++ b/isdb-t/br-go-Aloandia
@@ -1,5 +1,5 @@
-# Channel table for Aloândia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1713
+# Channel table for Alo�ndia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1713
 
 # Physical channel 27 (virtual 49.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-AltoParaisoDeGoias b/isdb-t/br-go-AltoParaisoDeGoias
index 2e0f2e83..2f925605 100644
--- a/isdb-t/br-go-AltoParaisoDeGoias
+++ b/isdb-t/br-go-AltoParaisoDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Alto Paraíso De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3349
+# Channel table for Alto Para�so De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3349
 
 # Physical channel 25 (virtual 25.1)
 [TV Canção Nova]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 35.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Amaralina b/isdb-t/br-go-Amaralina
new file mode 100644
index 00000000..bd911d63
--- /dev/null
+++ b/isdb-t/br-go-Amaralina
@@ -0,0 +1,32 @@
+# Channel table for Amaralina - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2616
+
+# Physical channel 27 (virtual 20.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Anapolis b/isdb-t/br-go-Anapolis
index 36fe522e..c0bd2e11 100644
--- a/isdb-t/br-go-Anapolis
+++ b/isdb-t/br-go-Anapolis
@@ -1,5 +1,5 @@
-# Channel table for Anápolis - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/46
+# Channel table for An�polis - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=46
 
 # Physical channel 14 (virtual 28.1)
 [Rede Vida]
diff --git a/isdb-t/br-go-Anicuns b/isdb-t/br-go-Anicuns
new file mode 100644
index 00000000..9eac6600
--- /dev/null
+++ b/isdb-t/br-go-Anicuns
@@ -0,0 +1,32 @@
+# Channel table for Anicuns - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2619
+
+# Physical channel 34 (virtual 2.1)
+[TV Anhanguera Goiânia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-AparecidaDeGoiania b/isdb-t/br-go-AparecidaDeGoiania
index ec85218e..67c48eb8 100644
--- a/isdb-t/br-go-AparecidaDeGoiania
+++ b/isdb-t/br-go-AparecidaDeGoiania
@@ -1,8 +1,8 @@
-# Channel table for Aparecida De Goiânia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/207
+# Channel table for Aparecida De Goi�nia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=207
 
-# Physical channel 14 (virtual 28.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 19.1)
+[RBTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 20 (virtual 9.1)
 [TV Serra Dourada]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
+# Physical channel 21 (virtual 21.3)
 [TV Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -379,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 40.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -407,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 61.4)
-[TV Câmara, TV Assembleia GO, TV Senado, TV Câmara Municipal Goiânia]
+# Physical channel 36 (virtual 3.4)
+[TV Câmara, TV Assembleia GO, TV Câmara Municipal Goiânia, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -437,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[TV Gazeta]
+[TV Gazeta GO]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 32.1)
-[TV Luz da Vida]
+[Rede Capital]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -611,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
@@ -639,6 +668,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.1)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 50 (virtual 51.1)
 [TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-go-Aragarcas b/isdb-t/br-go-Aragarcas
index 195717b1..98147918 100644
--- a/isdb-t/br-go-Aragarcas
+++ b/isdb-t/br-go-Aragarcas
@@ -1,11 +1,11 @@
-# Channel table for Aragarças - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2760
+# Channel table for Aragar�as - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2760
 
-# Physical channel 19 (virtual 18.1)
-[Rede Vida]
+# Physical channel 28 (virtual 4.1)
+[TV Araguaia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 7.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Aragoiania b/isdb-t/br-go-Aragoiania
index e4a5c02c..86dd253a 100644
--- a/isdb-t/br-go-Aragoiania
+++ b/isdb-t/br-go-Aragoiania
@@ -1,5 +1,5 @@
-# Channel table for Aragoiânia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3533
+# Channel table for Aragoi�nia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3533
 
 # Physical channel 15 (virtual 15.1)
 [TV UFG]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -262,3 +262,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Aruana b/isdb-t/br-go-Aruana
new file mode 100644
index 00000000..e3d9c389
--- /dev/null
+++ b/isdb-t/br-go-Aruana
@@ -0,0 +1,61 @@
+# Channel table for Aruan� - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2622
+
+# Physical channel 27 (virtual 12.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 5.1)
+[TV Anhanguera Goiânia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-BelaVistaDeGoias b/isdb-t/br-go-BelaVistaDeGoias
index 3261a8a0..4cc005cd 100644
--- a/isdb-t/br-go-BelaVistaDeGoias
+++ b/isdb-t/br-go-BelaVistaDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Bela Vista De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3534
+# Channel table for Bela Vista De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3534
 
 # Physical channel 15 (virtual 15.1)
 [TV UFG]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-go-BomJardimDeGoias b/isdb-t/br-go-BomJardimDeGoias
new file mode 100644
index 00000000..2fce8ee4
--- /dev/null
+++ b/isdb-t/br-go-BomJardimDeGoias
@@ -0,0 +1,32 @@
+# Channel table for Bom Jardim De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2610
+
+# Physical channel 20 (virtual 20.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-BomJesusDeGoias b/isdb-t/br-go-BomJesusDeGoias
index c0692eb9..cca4bd55 100644
--- a/isdb-t/br-go-BomJesusDeGoias
+++ b/isdb-t/br-go-BomJesusDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Bom Jesus De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1714
+# Channel table for Bom Jesus De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1714
 
 # Physical channel 27 (virtual 10.1)
 [TV Serra Dourada]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 36.1)
+[TV Bom]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Bonfinopolis b/isdb-t/br-go-Bonfinopolis
index d347d785..a202bf15 100644
--- a/isdb-t/br-go-Bonfinopolis
+++ b/isdb-t/br-go-Bonfinopolis
@@ -1,5 +1,5 @@
-# Channel table for Bonfinópolis - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3535
+# Channel table for Bonfin�polis - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3535
 
 # Physical channel 15 (virtual 15.1)
 [TV UFG]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,3 +233,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Brazabrantes b/isdb-t/br-go-Brazabrantes
index 8cda1581..3cb4ce10 100644
--- a/isdb-t/br-go-Brazabrantes
+++ b/isdb-t/br-go-Brazabrantes
@@ -1,8 +1,8 @@
 # Channel table for Brazabrantes - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3536
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3536
 
-# Physical channel 14 (virtual 28.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.2)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 61.4)
-[TV Câmara, TV Assembleia GO, TV Senado, TV Câmara Municipal Goiânia]
+# Physical channel 36 (virtual 3.4)
+[TV Câmara, TV Assembleia GO, TV Câmara Municipal Goiânia, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -407,3 +407,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.1)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Britania b/isdb-t/br-go-Britania
new file mode 100644
index 00000000..406cbf40
--- /dev/null
+++ b/isdb-t/br-go-Britania
@@ -0,0 +1,32 @@
+# Channel table for Brit�nia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2611
+
+# Physical channel 27 (virtual 10.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-CachoeiraAlta b/isdb-t/br-go-CachoeiraAlta
index b46a34a4..c2d6de23 100644
--- a/isdb-t/br-go-CachoeiraAlta
+++ b/isdb-t/br-go-CachoeiraAlta
@@ -1,5 +1,34 @@
 # Channel table for Cachoeira Alta - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1637
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1637
+
+# Physical channel 27 (virtual 31.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 53.1)
 [TV Goiânia]
diff --git a/isdb-t/br-go-Cacu b/isdb-t/br-go-Cacu
index 1fb4e45a..3fc159b4 100644
--- a/isdb-t/br-go-Cacu
+++ b/isdb-t/br-go-Cacu
@@ -1,5 +1,5 @@
-# Channel table for Caçu - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/859
+# Channel table for Ca�u - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=859
 
 # Physical channel 27 (virtual 18.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Caiaponia b/isdb-t/br-go-Caiaponia
index 1e8f2624..9a315f29 100644
--- a/isdb-t/br-go-Caiaponia
+++ b/isdb-t/br-go-Caiaponia
@@ -1,5 +1,5 @@
-# Channel table for Caiapônia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1716
+# Channel table for Caiap�nia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1716
 
 # Physical channel 20 (virtual 13.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-CaldasNovas b/isdb-t/br-go-CaldasNovas
index 2879b582..da10c82b 100644
--- a/isdb-t/br-go-CaldasNovas
+++ b/isdb-t/br-go-CaldasNovas
@@ -1,5 +1,5 @@
 # Channel table for Caldas Novas - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/428
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=428
 
 # Physical channel 16 (virtual 15.1)
 [TV Anhanguera Itumbiara]
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 38.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 47.1)
 [TV Guarani]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-go-Caldazinha b/isdb-t/br-go-Caldazinha
index fe8a404b..7703d288 100644
--- a/isdb-t/br-go-Caldazinha
+++ b/isdb-t/br-go-Caldazinha
@@ -1,8 +1,8 @@
 # Channel table for Caldazinha - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3537
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3537
 
-# Physical channel 14 (virtual 28.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 61.4)
-[TV Câmara, TV Assembleia GO, TV Senado, TV Câmara Municipal Goiânia]
+# Physical channel 36 (virtual 3.4)
+[TV Câmara, TV Assembleia GO, TV Câmara Municipal Goiânia, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -436,6 +436,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 50 (virtual 51.1)
 [TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-go-Campinorte b/isdb-t/br-go-Campinorte
new file mode 100644
index 00000000..daeb7bdf
--- /dev/null
+++ b/isdb-t/br-go-Campinorte
@@ -0,0 +1,90 @@
+# Channel table for Campinorte - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4127
+
+# Physical channel 25 (virtual 25.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 8.1)
+[TV Brasil Central]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 13.1)
+[TV Anhanguera Porangatu]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-CampoLimpoDeGoias b/isdb-t/br-go-CampoLimpoDeGoias
index 8d307697..5897c824 100644
--- a/isdb-t/br-go-CampoLimpoDeGoias
+++ b/isdb-t/br-go-CampoLimpoDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Campo Limpo De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3538
+# Channel table for Campo Limpo De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3538
 
 # Physical channel 14 (virtual 28.1)
 [Rede Vida]
diff --git a/isdb-t/br-go-CarmoDoRioVerde b/isdb-t/br-go-CarmoDoRioVerde
new file mode 100644
index 00000000..3753527f
--- /dev/null
+++ b/isdb-t/br-go-CarmoDoRioVerde
@@ -0,0 +1,32 @@
+# Channel table for Carmo Do Rio Verde - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4321
+
+# Physical channel 27 (virtual 20.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Catalao b/isdb-t/br-go-Catalao
index 96c1a923..5e4a5d9e 100644
--- a/isdb-t/br-go-Catalao
+++ b/isdb-t/br-go-Catalao
@@ -1,5 +1,5 @@
-# Channel table for Catalão - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/410
+# Channel table for Catal�o - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=410
 
 # Physical channel 25 (virtual 24.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-go-Caturai b/isdb-t/br-go-Caturai
new file mode 100644
index 00000000..0ae6db0d
--- /dev/null
+++ b/isdb-t/br-go-Caturai
@@ -0,0 +1,32 @@
+# Channel table for Catura� - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4286
+
+# Physical channel 34 (virtual 2.1)
+[TV Anhanguera Goiânia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Cavalcante b/isdb-t/br-go-Cavalcante
index 6517c2ad..ba8bc9d9 100644
--- a/isdb-t/br-go-Cavalcante
+++ b/isdb-t/br-go-Cavalcante
@@ -1,5 +1,5 @@
 # Channel table for Cavalcante - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2502
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2502
 
 # Physical channel 25 (virtual 7.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-go-CidadeOcidental b/isdb-t/br-go-CidadeOcidental
index b77a14e7..1b7532dc 100644
--- a/isdb-t/br-go-CidadeOcidental
+++ b/isdb-t/br-go-CidadeOcidental
@@ -1,5 +1,5 @@
 # Channel table for Cidade Ocidental - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3579
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3579
 
 # Physical channel 16 (virtual 22.1)
 [TV Anhanguera Luziânia]
diff --git a/isdb-t/br-go-CorumbaDeGoias b/isdb-t/br-go-CorumbaDeGoias
index 22f78a56..c2fb58f5 100644
--- a/isdb-t/br-go-CorumbaDeGoias
+++ b/isdb-t/br-go-CorumbaDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Corumbá De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3712
+# Channel table for Corumb� De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3712
 
 # Physical channel 27 (virtual 59.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Cristalina b/isdb-t/br-go-Cristalina
index 9d3230f0..b261f43c 100644
--- a/isdb-t/br-go-Cristalina
+++ b/isdb-t/br-go-Cristalina
@@ -1,5 +1,5 @@
 # Channel table for Cristalina - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/413
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=413
 
 # Physical channel 16 (virtual 22.1)
 [TV Anhanguera Luziânia]
diff --git a/isdb-t/br-go-Crixas b/isdb-t/br-go-Crixas
index 2c212897..155762e7 100644
--- a/isdb-t/br-go-Crixas
+++ b/isdb-t/br-go-Crixas
@@ -1,5 +1,5 @@
-# Channel table for Crixás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3472
+# Channel table for Crix�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3472
 
 # Physical channel 27 (virtual 2.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Edeia b/isdb-t/br-go-Edeia
index 9e9284d2..a5b09584 100644
--- a/isdb-t/br-go-Edeia
+++ b/isdb-t/br-go-Edeia
@@ -1,5 +1,5 @@
-# Channel table for Edéia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2657
+# Channel table for Ed�ia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2657
 
 # Physical channel 27 (virtual 40.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-EstrelaDoNorte b/isdb-t/br-go-EstrelaDoNorte
new file mode 100644
index 00000000..6f961cc4
--- /dev/null
+++ b/isdb-t/br-go-EstrelaDoNorte
@@ -0,0 +1,32 @@
+# Channel table for Estrela Do Norte - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4328
+
+# Physical channel 27 (virtual 20.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Formosa b/isdb-t/br-go-Formosa
index 3d0775d8..fe5b8d3c 100644
--- a/isdb-t/br-go-Formosa
+++ b/isdb-t/br-go-Formosa
@@ -1,5 +1,5 @@
 # Channel table for Formosa - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/420
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=420
 
 # Physical channel 16 (virtual 7.1)
 [TV Anhanguera Luziânia]
diff --git a/isdb-t/br-go-Formoso b/isdb-t/br-go-Formoso
new file mode 100644
index 00000000..1a427a46
--- /dev/null
+++ b/isdb-t/br-go-Formoso
@@ -0,0 +1,119 @@
+# Channel table for Formoso - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4121
+
+# Physical channel 20 (virtual 3.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 8.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 23.1)
+[TV Serra Azul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 12.1)
+[TV Anhanguera Porangatu]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Goianapolis b/isdb-t/br-go-Goianapolis
index 9006e0da..33e2c884 100644
--- a/isdb-t/br-go-Goianapolis
+++ b/isdb-t/br-go-Goianapolis
@@ -1,5 +1,5 @@
-# Channel table for Goianápolis - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3540
+# Channel table for Goian�polis - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3540
 
 # Physical channel 14 (virtual 28.1)
 [Rede Vida]
diff --git a/isdb-t/br-go-Goiandira b/isdb-t/br-go-Goiandira
index fdcb3373..4259da8c 100644
--- a/isdb-t/br-go-Goiandira
+++ b/isdb-t/br-go-Goiandira
@@ -1,5 +1,5 @@
 # Channel table for Goiandira - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3361
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3361
 
 # Physical channel 29 (virtual 6.1)
 [TV Sucesso]
diff --git a/isdb-t/br-go-Goianesia b/isdb-t/br-go-Goianesia
index 8fc2abf0..6279b219 100644
--- a/isdb-t/br-go-Goianesia
+++ b/isdb-t/br-go-Goianesia
@@ -1,5 +1,5 @@
-# Channel table for Goianésia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/427
+# Channel table for Goian�sia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=427
 
 # Physical channel 24 (virtual 52.1)
 [TV Canção Nova]
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 43.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 48.1)
 [TV Verdade]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-go-Goiania b/isdb-t/br-go-Goiania
index d336c2c0..8825ff9c 100644
--- a/isdb-t/br-go-Goiania
+++ b/isdb-t/br-go-Goiania
@@ -1,8 +1,8 @@
-# Channel table for Goiânia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/40
+# Channel table for Goi�nia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=40
 
-# Physical channel 14 (virtual 28.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 19.1)
+[RBTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 20 (virtual 9.1)
 [TV Serra Dourada]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
+# Physical channel 21 (virtual 21.3)
 [TV Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -379,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 40.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -407,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 61.4)
-[TV Câmara, TV Assembleia GO, TV Senado, TV Câmara Municipal Goiânia]
+# Physical channel 36 (virtual 3.4)
+[TV Câmara, TV Assembleia GO, TV Câmara Municipal Goiânia, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -437,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[TV Gazeta]
+[TV Gazeta GO]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 32.1)
-[TV Luz da Vida]
+[Rede Capital]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -611,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
@@ -639,6 +668,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 50 (virtual 51.1)
 [TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-go-Goianira b/isdb-t/br-go-Goianira
index 5bb14195..0c2a8b0b 100644
--- a/isdb-t/br-go-Goianira
+++ b/isdb-t/br-go-Goianira
@@ -1,5 +1,34 @@
 # Channel table for Goianira - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3541
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3541
+
+# Physical channel 14 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 15.1)
 [TV UFG]
@@ -59,6 +88,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 18 (virtual 4.1)
+[Record TV Goiás]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 19 (virtual 19.1)
+[RBTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 20 (virtual 9.1)
 [TV Serra Dourada]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 21 (virtual 6.1)
+[TV Brasília]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 24.1)
 [PUC TV Goiás]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +233,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 36.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 26.1)
+[TV Sagres]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,6 +407,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 38.1)
+[TV Gazeta GO]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 42.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 5.1)
 [Fonte TV]
 	DELIVERY_SYSTEM = ISDBT
@@ -262,3 +494,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Goias b/isdb-t/br-go-Goias
index 2c459e35..dc470751 100644
--- a/isdb-t/br-go-Goias
+++ b/isdb-t/br-go-Goias
@@ -1,5 +1,5 @@
-# Channel table for Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/425
+# Channel table for Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=425
 
 # Physical channel 25 (virtual 3.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-go-Goiatuba b/isdb-t/br-go-Goiatuba
index 2bbbae56..6049b3d0 100644
--- a/isdb-t/br-go-Goiatuba
+++ b/isdb-t/br-go-Goiatuba
@@ -1,5 +1,5 @@
 # Channel table for Goiatuba - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/570
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=570
 
 # Physical channel 23 (virtual 28.1)
 [Record TV Goiás]
diff --git a/isdb-t/br-go-Guapo b/isdb-t/br-go-Guapo
index 0f79545d..ea1c5aee 100644
--- a/isdb-t/br-go-Guapo
+++ b/isdb-t/br-go-Guapo
@@ -1,8 +1,8 @@
-# Channel table for Guapó - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2240
+# Channel table for Guap� - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2240
 
-# Physical channel 14 (virtual 28.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-go-Hidrolandia b/isdb-t/br-go-Hidrolandia
index ea4b486f..e9e962b3 100644
--- a/isdb-t/br-go-Hidrolandia
+++ b/isdb-t/br-go-Hidrolandia
@@ -1,8 +1,8 @@
-# Channel table for Hidrolândia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3542
+# Channel table for Hidrol�ndia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3542
 
-# Physical channel 14 (virtual 28.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 61.4)
-[TV Câmara, TV Assembleia GO, TV Senado, TV Câmara Municipal Goiânia]
+# Physical channel 36 (virtual 3.4)
+[TV Câmara, TV Assembleia GO, TV Câmara Municipal Goiânia, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -407,3 +407,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Inhumas b/isdb-t/br-go-Inhumas
index f704fc24..15be7a9e 100644
--- a/isdb-t/br-go-Inhumas
+++ b/isdb-t/br-go-Inhumas
@@ -1,5 +1,5 @@
 # Channel table for Inhumas - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2844
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2844
 
 # Physical channel 18 (virtual 4.1)
 [Record TV Goiás]
diff --git a/isdb-t/br-go-Ipameri b/isdb-t/br-go-Ipameri
index a1899502..899adce8 100644
--- a/isdb-t/br-go-Ipameri
+++ b/isdb-t/br-go-Ipameri
@@ -1,5 +1,5 @@
 # Channel table for Ipameri - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1721
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1721
 
 # Physical channel 20 (virtual 12.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Ipora b/isdb-t/br-go-Ipora
index f48c8ad1..7fdc4629 100644
--- a/isdb-t/br-go-Ipora
+++ b/isdb-t/br-go-Ipora
@@ -1,5 +1,5 @@
-# Channel table for Iporá - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2661
+# Channel table for Ipor� - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2661
 
 # Physical channel 20 (virtual 32.1)
 [TV Serra Dourada]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 58.1)
+[TV Anhanguera Goiânia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Itaberai b/isdb-t/br-go-Itaberai
index a7031bcf..a0d2af26 100644
--- a/isdb-t/br-go-Itaberai
+++ b/isdb-t/br-go-Itaberai
@@ -1,5 +1,5 @@
-# Channel table for Itaberaí - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2662
+# Channel table for Itabera� - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2662
 
 # Physical channel 22 (virtual 42.1)
 [Record TV Goiás]
diff --git a/isdb-t/br-go-Itapaci b/isdb-t/br-go-Itapaci
index 1aa43f78..bea7338f 100644
--- a/isdb-t/br-go-Itapaci
+++ b/isdb-t/br-go-Itapaci
@@ -1,5 +1,5 @@
 # Channel table for Itapaci - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2664
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2664
 
 # Physical channel 20 (virtual 8.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Itaruma b/isdb-t/br-go-Itaruma
new file mode 100644
index 00000000..0e8fd337
--- /dev/null
+++ b/isdb-t/br-go-Itaruma
@@ -0,0 +1,32 @@
+# Channel table for Itarum� - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1639
+
+# Physical channel 27 (virtual 30.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Itaucu b/isdb-t/br-go-Itaucu
index ffb4cb08..aae90d53 100644
--- a/isdb-t/br-go-Itaucu
+++ b/isdb-t/br-go-Itaucu
@@ -1,5 +1,5 @@
-# Channel table for Itauçu - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2667
+# Channel table for Itau�u - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2667
 
 # Physical channel 41 (virtual 58.1)
 [TV Anhanguera Goiânia]
diff --git a/isdb-t/br-go-Itumbiara b/isdb-t/br-go-Itumbiara
index 44d743f0..296675bb 100644
--- a/isdb-t/br-go-Itumbiara
+++ b/isdb-t/br-go-Itumbiara
@@ -1,5 +1,5 @@
 # Channel table for Itumbiara - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/357
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=357
 
 # Physical channel 14 (virtual 21.1)
 [Rede Vida]
diff --git a/isdb-t/br-go-Jandaia b/isdb-t/br-go-Jandaia
index f991c738..68e0ac2b 100644
--- a/isdb-t/br-go-Jandaia
+++ b/isdb-t/br-go-Jandaia
@@ -1,5 +1,5 @@
 # Channel table for Jandaia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2705
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2705
 
 # Physical channel 28 (virtual 52.1)
 [TV Serra Dourada]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Brasil Central]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Jatai b/isdb-t/br-go-Jatai
index 43c76a58..0589c32a 100644
--- a/isdb-t/br-go-Jatai
+++ b/isdb-t/br-go-Jatai
@@ -1,5 +1,5 @@
-# Channel table for Jataí - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/414
+# Channel table for Jata� - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=414
 
 # Physical channel 14 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-go-Jussara b/isdb-t/br-go-Jussara
index f8f54c82..7e65b70c 100644
--- a/isdb-t/br-go-Jussara
+++ b/isdb-t/br-go-Jussara
@@ -1,5 +1,5 @@
 # Channel table for Jussara - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/853
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=853
 
 # Physical channel 27 (virtual 25.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Luziania b/isdb-t/br-go-Luziania
index 9b9583a2..0fc9769c 100644
--- a/isdb-t/br-go-Luziania
+++ b/isdb-t/br-go-Luziania
@@ -1,5 +1,5 @@
-# Channel table for Luziânia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/419
+# Channel table for Luzi�nia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=419
 
 # Physical channel 16 (virtual 22.1)
 [TV Anhanguera Luziânia]
diff --git a/isdb-t/br-go-MaraRosa b/isdb-t/br-go-MaraRosa
new file mode 100644
index 00000000..18c39d62
--- /dev/null
+++ b/isdb-t/br-go-MaraRosa
@@ -0,0 +1,32 @@
+# Channel table for Mara Rosa - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1722
+
+# Physical channel 27 (virtual 20.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Minacu b/isdb-t/br-go-Minacu
index e7a12cda..057713d4 100644
--- a/isdb-t/br-go-Minacu
+++ b/isdb-t/br-go-Minacu
@@ -1,5 +1,5 @@
-# Channel table for Minaçu - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/966
+# Channel table for Mina�u - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=966
 
 # Physical channel 20 (virtual 3.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Mineiros b/isdb-t/br-go-Mineiros
index f0b00805..6603bf75 100644
--- a/isdb-t/br-go-Mineiros
+++ b/isdb-t/br-go-Mineiros
@@ -1,5 +1,5 @@
 # Channel table for Mineiros - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1724
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1724
 
 # Physical channel 22 (virtual 10.1)
 [TV Sucesso]
diff --git a/isdb-t/br-go-MontesClarosDeGoias b/isdb-t/br-go-MontesClarosDeGoias
index bd731984..5b8c5588 100644
--- a/isdb-t/br-go-MontesClarosDeGoias
+++ b/isdb-t/br-go-MontesClarosDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Montes Claros De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2715
+# Channel table for Montes Claros De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2715
 
 # Physical channel 17 (virtual 17.1)
 [TV Evangelizar]
diff --git a/isdb-t/br-go-Montividiu b/isdb-t/br-go-Montividiu
index 37f5610c..d825ed3c 100644
--- a/isdb-t/br-go-Montividiu
+++ b/isdb-t/br-go-Montividiu
@@ -1,5 +1,5 @@
 # Channel table for Montividiu - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2693
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2693
 
 # Physical channel 27 (virtual 10.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Morrinhos b/isdb-t/br-go-Morrinhos
index 818e6c04..01aa6a60 100644
--- a/isdb-t/br-go-Morrinhos
+++ b/isdb-t/br-go-Morrinhos
@@ -1,5 +1,5 @@
 # Channel table for Morrinhos - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/429
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=429
 
 # Physical channel 20 (virtual 4.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Mossamedes b/isdb-t/br-go-Mossamedes
new file mode 100644
index 00000000..4a04d317
--- /dev/null
+++ b/isdb-t/br-go-Mossamedes
@@ -0,0 +1,32 @@
+# Channel table for Moss�medes - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2714
+
+# Physical channel 19 (virtual 35.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-MundoNovo b/isdb-t/br-go-MundoNovo
new file mode 100644
index 00000000..d5c834b7
--- /dev/null
+++ b/isdb-t/br-go-MundoNovo
@@ -0,0 +1,32 @@
+# Channel table for Mundo Novo - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2670
+
+# Physical channel 27 (virtual 9.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Mutunopolis b/isdb-t/br-go-Mutunopolis
new file mode 100644
index 00000000..0e4c2056
--- /dev/null
+++ b/isdb-t/br-go-Mutunopolis
@@ -0,0 +1,119 @@
+# Channel table for Mutun�polis - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4124
+
+# Physical channel 20 (virtual 3.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 8.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 23.1)
+[TV Serra Azul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 12.1)
+[TV Anhanguera Porangatu]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Nazario b/isdb-t/br-go-Nazario
new file mode 100644
index 00000000..5c5c2805
--- /dev/null
+++ b/isdb-t/br-go-Nazario
@@ -0,0 +1,32 @@
+# Channel table for Naz�rio - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4287
+
+# Physical channel 34 (virtual 2.1)
+[TV Anhanguera Goiânia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Neropolis b/isdb-t/br-go-Neropolis
index 28dde98d..2dbebc6b 100644
--- a/isdb-t/br-go-Neropolis
+++ b/isdb-t/br-go-Neropolis
@@ -1,5 +1,5 @@
-# Channel table for Nerópolis - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3544
+# Channel table for Ner�polis - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3544
 
 # Physical channel 15 (virtual 15.1)
 [TV UFG]
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -349,3 +349,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Niquelandia b/isdb-t/br-go-Niquelandia
index 6624f0d1..cd01d547 100644
--- a/isdb-t/br-go-Niquelandia
+++ b/isdb-t/br-go-Niquelandia
@@ -1,5 +1,5 @@
-# Channel table for Niquelândia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2694
+# Channel table for Niquel�ndia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2694
 
 # Physical channel 27 (virtual 24.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-NovaAurora b/isdb-t/br-go-NovaAurora
new file mode 100644
index 00000000..0bf0cf95
--- /dev/null
+++ b/isdb-t/br-go-NovaAurora
@@ -0,0 +1,32 @@
+# Channel table for Nova Aurora - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4283
+
+# Physical channel 34 (virtual 7.1)
+[TV Anhanguera Catalão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-NovaVeneza b/isdb-t/br-go-NovaVeneza
index ff2fb6de..c25b0cbf 100644
--- a/isdb-t/br-go-NovaVeneza
+++ b/isdb-t/br-go-NovaVeneza
@@ -1,5 +1,5 @@
 # Channel table for Nova Veneza - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3545
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3545
 
 # Physical channel 15 (virtual 15.1)
 [TV UFG]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-go-NovoGama b/isdb-t/br-go-NovoGama
index 689fc3f8..24850af1 100644
--- a/isdb-t/br-go-NovoGama
+++ b/isdb-t/br-go-NovoGama
@@ -1,5 +1,5 @@
 # Channel table for Novo Gama - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3486
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3486
 
 # Physical channel 14 (virtual 2.1)
 [TV Brasil]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 58.1)
-[TV Sagres]
+[Rede Cerrado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-go-OuroVerdeDeGoias b/isdb-t/br-go-OuroVerdeDeGoias
index c1bbfb47..5b330db4 100644
--- a/isdb-t/br-go-OuroVerdeDeGoias
+++ b/isdb-t/br-go-OuroVerdeDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Ouro Verde De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3546
+# Channel table for Ouro Verde De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3546
 
 # Physical channel 15 (virtual 15.1)
 [TV UFG]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-go-Ouvidor b/isdb-t/br-go-Ouvidor
index dd313165..f3d21d5f 100644
--- a/isdb-t/br-go-Ouvidor
+++ b/isdb-t/br-go-Ouvidor
@@ -1,5 +1,5 @@
 # Channel table for Ouvidor - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/665
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=665
 
 # Physical channel 34 (virtual 7.1)
 [TV Anhanguera Catalão]
diff --git a/isdb-t/br-go-PadreBernardo b/isdb-t/br-go-PadreBernardo
index 7b5fc041..6086c475 100644
--- a/isdb-t/br-go-PadreBernardo
+++ b/isdb-t/br-go-PadreBernardo
@@ -1,5 +1,5 @@
 # Channel table for Padre Bernardo - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1725
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1725
 
 # Physical channel 18 (virtual 4.1)
 [Record TV Goiás]
diff --git a/isdb-t/br-go-PalmeirasDeGoias b/isdb-t/br-go-PalmeirasDeGoias
index 9c0ed71e..eae301f6 100644
--- a/isdb-t/br-go-PalmeirasDeGoias
+++ b/isdb-t/br-go-PalmeirasDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Palmeiras De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1257
+# Channel table for Palmeiras De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1257
 
 # Physical channel 27 (virtual 5.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Panama b/isdb-t/br-go-Panama
index 84628693..ead3827b 100644
--- a/isdb-t/br-go-Panama
+++ b/isdb-t/br-go-Panama
@@ -1,11 +1,11 @@
-# Channel table for Panamá - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1726
+# Channel table for Panam� - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1726
 
-# Physical channel 16 (virtual 11.1)
+# Physical channel 33 (virtual 19.1)
 [TV Anhanguera Itumbiara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-go-Paranaiguara b/isdb-t/br-go-Paranaiguara
index 26be9799..b754f74e 100644
--- a/isdb-t/br-go-Paranaiguara
+++ b/isdb-t/br-go-Paranaiguara
@@ -1,5 +1,5 @@
 # Channel table for Paranaiguara - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1642
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1642
 
 # Physical channel 48 (virtual 44.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-go-Parauna b/isdb-t/br-go-Parauna
new file mode 100644
index 00000000..929bf178
--- /dev/null
+++ b/isdb-t/br-go-Parauna
@@ -0,0 +1,32 @@
+# Channel table for Para�na - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2718
+
+# Physical channel 28 (virtual 38.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Piracanjuba b/isdb-t/br-go-Piracanjuba
index 5e544002..09c434ef 100644
--- a/isdb-t/br-go-Piracanjuba
+++ b/isdb-t/br-go-Piracanjuba
@@ -1,5 +1,5 @@
 # Channel table for Piracanjuba - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2721
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2721
 
 # Physical channel 28 (virtual 33.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-Pirenopolis b/isdb-t/br-go-Pirenopolis
index f4d6c251..a46d5f92 100644
--- a/isdb-t/br-go-Pirenopolis
+++ b/isdb-t/br-go-Pirenopolis
@@ -1,5 +1,5 @@
-# Channel table for Pirenópolis - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2697
+# Channel table for Piren�polis - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2697
 
 # Physical channel 27 (virtual 15.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-PiresDoRio b/isdb-t/br-go-PiresDoRio
index 30dbb24f..bcfe5bbd 100644
--- a/isdb-t/br-go-PiresDoRio
+++ b/isdb-t/br-go-PiresDoRio
@@ -1,5 +1,5 @@
 # Channel table for Pires Do Rio - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1727
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1727
 
 # Physical channel 27 (virtual 48.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-PlanaltinaDeGoias b/isdb-t/br-go-Planaltina
index a973225c..28dcdf59 100644
--- a/isdb-t/br-go-PlanaltinaDeGoias
+++ b/isdb-t/br-go-Planaltina
@@ -1,5 +1,5 @@
-# Channel table for Planaltina De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/421
+# Channel table for Planaltina - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=421
 
 # Physical channel 15 (virtual 2.4)
 [TV Brasil, TV Brasil 2, TV Escola, Canal Saúde]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -204,8 +204,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 27.4)
-[TV Câmara, Rádio Câmara]
+# Physical channel 34 (virtual 34.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 9.2)
+[TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-go-Porangatu b/isdb-t/br-go-Porangatu
index c42fdbbf..55079c72 100644
--- a/isdb-t/br-go-Porangatu
+++ b/isdb-t/br-go-Porangatu
@@ -1,5 +1,5 @@
 # Channel table for Porangatu - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/412
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=412
 
 # Physical channel 20 (virtual 3.1)
 [TV Serra Dourada]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 23.1)
-[TV Serra Azul]
+# Physical channel 25 (virtual 8.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 12.1)
-[TV Anhanguera Catalão]
+# Physical channel 28 (virtual 23.1)
+[TV Serra Azul]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 43.1)
-[Record TV Goiás]
+# Physical channel 34 (virtual 12.1)
+[TV Anhanguera Porangatu]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-go-Posse b/isdb-t/br-go-Posse
index 431de4fb..18381f1a 100644
--- a/isdb-t/br-go-Posse
+++ b/isdb-t/br-go-Posse
@@ -1,5 +1,5 @@
 # Channel table for Posse - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/860
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=860
 
 # Physical channel 25 (virtual 9.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-go-ProfessorJamil b/isdb-t/br-go-ProfessorJamil
new file mode 100644
index 00000000..9a188db1
--- /dev/null
+++ b/isdb-t/br-go-ProfessorJamil
@@ -0,0 +1,32 @@
+# Channel table for Professor Jamil - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4284
+
+# Physical channel 41 (virtual 3.1)
+[TV Anhanguera Goiânia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Quirinopolis b/isdb-t/br-go-Quirinopolis
index 4b091e34..72b58dc6 100644
--- a/isdb-t/br-go-Quirinopolis
+++ b/isdb-t/br-go-Quirinopolis
@@ -1,5 +1,5 @@
-# Channel table for Quirinópolis - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/571
+# Channel table for Quirin�polis - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=571
 
 # Physical channel 16 (virtual 10.1)
 [TV Anhanguera Rio Verde]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 19.1)
+# Physical channel 39 (virtual 5.1)
 [TV Serra Dourada]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-go-RioVerde b/isdb-t/br-go-RioVerde
index 479e286e..3be5f1fe 100644
--- a/isdb-t/br-go-RioVerde
+++ b/isdb-t/br-go-RioVerde
@@ -1,5 +1,5 @@
 # Channel table for Rio Verde - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/263
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=263
 
 # Physical channel 14 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-go-Rubiataba b/isdb-t/br-go-Rubiataba
index d8c74152..6dc32b51 100644
--- a/isdb-t/br-go-Rubiataba
+++ b/isdb-t/br-go-Rubiataba
@@ -1,5 +1,5 @@
 # Channel table for Rubiataba - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2698
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2698
 
 # Physical channel 22 (virtual 47.1)
 [Record TV Goiás]
diff --git a/isdb-t/br-go-Sanclerlandia b/isdb-t/br-go-Sanclerlandia
new file mode 100644
index 00000000..11668c9a
--- /dev/null
+++ b/isdb-t/br-go-Sanclerlandia
@@ -0,0 +1,32 @@
+# Channel table for Sanclerl�ndia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2723
+
+# Physical channel 19 (virtual 35.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-SantaBarbaraDeGoias b/isdb-t/br-go-SantaBarbaraDeGoias
new file mode 100644
index 00000000..4920c90c
--- /dev/null
+++ b/isdb-t/br-go-SantaBarbaraDeGoias
@@ -0,0 +1,32 @@
+# Channel table for Santa B�rbara De Go��s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4288
+
+# Physical channel 34 (virtual 2.1)
+[TV Anhanguera Goiânia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-SantaHelenaDeGoias b/isdb-t/br-go-SantaHelenaDeGoias
index b3f54a03..11cf0c82 100644
--- a/isdb-t/br-go-SantaHelenaDeGoias
+++ b/isdb-t/br-go-SantaHelenaDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Santa Helena De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2699
+# Channel table for Santa Helena De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2699
 
 # Physical channel 20 (virtual 47.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-SantaTerezaDeGoias b/isdb-t/br-go-SantaTerezaDeGoias
new file mode 100644
index 00000000..6a4d343d
--- /dev/null
+++ b/isdb-t/br-go-SantaTerezaDeGoias
@@ -0,0 +1,119 @@
+# Channel table for Santa Tereza De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2700
+
+# Physical channel 20 (virtual 3.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 8.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 23.1)
+[TV Serra Azul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 12.1)
+[TV Anhanguera Porangatu]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-SantaTerezinhaDeGoias b/isdb-t/br-go-SantaTerezinhaDeGoias
new file mode 100644
index 00000000..adfe8cc9
--- /dev/null
+++ b/isdb-t/br-go-SantaTerezinhaDeGoias
@@ -0,0 +1,32 @@
+# Channel table for Santa Terezinha De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2701
+
+# Physical channel 27 (virtual 21.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-SantoAntonioDeGoias b/isdb-t/br-go-SantoAntonioDeGoias
index 97615ee3..1bb85ffa 100644
--- a/isdb-t/br-go-SantoAntonioDeGoias
+++ b/isdb-t/br-go-SantoAntonioDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Santo Antônio De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3548
+# Channel table for Santo Ant�nio De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3548
 
 # Physical channel 15 (virtual 15.1)
 [TV UFG]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -262,3 +262,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.1)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-SantoAntonioDoDescoberto b/isdb-t/br-go-SantoAntonioDoDescoberto
index 90d47398..bfe88223 100644
--- a/isdb-t/br-go-SantoAntonioDoDescoberto
+++ b/isdb-t/br-go-SantoAntonioDoDescoberto
@@ -1,5 +1,5 @@
-# Channel table for Santo Antônio Do Descoberto - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/415
+# Channel table for Santo Ant�nio Do Descoberto - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=415
 
 # Physical channel 15 (virtual 2.4)
 [TV Brasil, TV Brasil 2, TV Escola, Canal Saúde]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 28 (virtual 6.1)
+[TV Brasília]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 53.2)
 [TV Justiça, Ponto Jus]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-go-SaoLuisDeMontesBelos b/isdb-t/br-go-SaoLuisDeMontesBelos
index 29fa4554..030a36ff 100644
--- a/isdb-t/br-go-SaoLuisDeMontesBelos
+++ b/isdb-t/br-go-SaoLuisDeMontesBelos
@@ -1,5 +1,5 @@
-# Channel table for São Luís De Montes Belos - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1525
+# Channel table for S�o Lu�s De Montes Belos - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1525
 
 # Physical channel 14 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-go-SaoMiguelDoAraguaia b/isdb-t/br-go-SaoMiguelDoAraguaia
index 0a79b92c..ce6bef3b 100644
--- a/isdb-t/br-go-SaoMiguelDoAraguaia
+++ b/isdb-t/br-go-SaoMiguelDoAraguaia
@@ -1,5 +1,5 @@
-# Channel table for São Miguel Do Araguaia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2702
+# Channel table for S�o Miguel Do Araguaia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2702
 
 # Physical channel 27 (virtual 6.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-SaoSimao b/isdb-t/br-go-SaoSimao
index 9009cf5a..ff5cfa2a 100644
--- a/isdb-t/br-go-SaoSimao
+++ b/isdb-t/br-go-SaoSimao
@@ -1,5 +1,5 @@
-# Channel table for São Simão - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1644
+# Channel table for S�o Sim�o - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1644
 
 # Physical channel 20 (virtual 6.1)
 [TV Serra Dourada]
diff --git a/isdb-t/br-go-SenadorCanedo b/isdb-t/br-go-SenadorCanedo
index 1f39c37f..5a8e8a3a 100644
--- a/isdb-t/br-go-SenadorCanedo
+++ b/isdb-t/br-go-SenadorCanedo
@@ -1,8 +1,8 @@
 # Channel table for Senador Canedo - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/131
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=131
 
-# Physical channel 14 (virtual 28.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
+# Physical channel 21 (virtual 6.1)
 [TV Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 40.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 61.4)
-[TV Câmara, TV Assembleia GO, TV Senado, TV Câmara Municipal Goiânia]
+# Physical channel 36 (virtual 3.4)
+[TV Câmara, TV Assembleia GO, TV Câmara Municipal Goiânia, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 32.1)
-[TV Luz da Vida]
+[Rede Capital]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -552,6 +552,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 50 (virtual 51.1)
 [TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-go-TerezopolisDeGoias b/isdb-t/br-go-TerezopolisDeGoias
index b804a01d..a4586a58 100644
--- a/isdb-t/br-go-TerezopolisDeGoias
+++ b/isdb-t/br-go-TerezopolisDeGoias
@@ -1,8 +1,8 @@
-# Channel table for Terezópolis De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3550
+# Channel table for Terez�polis De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3550
 
-# Physical channel 14 (virtual 28.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
+# Physical channel 21 (virtual 6.1)
 [TV Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 61.4)
-[TV Câmara, TV Assembleia GO, TV Senado, TV Câmara Municipal Goiânia]
+# Physical channel 36 (virtual 3.4)
+[TV Câmara, TV Assembleia GO, TV Câmara Municipal Goiânia, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -494,6 +494,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 50 (virtual 51.1)
 [TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-go-TresRanchos b/isdb-t/br-go-TresRanchos
new file mode 100644
index 00000000..f0e23d88
--- /dev/null
+++ b/isdb-t/br-go-TresRanchos
@@ -0,0 +1,32 @@
+# Channel table for Tr�s Ranchos - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4289
+
+# Physical channel 34 (virtual 7.1)
+[TV Anhanguera Catalão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Trindade b/isdb-t/br-go-Trindade
index 7dc68259..46835b0c 100644
--- a/isdb-t/br-go-Trindade
+++ b/isdb-t/br-go-Trindade
@@ -1,8 +1,8 @@
 # Channel table for Trindade - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3551
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3551
 
-# Physical channel 14 (virtual 28.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 19.1)
+[RBTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 20 (virtual 9.1)
 [TV Serra Dourada]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 21 (virtual 6.1)
+[TV Brasília]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 24.1)
 [PUC TV Goiás]
 	DELIVERY_SYSTEM = ISDBT
@@ -175,8 +233,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 36.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 26.1)
+[TV Sagres]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 29.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -291,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 61.4)
-[TV Câmara, TV Assembleia GO, TV Senado, TV Câmara Municipal Goiânia]
+# Physical channel 36 (virtual 3.4)
+[TV Câmara, TV Assembleia GO, TV Câmara Municipal Goiânia, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -320,6 +436,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 38.1)
+[TV Gazeta GO]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 42.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -349,11 +494,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 45.1)
-[TV Canção Nova]
+# Physical channel 43 (virtual 43.1)
+[Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[Rede Gênesis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -407,3 +581,90 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 48.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 51.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Trombas b/isdb-t/br-go-Trombas
new file mode 100644
index 00000000..dc7a6f59
--- /dev/null
+++ b/isdb-t/br-go-Trombas
@@ -0,0 +1,119 @@
+# Channel table for Trombas - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2680
+
+# Physical channel 20 (virtual 3.1)
+[TV Serra Dourada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 8.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 23.1)
+[TV Serra Azul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 12.1)
+[TV Anhanguera Porangatu]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-Turvania b/isdb-t/br-go-Turvania
index ddea8582..c455dbfa 100644
--- a/isdb-t/br-go-Turvania
+++ b/isdb-t/br-go-Turvania
@@ -1,5 +1,5 @@
-# Channel table for Turvânia - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2713
+# Channel table for Turv�nia - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2713
 
 # Physical channel 34 (virtual 55.1)
 [TV Anhanguera Goiânia]
diff --git a/isdb-t/br-go-Uruacu b/isdb-t/br-go-Uruacu
index 6471f1df..f3a439b0 100644
--- a/isdb-t/br-go-Uruacu
+++ b/isdb-t/br-go-Uruacu
@@ -1,5 +1,5 @@
-# Channel table for Uruaçu - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/426
+# Channel table for Urua�u - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=426
 
 # Physical channel 25 (virtual 25.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-go-ValparaisoDeGoias b/isdb-t/br-go-ValparaisoDeGoias
index 9b810c36..327902ce 100644
--- a/isdb-t/br-go-ValparaisoDeGoias
+++ b/isdb-t/br-go-ValparaisoDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Valparaíso De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/378
+# Channel table for Valpara�so De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=378
 
 # Physical channel 14 (virtual 2.2)
 [TV Brasil, TV Brasil 2]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-go-AguaLimpa b/isdb-t/br-go-aguaLimpa
index 65141e9a..1ce558c2 100644
--- a/isdb-t/br-go-AguaLimpa
+++ b/isdb-t/br-go-aguaLimpa
@@ -1,5 +1,5 @@
-# Channel table for Água Limpa - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1712
+# Channel table for �gua Limpa - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1712
 
 # Physical channel 21 (virtual 21.1)
 [TV Evangelizar]
diff --git a/isdb-t/br-go-AguasLindasDeGoias b/isdb-t/br-go-aguasLindasDeGoias
index 261df986..c332e2d5 100644
--- a/isdb-t/br-go-AguasLindasDeGoias
+++ b/isdb-t/br-go-aguasLindasDeGoias
@@ -1,5 +1,5 @@
-# Channel table for Águas Lindas De Goiás - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/739
+# Channel table for �guas Lindas De Goi�s - GO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=739
 
 # Physical channel 16 (virtual 22.1)
 [TV Anhanguera Luziânia]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 10.1)
-[Globo Brasília]
+[TV Globo Brasília]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 54.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-ma-Acailandia b/isdb-t/br-ma-Acailandia
index c514bc2a..9715d178 100644
--- a/isdb-t/br-ma-Acailandia
+++ b/isdb-t/br-ma-Acailandia
@@ -1,8 +1,8 @@
-# Channel table for Açailândia - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/231
+# Channel table for A�ail�ndia - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=231
 
-# Physical channel 30 (virtual 3.1)
-[TV Mirante Imperatriz]
+# Physical channel 30 (virtual 3.2)
+[TV Mirante Imperatriz, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 5.1)
+[TVI Açailândia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-Alcantara b/isdb-t/br-ma-Alcantara
index 12caaa70..14821c24 100644
--- a/isdb-t/br-ma-Alcantara
+++ b/isdb-t/br-ma-Alcantara
@@ -1,8 +1,8 @@
-# Channel table for Alcântara - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3271
+# Channel table for Alc�ntara - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3271
 
 # Physical channel 16 (virtual 16.1)
-[TV Universitária]
+[TV UFMA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -262,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 6.1)
+# Physical channel 36 (virtual 6.2)
 [TV Cidade/MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -378,35 +378,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV União]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 49 (virtual 48.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
@@ -436,7 +407,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-AmaranteDoMaranhao b/isdb-t/br-ma-AmaranteDoMaranhao
index 7dc67f30..b16fe22c 100644
--- a/isdb-t/br-ma-AmaranteDoMaranhao
+++ b/isdb-t/br-ma-AmaranteDoMaranhao
@@ -1,5 +1,5 @@
-# Channel table for Amarante Do Maranhão - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2079
+# Channel table for Amarante Do Maranh�o - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2079
 
 # Physical channel 49 (virtual 49.1)
 [TV Evangelizar]
diff --git a/isdb-t/br-ma-Araioses b/isdb-t/br-ma-Araioses
index 864142c2..abc4a3fb 100644
--- a/isdb-t/br-ma-Araioses
+++ b/isdb-t/br-ma-Araioses
@@ -1,5 +1,5 @@
 # Channel table for Araioses - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/666
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=666
 
 # Physical channel 21 (virtual 9.1)
 [TV Meio Norte]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 10.1)
-[TV Mirante]
+# Physical channel 31 (virtual 10.2)
+[TV Mirante, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 16.1)
-[Rede Vida]
+# Physical channel 39 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-ma-Axixa b/isdb-t/br-ma-Axixa
index 2d5fca23..31e64a73 100644
--- a/isdb-t/br-ma-Axixa
+++ b/isdb-t/br-ma-Axixa
@@ -1,5 +1,5 @@
-# Channel table for Axixá - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2083
+# Channel table for Axix� - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2083
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-Bacabal b/isdb-t/br-ma-Bacabal
index 464999b5..2c2588a9 100644
--- a/isdb-t/br-ma-Bacabal
+++ b/isdb-t/br-ma-Bacabal
@@ -1,5 +1,34 @@
 # Channel table for Bacabal - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/225
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=225
+
+# Physical channel 26 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 7.1)
 [TV Cidade Bacabal]
diff --git a/isdb-t/br-ma-Bacabeira b/isdb-t/br-ma-Bacabeira
index e4066d98..6e90f7be 100644
--- a/isdb-t/br-ma-Bacabeira
+++ b/isdb-t/br-ma-Bacabeira
@@ -1,5 +1,5 @@
 # Channel table for Bacabeira - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3334
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3334
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -262,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-Bacurituba b/isdb-t/br-ma-Bacurituba
index 029d1d9e..0fa26f50 100644
--- a/isdb-t/br-ma-Bacurituba
+++ b/isdb-t/br-ma-Bacurituba
@@ -1,5 +1,5 @@
 # Channel table for Bacurituba - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2769
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2769
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
diff --git a/isdb-t/br-ma-Balsas b/isdb-t/br-ma-Balsas
index 17a78565..c0330fc0 100644
--- a/isdb-t/br-ma-Balsas
+++ b/isdb-t/br-ma-Balsas
@@ -1,5 +1,5 @@
 # Channel table for Balsas - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/365
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=365
 
 # Physical channel 26 (virtual 13.1)
 [TV Boa Notícia]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 6.1)
-[TV Mirante Balsas]
+# Physical channel 31 (virtual 6.2)
+[TV Mirante Balsas, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 3.1)
+[TV Liberdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-BaraoDeGrajau b/isdb-t/br-ma-BaraoDeGrajau
index 3eddb586..1e7b2b93 100644
--- a/isdb-t/br-ma-BaraoDeGrajau
+++ b/isdb-t/br-ma-BaraoDeGrajau
@@ -1,5 +1,34 @@
-# Channel table for Barão De Grajaú - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1418
+# Channel table for Bar�o De Graja� - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1418
+
+# Physical channel 12
+[TV Difusora]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 207142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 7.1)
 [TV Meio Norte]
@@ -59,3 +88,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 12.1)
+[TV Difusora]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 18.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-BarraDoCorda b/isdb-t/br-ma-BarraDoCorda
new file mode 100644
index 00000000..7ee74e69
--- /dev/null
+++ b/isdb-t/br-ma-BarraDoCorda
@@ -0,0 +1,32 @@
+# Channel table for Barra Do Corda - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=477
+
+# Physical channel 38 (virtual 7.1)
+[TV Difusora]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-BelaVistaDoMaranhao b/isdb-t/br-ma-BelaVistaDoMaranhao
new file mode 100644
index 00000000..1a6c6b9c
--- /dev/null
+++ b/isdb-t/br-ma-BelaVistaDoMaranhao
@@ -0,0 +1,32 @@
+# Channel table for Bela Vista Do Maranh�o - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3440
+
+# Physical channel 38 (virtual 5.1)
+[TV Difusora Santa Inês]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-BomJardim b/isdb-t/br-ma-BomJardim
new file mode 100644
index 00000000..b5720451
--- /dev/null
+++ b/isdb-t/br-ma-BomJardim
@@ -0,0 +1,32 @@
+# Channel table for Bom Jardim - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3414
+
+# Physical channel 38 (virtual 5.1)
+[TV Difusora Santa Inês]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-BomJesusDasSelvas b/isdb-t/br-ma-BomJesusDasSelvas
new file mode 100644
index 00000000..7b0e7aed
--- /dev/null
+++ b/isdb-t/br-ma-BomJesusDasSelvas
@@ -0,0 +1,32 @@
+# Channel table for Bom Jesus Das Selvas - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3412
+
+# Physical channel 17 (virtual 17.1)
+[TV Cidade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-BuritiBravo b/isdb-t/br-ma-BuritiBravo
new file mode 100644
index 00000000..0fbe00f2
--- /dev/null
+++ b/isdb-t/br-ma-BuritiBravo
@@ -0,0 +1,32 @@
+# Channel table for Buriti Bravo - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1553
+
+# Physical channel 14 (virtual 14.1)
+[TV Meio Norte]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-CachoeiraGrande b/isdb-t/br-ma-CachoeiraGrande
index 223c068d..354775bc 100644
--- a/isdb-t/br-ma-CachoeiraGrande
+++ b/isdb-t/br-ma-CachoeiraGrande
@@ -1,5 +1,5 @@
 # Channel table for Cachoeira Grande - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3265
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3265
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-Cajapio b/isdb-t/br-ma-Cajapio
index 3b3cec83..a1db4f41 100644
--- a/isdb-t/br-ma-Cajapio
+++ b/isdb-t/br-ma-Cajapio
@@ -1,5 +1,5 @@
-# Channel table for Cajapió - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3354
+# Channel table for Cajapi� - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3354
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -175,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-Caxias b/isdb-t/br-ma-Caxias
index 7d814326..8edf50ac 100644
--- a/isdb-t/br-ma-Caxias
+++ b/isdb-t/br-ma-Caxias
@@ -1,5 +1,5 @@
 # Channel table for Caxias - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/94
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=94
 
 # Physical channel 22 (virtual 10.1)
 [TV Guanaré]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 20.1)
-[Rede Vida]
+# Physical channel 26 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 8.1)
-[TV Mirante Cocais]
+# Physical channel 28 (virtual 8.2)
+[TV Mirante Cocais, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-ma-Codo b/isdb-t/br-ma-Codo
index 8187a21e..7f90cf5f 100644
--- a/isdb-t/br-ma-Codo
+++ b/isdb-t/br-ma-Codo
@@ -1,8 +1,8 @@
-# Channel table for Codó - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/166
+# Channel table for Cod� - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=166
 
-# Physical channel 29 (virtual 9.1)
-[TV Mirante Cocais]
+# Physical channel 29 (virtual 9.2)
+[TV Mirante Cocais, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-ma-CoelhoNeto b/isdb-t/br-ma-CoelhoNeto
new file mode 100644
index 00000000..d944c76a
--- /dev/null
+++ b/isdb-t/br-ma-CoelhoNeto
@@ -0,0 +1,32 @@
+# Channel table for Coelho Neto - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=409
+
+# Physical channel 38 (virtual 8.1)
+[TV Difusora]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-Coroata b/isdb-t/br-ma-Coroata
index 24865ff5..9c185e52 100644
--- a/isdb-t/br-ma-Coroata
+++ b/isdb-t/br-ma-Coroata
@@ -1,5 +1,34 @@
-# Channel table for Coroatá - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/264
+# Channel table for Coroat� - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=264
+
+# Physical channel 26 (virtual 37.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 4.1)
 [TV Cidade Coroatá]
diff --git a/isdb-t/br-ma-Davinopolis b/isdb-t/br-ma-Davinopolis
index 17420cbf..57b7c362 100644
--- a/isdb-t/br-ma-Davinopolis
+++ b/isdb-t/br-ma-Davinopolis
@@ -1,5 +1,5 @@
-# Channel table for Davinópolis - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3343
+# Channel table for Davin�polis - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3343
 
 # Physical channel 18 (virtual 4.1)
 [TV Imperatriz]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[TV Meio Norte]
+[ImperaNews TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 20.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 23 (virtual 23.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 16.1)
-[TV Anajás]
+# Physical channel 26 (virtual 26.3)
+[TV Anajás, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -175,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[Band Maranhão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 14.1)
 [TV Cidade Esperança]
 	DELIVERY_SYSTEM = ISDBT
@@ -291,3 +349,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[TV Tapajós]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-HumbertoDeCampos b/isdb-t/br-ma-HumbertoDeCampos
index aa6f61a2..6f2a201a 100644
--- a/isdb-t/br-ma-HumbertoDeCampos
+++ b/isdb-t/br-ma-HumbertoDeCampos
@@ -1,5 +1,5 @@
 # Channel table for Humberto De Campos - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3261
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3261
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-Icatu b/isdb-t/br-ma-Icatu
index daf3f0bc..ef838e28 100644
--- a/isdb-t/br-ma-Icatu
+++ b/isdb-t/br-ma-Icatu
@@ -1,8 +1,8 @@
 # Channel table for Icatu - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3369
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3369
 
 # Physical channel 16 (virtual 16.1)
-[TV Universitária]
+[TV UFMA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[Rede Gênesis]
+# Physical channel 25 (virtual 26.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 27 (virtual 27.1)
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.1)
-[Band Maranhão]
+# Physical channel 28 (virtual 28.1)
+[TV Meio Norte MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.1)
-[TV Meio Norte MA]
+# Physical channel 29 (virtual 10.2)
+[TV Mirante, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 10.1)
-[TV Mirante]
+# Physical channel 34 (virtual 2.4)
+[TV Brasil Maranhão, TV Brasil 2, TV IFMA, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 6.1)
+# Physical channel 36 (virtual 6.2)
 [TV Cidade/MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 39.1)
-[TV Athenas]
+# Physical channel 40 (virtual 39.2)
+[Rede Mundial São Luís, TV Athenas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -407,6 +407,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 42.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 43 (virtual 43.1)
 [TV Nazaré São Luís]
 	DELIVERY_SYSTEM = ISDBT
@@ -523,7 +552,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-IgarapeDoMeio b/isdb-t/br-ma-IgarapeDoMeio
new file mode 100644
index 00000000..a6b4cab6
--- /dev/null
+++ b/isdb-t/br-ma-IgarapeDoMeio
@@ -0,0 +1,32 @@
+# Channel table for Igarap� Do Meio - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4358
+
+# Physical channel 38 (virtual 5.1)
+[TV Difusora Santa Inês]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-Imperatriz b/isdb-t/br-ma-Imperatriz
index 7e72babc..8b6154b9 100644
--- a/isdb-t/br-ma-Imperatriz
+++ b/isdb-t/br-ma-Imperatriz
@@ -1,5 +1,5 @@
 # Channel table for Imperatriz - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/123
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=123
 
 # Physical channel 18 (virtual 4.1)
 [TV Imperatriz]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[TV Meio Norte]
+[ImperaNews TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 20.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 23 (virtual 23.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 16.1)
-[TV Anajás]
+# Physical channel 26 (virtual 26.3)
+[TV Anajás, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 10.1)
-[TV Mirante]
+# Physical channel 29 (virtual 10.2)
+[TV Mirante, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -175,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[Band Maranhão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 14.1)
 [TV Cidade Esperança]
 	DELIVERY_SYSTEM = ISDBT
@@ -291,3 +349,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[TV Tapajós]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-JoaoLisboa b/isdb-t/br-ma-JoaoLisboa
index edb2d4c9..f33e3eac 100644
--- a/isdb-t/br-ma-JoaoLisboa
+++ b/isdb-t/br-ma-JoaoLisboa
@@ -1,5 +1,5 @@
-# Channel table for João Lisboa - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3344
+# Channel table for Jo�o Lisboa - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3344
 
 # Physical channel 18 (virtual 4.1)
 [TV Imperatriz]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[TV Meio Norte]
+[ImperaNews TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 20.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 23 (virtual 23.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -175,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[Band Maranhão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 14.1)
 [TV Cidade Esperança]
 	DELIVERY_SYSTEM = ISDBT
@@ -291,3 +349,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[TV Tapajós]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-Mirador b/isdb-t/br-ma-Mirador
new file mode 100644
index 00000000..b3017bdc
--- /dev/null
+++ b/isdb-t/br-ma-Mirador
@@ -0,0 +1,32 @@
+# Channel table for Mirador - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2175
+
+# Physical channel 38 (virtual 3.1)
+[TV Difusora]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-Moncao b/isdb-t/br-ma-Moncao
new file mode 100644
index 00000000..c5c8b4e4
--- /dev/null
+++ b/isdb-t/br-ma-Moncao
@@ -0,0 +1,32 @@
+# Channel table for Mon��o - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4359
+
+# Physical channel 38 (virtual 5.1)
+[TV Difusora Santa Inês]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-Morros b/isdb-t/br-ma-Morros
index e0e28860..cb4ebf88 100644
--- a/isdb-t/br-ma-Morros
+++ b/isdb-t/br-ma-Morros
@@ -1,5 +1,5 @@
 # Channel table for Morros - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3266
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3266
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-PacoDoLumiar b/isdb-t/br-ma-PacoDoLumiar
index 37c668d2..e6f77430 100644
--- a/isdb-t/br-ma-PacoDoLumiar
+++ b/isdb-t/br-ma-PacoDoLumiar
@@ -1,8 +1,8 @@
-# Channel table for Paço Do Lumiar - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3258
+# Channel table for Pa�o Do Lumiar - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3258
 
 # Physical channel 16 (virtual 16.1)
-[TV Universitária]
+[TV UFMA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[Rede Gênesis]
+# Physical channel 25 (virtual 26.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 27 (virtual 27.1)
+[Band Maranhão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.1)
-[Band Maranhão]
+# Physical channel 28 (virtual 28.1)
+[TV Meio Norte MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.1)
-[TV Meio Norte MA]
+# Physical channel 29 (virtual 10.2)
+[TV Mirante, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 10.1)
-[TV Mirante]
+# Physical channel 34 (virtual 2.4)
+[TV Brasil Maranhão, TV Brasil 2, TV IFMA, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 6.1)
+# Physical channel 36 (virtual 6.2)
 [TV Cidade/MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 39.1)
-[TV Athenas]
+# Physical channel 40 (virtual 39.2)
+[Rede Mundial São Luís, TV Athenas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -436,11 +436,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 43.1)
-[TV Nazaré São Luís]
+# Physical channel 42 (virtual 42.1)
+[TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -465,11 +465,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 44.1)
-[TV Piracambu]
+# Physical channel 43 (virtual 43.1)
+[TV Nazaré São Luís]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -494,11 +494,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV União]
+# Physical channel 45 (virtual 44.1)
+[TV Piracambu]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -552,7 +552,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-Pedreiras b/isdb-t/br-ma-Pedreiras
index 9dc272ae..3fcec2a2 100644
--- a/isdb-t/br-ma-Pedreiras
+++ b/isdb-t/br-ma-Pedreiras
@@ -1,8 +1,8 @@
 # Channel table for Pedreiras - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1411
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1411
 
-# Physical channel 41 (virtual 11.1)
-[TV Cidade]
+# Physical channel 41 (virtual 11.2)
+[TV Cidade, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-ma-Pindare-mirim b/isdb-t/br-ma-Pindare-mirim
index 7fee4fff..1fc3a255 100644
--- a/isdb-t/br-ma-Pindare-mirim
+++ b/isdb-t/br-ma-Pindare-mirim
@@ -1,8 +1,8 @@
-# Channel table for Pindaré-mirim - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3346
+# Channel table for Pindar�-mirim - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3346
 
-# Physical channel 19 (virtual 10.1)
-[TV Eldorado]
+# Physical channel 19 (virtual 19.1)
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -88,3 +88,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 5.1)
+[TV Difusora Santa Inês]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 50.1)
+[TV Mídia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-Pinheiro b/isdb-t/br-ma-Pinheiro
index f98f8992..b7939b67 100644
--- a/isdb-t/br-ma-Pinheiro
+++ b/isdb-t/br-ma-Pinheiro
@@ -1,8 +1,37 @@
 # Channel table for Pinheiro - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/154
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=154
 
-# Physical channel 29 (virtual 19.1)
-[TV Mirante Cocais]
+# Physical channel 17 (virtual 9.1)
+[TV Pericumã]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 19.2)
+[TV Mirante Cocais, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -30,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 3.1)
+[TV Difusora]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-PioXii b/isdb-t/br-ma-PioXii
new file mode 100644
index 00000000..02a8c968
--- /dev/null
+++ b/isdb-t/br-ma-PioXii
@@ -0,0 +1,32 @@
+# Channel table for Pio Xii - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3358
+
+# Physical channel 38 (virtual 5.1)
+[TV Difusora Santa Inês]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-PresidenteJuscelino b/isdb-t/br-ma-PresidenteJuscelino
index 4d3cace8..bf198c39 100644
--- a/isdb-t/br-ma-PresidenteJuscelino
+++ b/isdb-t/br-ma-PresidenteJuscelino
@@ -1,5 +1,5 @@
 # Channel table for Presidente Juscelino - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3263
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3263
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-PrimeiraCruz b/isdb-t/br-ma-PrimeiraCruz
index 678b6165..510b0bc6 100644
--- a/isdb-t/br-ma-PrimeiraCruz
+++ b/isdb-t/br-ma-PrimeiraCruz
@@ -1,5 +1,5 @@
 # Channel table for Primeira Cruz - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3259
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3259
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-Raposa b/isdb-t/br-ma-Raposa
index eda291d6..e16f6288 100644
--- a/isdb-t/br-ma-Raposa
+++ b/isdb-t/br-ma-Raposa
@@ -1,8 +1,8 @@
 # Channel table for Raposa - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3269
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3269
 
 # Physical channel 16 (virtual 16.1)
-[TV Universitária]
+[TV UFMA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[Rede Gênesis]
+# Physical channel 25 (virtual 26.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 27 (virtual 27.1)
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.1)
-[Band Maranhão]
+# Physical channel 28 (virtual 28.1)
+[TV Meio Norte MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.1)
-[TV Meio Norte MA]
+# Physical channel 29 (virtual 10.2)
+[TV Mirante, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 10.1)
-[TV Mirante]
+# Physical channel 34 (virtual 2.4)
+[TV Brasil Maranhão, TV Brasil 2, TV IFMA, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 6.1)
+# Physical channel 36 (virtual 6.2)
 [TV Cidade/MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 39.1)
-[TV Athenas]
+# Physical channel 40 (virtual 39.2)
+[Rede Mundial São Luís, TV Athenas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -407,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 43.1)
-[TV Nazaré São Luís]
+# Physical channel 42 (virtual 42.1)
+[TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -436,11 +436,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 44.1)
-[TV Piracambu]
+# Physical channel 43 (virtual 43.1)
+[TV Nazaré São Luís]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -465,11 +465,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV União]
+# Physical channel 45 (virtual 44.1)
+[TV Piracambu]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -523,7 +523,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-Rosario b/isdb-t/br-ma-Rosario
index fe915571..0df5add5 100644
--- a/isdb-t/br-ma-Rosario
+++ b/isdb-t/br-ma-Rosario
@@ -1,5 +1,5 @@
-# Channel table for Rosário - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/504
+# Channel table for Ros�rio - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=504
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -262,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-SantaInes b/isdb-t/br-ma-SantaInes
index 301bbd1f..54b4dbdd 100644
--- a/isdb-t/br-ma-SantaInes
+++ b/isdb-t/br-ma-SantaInes
@@ -1,8 +1,8 @@
-# Channel table for Santa Inês - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/275
+# Channel table for Santa In�s - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=275
 
-# Physical channel 19 (virtual 10.1)
-[TV Eldorado]
+# Physical channel 19 (virtual 19.1)
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 13.1)
-[TV Mirante Santa Inês]
+# Physical channel 29 (virtual 13.2)
+[TV Mirante Santa Inês, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -88,3 +88,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 5.1)
+[TV Difusora Santa Inês]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 50.1)
+[TV Mídia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-SantaQuiteriaDoMaranhao b/isdb-t/br-ma-SantaQuiteriaDoMaranhao
index 35912078..fcc56154 100644
--- a/isdb-t/br-ma-SantaQuiteriaDoMaranhao
+++ b/isdb-t/br-ma-SantaQuiteriaDoMaranhao
@@ -1,5 +1,5 @@
-# Channel table for Santa Quitéria Do Maranhão - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3891
+# Channel table for Santa Quit�ria Do Maranh�o - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3891
 
 # Physical channel 27 (virtual 44.1)
 [O Dia TV]
diff --git a/isdb-t/br-ma-SantaRita b/isdb-t/br-ma-SantaRita
index 5eb38603..4b91aaf2 100644
--- a/isdb-t/br-ma-SantaRita
+++ b/isdb-t/br-ma-SantaRita
@@ -1,5 +1,34 @@
 # Channel table for Santa Rita - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/465
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=465
+
+# Physical channel 20 (virtual 9.1)
+[VTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
diff --git a/isdb-t/br-ma-SaoBento b/isdb-t/br-ma-SaoBento
index 6e37ed3e..c872fe10 100644
--- a/isdb-t/br-ma-SaoBento
+++ b/isdb-t/br-ma-SaoBento
@@ -1,8 +1,8 @@
-# Channel table for São Bento - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2533
+# Channel table for S�o Bento - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2533
 
-# Physical channel 29 (virtual 10.1)
-[TV Mirante]
+# Physical channel 29 (virtual 10.2)
+[TV Mirante, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -30,3 +30,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 4.2)
+[TV Difusora, Canal em teste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 40.1)
+[TV São Bento]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-SaoJoaoBatista b/isdb-t/br-ma-SaoJoaoBatista
index 5337cba9..4402b78d 100644
--- a/isdb-t/br-ma-SaoJoaoBatista
+++ b/isdb-t/br-ma-SaoJoaoBatista
@@ -1,5 +1,5 @@
-# Channel table for São João Batista - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3352
+# Channel table for S�o Jo�o Batista - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3352
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -175,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-SaoJoseDeRibamar b/isdb-t/br-ma-SaoJoseDeRibamar
index d627ffe3..351c6a36 100644
--- a/isdb-t/br-ma-SaoJoseDeRibamar
+++ b/isdb-t/br-ma-SaoJoseDeRibamar
@@ -1,8 +1,8 @@
-# Channel table for São José De Ribamar - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3257
+# Channel table for S�o Jos� De Ribamar - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3257
 
 # Physical channel 16 (virtual 16.1)
-[TV Universitária]
+[TV UFMA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[Rede Gênesis]
+# Physical channel 25 (virtual 26.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 27 (virtual 27.1)
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.1)
-[Band Maranhão]
+# Physical channel 28 (virtual 28.1)
+[TV Meio Norte MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.1)
-[TV Meio Norte MA]
+# Physical channel 29 (virtual 10.2)
+[TV Mirante, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 10.1)
-[TV Mirante]
+# Physical channel 34 (virtual 2.4)
+[TV Brasil Maranhão, TV Brasil 2, TV IFMA, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 6.1)
+# Physical channel 36 (virtual 6.2)
 [TV Cidade/MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 39.1)
-[TV Athenas]
+# Physical channel 40 (virtual 39.2)
+[Rede Mundial São Luís, TV Athenas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -436,11 +436,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 43.1)
-[TV Nazaré São Luís]
+# Physical channel 42 (virtual 42.1)
+[TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -465,11 +465,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 44.1)
-[TV Piracambu]
+# Physical channel 43 (virtual 43.1)
+[TV Nazaré São Luís]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -494,11 +494,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV União]
+# Physical channel 45 (virtual 44.1)
+[TV Piracambu]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -552,7 +552,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-SaoLuis b/isdb-t/br-ma-SaoLuis
index b6ec2676..d828c64e 100644
--- a/isdb-t/br-ma-SaoLuis
+++ b/isdb-t/br-ma-SaoLuis
@@ -1,5 +1,5 @@
-# Channel table for São Luís - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/142
+# Channel table for S�o Lu�s - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=142
 
 # Physical channel 15 (virtual 15.1)
 [Band Maranhão]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[TV Universitária]
+[TV UFMA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 19.1)
+# Physical channel 20 (virtual 19.1)
 [TV Alternativa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[Rede Gênesis]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 27 (virtual 27.1)
+[Band Ceará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 10.1)
-[TV Mirante]
+# Physical channel 29 (virtual 10.2)
+[TV Mirante, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 2.2)
-[TV Brasil Maranhão, TV Brasil 2]
+# Physical channel 34 (virtual 2.4)
+[TV Brasil Maranhão, TV Brasil 2, TV IFMA, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -349,7 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 6.1)
+# Physical channel 36 (virtual 6.2)
 [TV Cidade/MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 4.1)
-[TV Difusora]
+# Physical channel 38 (virtual 4.2)
+[TV Difusora, Canal em teste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 39.1)
-[TV Athenas]
+# Physical channel 40 (virtual 39.2)
+[Rede Mundial São Luís, TV Athenas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -465,6 +465,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 42.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 43 (virtual 43.1)
 [TV Nazaré São Luís]
 	DELIVERY_SYSTEM = ISDBT
@@ -581,7 +610,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-SaoVicenteFerrer b/isdb-t/br-ma-SaoVicenteFerrer
index 5390d259..bedbd0f7 100644
--- a/isdb-t/br-ma-SaoVicenteFerrer
+++ b/isdb-t/br-ma-SaoVicenteFerrer
@@ -1,5 +1,5 @@
-# Channel table for São Vicente Ferrer - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3353
+# Channel table for S�o Vicente Ferrer - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3353
 
 # Physical channel 22 (virtual 23.1)
 [TV Guará]
@@ -175,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.3)
+# Physical channel 51 (virtual 9.3)
 [TV Senado, TV Assembleia MA, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ma-SenadorLaRocque b/isdb-t/br-ma-SenadorLaRocque
index 89126303..1c6499ce 100644
--- a/isdb-t/br-ma-SenadorLaRocque
+++ b/isdb-t/br-ma-SenadorLaRocque
@@ -1,5 +1,5 @@
 # Channel table for Senador La Rocque - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3345
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3345
 
 # Physical channel 18 (virtual 4.1)
 [TV Imperatriz]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
-[TV Meio Norte]
+[ImperaNews TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 20.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 23 (virtual 23.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -175,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[Band Maranhão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 14.1)
 [TV Cidade Esperança]
 	DELIVERY_SYSTEM = ISDBT
@@ -291,3 +349,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[TV Tapajós]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-Timon b/isdb-t/br-ma-Timon
index 089f1e26..5b9a2259 100644
--- a/isdb-t/br-ma-Timon
+++ b/isdb-t/br-ma-Timon
@@ -1,5 +1,5 @@
 # Channel table for Timon - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1736
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1736
 
 # Physical channel 17 (virtual 16.1)
 [TV Assembleia PI]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 20.1)
-[TV Jornal Meio Norte]
+[TV Jornal]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[TV Cidade Verde]
+# Physical channel 28 (virtual 5.2)
+[TV Cidade Verde, Cidade Verde FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 14.1)
-[TV Mirante Cocais]
+# Physical channel 29 (virtual 14.2)
+[TV Mirante Cocais, TV Educação MA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 40.1)
-[Rede Vida]
+# Physical channel 39 (virtual 40.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -466,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -523,35 +523,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 51 (virtual 50.1)
 [Rede Século 21]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ma-TrizidelaDoVale b/isdb-t/br-ma-TrizidelaDoVale
index 58a625ef..27a86e8d 100644
--- a/isdb-t/br-ma-TrizidelaDoVale
+++ b/isdb-t/br-ma-TrizidelaDoVale
@@ -1,5 +1,5 @@
 # Channel table for Trizidela Do Vale - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1412
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1412
 
 # Physical channel 41 (virtual 11.1)
 [TV Cidade]
diff --git a/isdb-t/br-ma-Tufilandia b/isdb-t/br-ma-Tufilandia
new file mode 100644
index 00000000..6509fc89
--- /dev/null
+++ b/isdb-t/br-ma-Tufilandia
@@ -0,0 +1,32 @@
+# Channel table for Tufil�ndia - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3069
+
+# Physical channel 38 (virtual 5.1)
+[TV Difusora Santa Inês]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ma-VargemGrande b/isdb-t/br-ma-VargemGrande
index 66cb5ee1..4ba0ec8c 100644
--- a/isdb-t/br-ma-VargemGrande
+++ b/isdb-t/br-ma-VargemGrande
@@ -1,5 +1,5 @@
 # Channel table for Vargem Grande - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/694
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=694
 
 # Physical channel 40 (virtual 40.1)
 [Nova TV]
diff --git a/isdb-t/br-ma-Viana b/isdb-t/br-ma-Viana
index 947fa176..a3045dbf 100644
--- a/isdb-t/br-ma-Viana
+++ b/isdb-t/br-ma-Viana
@@ -1,5 +1,5 @@
 # Channel table for Viana - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/658
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=658
 
 # Physical channel 26 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-ma-ZeDoca b/isdb-t/br-ma-ZeDoca
index aed40529..0a8c97da 100644
--- a/isdb-t/br-ma-ZeDoca
+++ b/isdb-t/br-ma-ZeDoca
@@ -1,5 +1,5 @@
-# Channel table for Zé Doca - MA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2500
+# Channel table for Z� Doca - MA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2500
 
 # Physical channel 26 (virtual 12.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-Aguanil b/isdb-t/br-mg-Aguanil
index 261b9e42..d5d9eda5 100644
--- a/isdb-t/br-mg-Aguanil
+++ b/isdb-t/br-mg-Aguanil
@@ -1,5 +1,5 @@
 # Channel table for Aguanil - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3416
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3416
 
 # Physical channel 42 (virtual 5.1)
 [EPTV Sul de Minas]
diff --git a/isdb-t/br-mg-Aimores b/isdb-t/br-mg-Aimores
new file mode 100644
index 00000000..cf3919a7
--- /dev/null
+++ b/isdb-t/br-mg-Aimores
@@ -0,0 +1,32 @@
+# Channel table for Aimor�s - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4101
+
+# Physical channel 31 (virtual 31.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Alfenas b/isdb-t/br-mg-Alfenas
index 8a0c5d97..69cada0f 100644
--- a/isdb-t/br-mg-Alfenas
+++ b/isdb-t/br-mg-Alfenas
@@ -1,5 +1,5 @@
 # Channel table for Alfenas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/31
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=31
 
 # Physical channel 23 (virtual 30.1)
 [TV Alterosa Sul]
diff --git a/isdb-t/br-mg-Almenara b/isdb-t/br-mg-Almenara
index 35522e9c..9a3ad434 100644
--- a/isdb-t/br-mg-Almenara
+++ b/isdb-t/br-mg-Almenara
@@ -1,5 +1,34 @@
 # Channel table for Almenara - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/591
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=591
+
+# Physical channel 21 (virtual 9.1)
+[InterTV dos Vales]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 26.1)
 [Rede Vida]
@@ -30,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 11.1)
+[TV Alterosa Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Alpinopolis b/isdb-t/br-mg-Alpinopolis
index cb1b4a47..d63af080 100644
--- a/isdb-t/br-mg-Alpinopolis
+++ b/isdb-t/br-mg-Alpinopolis
@@ -1,5 +1,5 @@
-# Channel table for Alpinópolis - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3683
+# Channel table for Alpin�polis - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3683
 
 # Physical channel 39 (virtual 18.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Alterosa b/isdb-t/br-mg-Alterosa
new file mode 100644
index 00000000..42a37d31
--- /dev/null
+++ b/isdb-t/br-mg-Alterosa
@@ -0,0 +1,32 @@
+# Channel table for Alterosa - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3508
+
+# Physical channel 34 (virtual 34.1)
+[TV Alfenas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Andradas b/isdb-t/br-mg-Andradas
index c33d29b6..6044ff2d 100644
--- a/isdb-t/br-mg-Andradas
+++ b/isdb-t/br-mg-Andradas
@@ -1,5 +1,34 @@
 # Channel table for Andradas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1442
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1442
+
+# Physical channel 23 (virtual 56.1)
+[TV Alterosa Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 54.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Aracai b/isdb-t/br-mg-Aracai
index f9bcc6a7..becabcc7 100644
--- a/isdb-t/br-mg-Aracai
+++ b/isdb-t/br-mg-Aracai
@@ -1,5 +1,5 @@
-# Channel table for Araçaí - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3620
+# Channel table for Ara�a� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3620
 
 # Physical channel 17 (virtual 17.2)
 [Rede Minas]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-Aracuai b/isdb-t/br-mg-Aracuai
index 2dea4208..d18ded34 100644
--- a/isdb-t/br-mg-Aracuai
+++ b/isdb-t/br-mg-Aracuai
@@ -1,5 +1,5 @@
-# Channel table for Araçuaí - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/280
+# Channel table for Ara�ua� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=280
 
 # Physical channel 42 (virtual 5.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Araguari b/isdb-t/br-mg-Araguari
index 3b1867c5..48ff452f 100644
--- a/isdb-t/br-mg-Araguari
+++ b/isdb-t/br-mg-Araguari
@@ -1,5 +1,5 @@
 # Channel table for Araguari - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/215
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=215
 
 # Physical channel 23 (virtual 23.1)
 [Rede Vida]
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 6.1)
+# Physical channel 33 (virtual 6.1)
 [TV Vitoriosa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-mg-Arapora b/isdb-t/br-mg-Arapora
index 14d2b251..63113994 100644
--- a/isdb-t/br-mg-Arapora
+++ b/isdb-t/br-mg-Arapora
@@ -1,5 +1,5 @@
-# Channel table for Araporã - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/556
+# Channel table for Arapor� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=556
 
 # Physical channel 16 (virtual 11.1)
 [TV Anhanguera Itumbiara]
diff --git a/isdb-t/br-mg-Araxa b/isdb-t/br-mg-Araxa
index 3df702c5..ba051f2c 100644
--- a/isdb-t/br-mg-Araxa
+++ b/isdb-t/br-mg-Araxa
@@ -1,5 +1,5 @@
-# Channel table for Araxá - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/178
+# Channel table for Arax� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=178
 
 # Physical channel 19 (virtual 19.1)
 [Rede Século 21]
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 34.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 3.1)
 [TV Sintonia]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-Arcos b/isdb-t/br-mg-Arcos
index bf9c6924..0c0d597b 100644
--- a/isdb-t/br-mg-Arcos
+++ b/isdb-t/br-mg-Arcos
@@ -1,5 +1,34 @@
 # Channel table for Arcos - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/576
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=576
+
+# Physical channel 34 (virtual 34.1)
+[TV Alterosa Divinópolis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 53.1)
 [TV Canção Nova]
@@ -30,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[Rede Super]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Arinos b/isdb-t/br-mg-Arinos
index 90f0e55d..dadfccf1 100644
--- a/isdb-t/br-mg-Arinos
+++ b/isdb-t/br-mg-Arinos
@@ -1,5 +1,34 @@
 # Channel table for Arinos - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3240
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3240
+
+# Physical channel 18 (virtual 18.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 12.1)
 [Rede Vida]
@@ -30,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 26 (virtual 26.1)
+[TV Rio Preto]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Baldim b/isdb-t/br-mg-Baldim
index 5f769a02..2c66c725 100644
--- a/isdb-t/br-mg-Baldim
+++ b/isdb-t/br-mg-Baldim
@@ -1,5 +1,5 @@
 # Channel table for Baldim - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3625
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3625
 
 # Physical channel 17 (virtual 17.2)
 [Rede Minas]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-Bambui b/isdb-t/br-mg-Bambui
index 3e03fdc6..7608aaf1 100644
--- a/isdb-t/br-mg-Bambui
+++ b/isdb-t/br-mg-Bambui
@@ -1,5 +1,5 @@
-# Channel table for Bambuí - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/720
+# Channel table for Bambu� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=720
 
 # Physical channel 42 (virtual 59.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-BaraoDeCocais b/isdb-t/br-mg-BaraoDeCocais
index 47125228..25aaa143 100644
--- a/isdb-t/br-mg-BaraoDeCocais
+++ b/isdb-t/br-mg-BaraoDeCocais
@@ -1,5 +1,5 @@
-# Channel table for Barão De Cocais - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4007
+# Channel table for Bar�o De Cocais - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4007
 
 # Physical channel 28 (virtual 2.1)
 [Record TV Minas]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 7.1)
+[TV Globo Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Barbacena b/isdb-t/br-mg-Barbacena
index 04c11d58..ccbb02ed 100644
--- a/isdb-t/br-mg-Barbacena
+++ b/isdb-t/br-mg-Barbacena
@@ -1,5 +1,5 @@
 # Channel table for Barbacena - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/132
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=132
 
 # Physical channel 24 (virtual 6.1)
 [Rede Vida]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 8.1)
+# Physical channel 30 (virtual 5.1)
 [TV Integração Juiz de Fora]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.1)
-[TV Diversa]
+# Physical channel 42 (virtual 14.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 14.1)
-[TV Canção Nova]
+# Physical channel 43 (virtual 43.1)
+[TV Diversa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-mg-Barroso b/isdb-t/br-mg-Barroso
index 7444ec5e..6e7aabfb 100644
--- a/isdb-t/br-mg-Barroso
+++ b/isdb-t/br-mg-Barroso
@@ -1,5 +1,5 @@
 # Channel table for Barroso - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1155
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1155
 
 # Physical channel 24 (virtual 20.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-BeloHorizonte b/isdb-t/br-mg-BeloHorizonte
index bc70f78c..a23d505c 100644
--- a/isdb-t/br-mg-BeloHorizonte
+++ b/isdb-t/br-mg-BeloHorizonte
@@ -1,8 +1,8 @@
 # Channel table for Belo Horizonte - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/23
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=23
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
-[TV Novo Tempo]
+[Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede Gênesis]
+# Physical channel 23 (virtual 59.1)
+[TV Centro Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 59.1)
-[TV Centro Minas]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[RBI TV]
+# Physical channel 26 (virtual 52.1)
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 27 (virtual 31.1)
+[TV A Crítica Belo Horizonte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 52.1)
-[RCI Minas]
+# Physical channel 28 (virtual 2.1)
+[Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 2.1)
-[Record TV Minas]
+# Physical channel 29 (virtual 29.1)
+[Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 30.1)
-[TV Horizonte]
+# Physical channel 30 (virtual 30.2)
+[TV Horizonte, TV Horizonte Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[Rede Super]
+[TV WSN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -523,6 +523,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 39.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 40 (virtual 40.1)
 [TV Diversa]
 	DELIVERY_SYSTEM = ISDBT
@@ -639,8 +668,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
-[TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
+# Physical channel 45 (virtual 11.5)
+[TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -668,8 +697,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 50.1)
-[Rede Bênção]
+# Physical channel 48 (virtual 49.1)
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
@@ -697,8 +726,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede Vida]
+# Physical channel 49 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-BeloVale b/isdb-t/br-mg-BeloVale
index 2f6364a7..30bb12e0 100644
--- a/isdb-t/br-mg-BeloVale
+++ b/isdb-t/br-mg-BeloVale
@@ -1,5 +1,5 @@
 # Channel table for Belo Vale - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3900
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3900
 
 # Physical channel 15 (virtual 2.1)
 [Record TV Minas]
diff --git a/isdb-t/br-mg-Betim b/isdb-t/br-mg-Betim
index 45466685..d1fe2864 100644
--- a/isdb-t/br-mg-Betim
+++ b/isdb-t/br-mg-Betim
@@ -1,37 +1,8 @@
 # Channel table for Betim - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/196
-
-# Physical channel 13 (virtual 12.1)
-[Globo Minas]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 213142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=196
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -60,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 9.1)
+# Physical channel 17 (virtual 9.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
-[TV Novo Tempo]
+[Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -204,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -234,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 52.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -321,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.2)
-[Rede Super]
+[TV WSN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -350,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -436,7 +407,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 56.2)
+# Physical channel 38 (virtual 56.1)
 [CNT Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -610,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
-[TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
+# Physical channel 45 (virtual 11.5)
+[TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -639,37 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 50.1)
-[Rede Bênção]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 49 (virtual 49.1)
-[Rede Vida]
+# Physical channel 49 (virtual 49.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-Biquinhas b/isdb-t/br-mg-Biquinhas
index 4616f055..30be113b 100644
--- a/isdb-t/br-mg-Biquinhas
+++ b/isdb-t/br-mg-Biquinhas
@@ -1,5 +1,5 @@
 # Channel table for Biquinhas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3883
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3883
 
 # Physical channel 17 (virtual 17.2)
 [Rede Minas]
diff --git a/isdb-t/br-to-ChapadaDeAreia b/isdb-t/br-mg-BoaEsperanca
index 73a057dd..11c103fc 100644
--- a/isdb-t/br-to-ChapadaDeAreia
+++ b/isdb-t/br-mg-BoaEsperanca
@@ -1,8 +1,8 @@
-# Channel table for Chapada De Areia - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2360
+# Channel table for Boa Esperan�a - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=381
 
-# Physical channel 23 (virtual 11.1)
-[TV Anhanguera Palmas]
+# Physical channel 23 (virtual 23.1)
+[TV Alterosa Sul]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-mg-Bocaiuva b/isdb-t/br-mg-Bocaiuva
index 0a4e0fba..82d62ef8 100644
--- a/isdb-t/br-mg-Bocaiuva
+++ b/isdb-t/br-mg-Bocaiuva
@@ -1,5 +1,5 @@
-# Channel table for Bocaiúva - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2762
+# Channel table for Bocai�va - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2762
 
 # Physical channel 44 (virtual 6.1)
 [Rede Mais]
diff --git a/isdb-t/br-mg-BomJesusDoAmparo b/isdb-t/br-mg-BomJesusDoAmparo
new file mode 100644
index 00000000..77c85790
--- /dev/null
+++ b/isdb-t/br-mg-BomJesusDoAmparo
@@ -0,0 +1,32 @@
+# Channel table for Bom Jesus Do Amparo - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4148
+
+# Physical channel 28 (virtual 2.1)
+[Record TV Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Bonfim b/isdb-t/br-mg-Bonfim
index 84b63b51..9c1392c4 100644
--- a/isdb-t/br-mg-Bonfim
+++ b/isdb-t/br-mg-Bonfim
@@ -1,5 +1,5 @@
 # Channel table for Bonfim - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3911
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3911
 
 # Physical channel 15 (virtual 2.1)
 [Record TV Minas]
diff --git a/isdb-t/br-mg-BordaDaMata b/isdb-t/br-mg-BordaDaMata
index 7b128041..c36275af 100644
--- a/isdb-t/br-mg-BordaDaMata
+++ b/isdb-t/br-mg-BordaDaMata
@@ -1,5 +1,5 @@
 # Channel table for Borda Da Mata - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3074
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3074
 
 # Physical channel 31 (virtual 31.2)
 [Band MG, Band]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 21.1)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 5.1)
 [EPTV Sul de Minas]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-BrasiliaDeMinas b/isdb-t/br-mg-BrasiliaDeMinas
index 98227491..fb2c35be 100644
--- a/isdb-t/br-mg-BrasiliaDeMinas
+++ b/isdb-t/br-mg-BrasiliaDeMinas
@@ -1,5 +1,5 @@
-# Channel table for Brasília De Minas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/578
+# Channel table for Bras�lia De Minas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=578
 
 # Physical channel 20 (virtual 5.1)
 [InterTV Grande Minas]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 35 (virtual 35.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Brumadinho b/isdb-t/br-mg-Brumadinho
index 38ea8b5a..011cb357 100644
--- a/isdb-t/br-mg-Brumadinho
+++ b/isdb-t/br-mg-Brumadinho
@@ -1,8 +1,8 @@
 # Channel table for Brumadinho - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3603
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3603
 
 # Physical channel 13 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 213142857
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 30.2)
+[TV Horizonte, TV Horizonte Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 8 (virtual 5.1)
 [TV Alterosa]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-Buritis b/isdb-t/br-mg-Buritis
index e12e95de..bf1e576b 100644
--- a/isdb-t/br-mg-Buritis
+++ b/isdb-t/br-mg-Buritis
@@ -1,5 +1,5 @@
 # Channel table for Buritis - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2772
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2772
 
 # Physical channel 44 (virtual 34.1)
 [Rede Mais]
diff --git a/isdb-t/br-mg-Buritizeiro b/isdb-t/br-mg-Buritizeiro
index 4ec352c0..52d1d6a7 100644
--- a/isdb-t/br-mg-Buritizeiro
+++ b/isdb-t/br-mg-Buritizeiro
@@ -1,7 +1,7 @@
 # Channel table for Buritizeiro - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/637
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=637
 
-# Physical channel 21 (virtual 22.1)
+# Physical channel 21 (virtual 7.1)
 [InterTV Grande Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 6.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 15.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-CachoeiraDaPrata b/isdb-t/br-mg-CachoeiraDaPrata
index 075ed798..aa1a848f 100644
--- a/isdb-t/br-mg-CachoeiraDaPrata
+++ b/isdb-t/br-mg-CachoeiraDaPrata
@@ -1,5 +1,5 @@
 # Channel table for Cachoeira Da Prata - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3611
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3611
 
 # Physical channel 17 (virtual 17.2)
 [Rede Minas]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 7.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 2.1)
 [Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
diff --git a/isdb-t/br-mg-Caetanopolis b/isdb-t/br-mg-Caetanopolis
index 4b856d3c..49374be1 100644
--- a/isdb-t/br-mg-Caetanopolis
+++ b/isdb-t/br-mg-Caetanopolis
@@ -1,8 +1,8 @@
-# Channel table for Caetanópolis - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3635
+# Channel table for Caetan�polis - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3635
 
 # Physical channel 33 (virtual 33.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-Caete b/isdb-t/br-mg-Caete
index 5bd402cc..b6452847 100644
--- a/isdb-t/br-mg-Caete
+++ b/isdb-t/br-mg-Caete
@@ -1,5 +1,5 @@
-# Channel table for Caeté - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3582
+# Channel table for Caet� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3582
 
 # Physical channel 17 (virtual 9.1)
 [Rede Minas]
@@ -117,8 +117,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 30.1)
-[TV Horizonte]
+# Physical channel 28 (virtual 2.1)
+[Record TV Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 30.2)
+[TV Horizonte, TV Horizonte Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 43.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-mg-Cambui b/isdb-t/br-mg-Cambui
index c80ec82d..62d62218 100644
--- a/isdb-t/br-mg-Cambui
+++ b/isdb-t/br-mg-Cambui
@@ -1,11 +1,40 @@
-# Channel table for Cambuí - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/976
+# Channel table for Cambu� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=976
 
-# Physical channel 16 (virtual 16.2)
+# Physical channel 15 (virtual 15.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 17.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-mg-Cambuquira b/isdb-t/br-mg-Cambuquira
new file mode 100644
index 00000000..779f23db
--- /dev/null
+++ b/isdb-t/br-mg-Cambuquira
@@ -0,0 +1,32 @@
+# Channel table for Cambuquira - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=65
+
+# Physical channel 25 (virtual 25.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Campanha b/isdb-t/br-mg-Campanha
index d7aba210..72f8e0b0 100644
--- a/isdb-t/br-mg-Campanha
+++ b/isdb-t/br-mg-Campanha
@@ -1,8 +1,8 @@
 # Channel table for Campanha - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1396
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1396
 
-# Physical channel 20 (virtual 46.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-mg-Campestre b/isdb-t/br-mg-Campestre
index cdad35df..299044b6 100644
--- a/isdb-t/br-mg-Campestre
+++ b/isdb-t/br-mg-Campestre
@@ -1,5 +1,5 @@
 # Channel table for Campestre - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3087
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3087
 
 # Physical channel 42 (virtual 5.1)
 [EPTV Sul de Minas]
diff --git a/isdb-t/br-mg-CampinaVerde b/isdb-t/br-mg-CampinaVerde
index cf109323..5f0ab037 100644
--- a/isdb-t/br-mg-CampinaVerde
+++ b/isdb-t/br-mg-CampinaVerde
@@ -1,5 +1,5 @@
 # Channel table for Campina Verde - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/574
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=574
 
 # Physical channel 27 (virtual 39.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-CampoBelo b/isdb-t/br-mg-CampoBelo
index c5b204a0..fcdca58e 100644
--- a/isdb-t/br-mg-CampoBelo
+++ b/isdb-t/br-mg-CampoBelo
@@ -1,7 +1,65 @@
 # Channel table for Campo Belo - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/734
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=734
 
-# Physical channel 41 (virtual 5.1)
+# Physical channel 30 (virtual 30.1)
+[TV Alterosa Divinópolis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 39.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 13.1)
 [EPTV Sul de Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-mg-CamposAltos b/isdb-t/br-mg-CamposAltos
index b58dd62e..c0185750 100644
--- a/isdb-t/br-mg-CamposAltos
+++ b/isdb-t/br-mg-CamposAltos
@@ -1,5 +1,5 @@
 # Channel table for Campos Altos - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/880
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=880
 
 # Physical channel 28 (virtual 14.1)
 [TV Paranaíba]
diff --git a/isdb-t/br-mg-Capelinha b/isdb-t/br-mg-Capelinha
new file mode 100644
index 00000000..5ba800b0
--- /dev/null
+++ b/isdb-t/br-mg-Capelinha
@@ -0,0 +1,61 @@
+# Channel table for Capelinha - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=179
+
+# Physical channel 22 (virtual 22.1)
+[InterTV dos Vales]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 9.1)
+[TV Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-CapimBranco b/isdb-t/br-mg-CapimBranco
index 7c5c516f..ed956cf5 100644
--- a/isdb-t/br-mg-CapimBranco
+++ b/isdb-t/br-mg-CapimBranco
@@ -1,5 +1,5 @@
 # Channel table for Capim Branco - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3619
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3619
 
 # Physical channel 14 (virtual 14.2)
 [Rede Minas]
diff --git a/isdb-t/br-mg-CapitaoEneas b/isdb-t/br-mg-CapitaoEneas
index fd089e25..83bcdce3 100644
--- a/isdb-t/br-mg-CapitaoEneas
+++ b/isdb-t/br-mg-CapitaoEneas
@@ -1,5 +1,5 @@
-# Channel table for Capitão Enéas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3831
+# Channel table for Capit�o En�as - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3831
 
 # Physical channel 21 (virtual 11.1)
 [InterTV Grande Minas]
diff --git a/isdb-t/br-mg-Caratinga b/isdb-t/br-mg-Caratinga
index d8c5a4f0..cf05c64c 100644
--- a/isdb-t/br-mg-Caratinga
+++ b/isdb-t/br-mg-Caratinga
@@ -1,5 +1,5 @@
 # Channel table for Caratinga - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/312
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=312
 
 # Physical channel 23 (virtual 24.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-CarlosChagas b/isdb-t/br-mg-CarlosChagas
new file mode 100644
index 00000000..9fe22091
--- /dev/null
+++ b/isdb-t/br-mg-CarlosChagas
@@ -0,0 +1,32 @@
+# Channel table for Carlos Chagas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4104
+
+# Physical channel 17 (virtual 17.1)
+[Rede Super]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-CarmoDaCachoeira b/isdb-t/br-mg-CarmoDaCachoeira
index f109fd3d..7f55a1e9 100644
--- a/isdb-t/br-mg-CarmoDaCachoeira
+++ b/isdb-t/br-mg-CarmoDaCachoeira
@@ -1,5 +1,5 @@
 # Channel table for Carmo Da Cachoeira - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2865
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2865
 
 # Physical channel 23 (virtual 24.1)
 [TV Alterosa]
diff --git a/isdb-t/br-mg-CarmoDeMinas b/isdb-t/br-mg-CarmoDeMinas
index 43bac598..b61a1246 100644
--- a/isdb-t/br-mg-CarmoDeMinas
+++ b/isdb-t/br-mg-CarmoDeMinas
@@ -1,5 +1,5 @@
 # Channel table for Carmo De Minas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3459
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3459
 
 # Physical channel 42 (virtual 5.1)
 [EPTV Sul de Minas]
diff --git a/isdb-t/br-mg-CarmoDoCajuru b/isdb-t/br-mg-CarmoDoCajuru
new file mode 100644
index 00000000..7c6611d3
--- /dev/null
+++ b/isdb-t/br-mg-CarmoDoCajuru
@@ -0,0 +1,206 @@
+# Channel table for Carmo Do Cajuru - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4144
+
+# Physical channel 15 (virtual 14.1)
+[Record TV Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 3.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 8.1)
+[TV Integração Araxá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 10.1)
+[TV Alterosa Divinópolis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 22.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 13.1)
+[TV Candidés]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 17.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-CarmoDoParanaiba b/isdb-t/br-mg-CarmoDoParanaiba
index 16872dea..961992a6 100644
--- a/isdb-t/br-mg-CarmoDoParanaiba
+++ b/isdb-t/br-mg-CarmoDoParanaiba
@@ -1,5 +1,34 @@
-# Channel table for Carmo Do Paranaíba - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1156
+# Channel table for Carmo Do Parana�ba - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1156
+
+# Physical channel 20 (virtual 20.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 15.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-CarmoDoRioClaro b/isdb-t/br-mg-CarmoDoRioClaro
index 0fff21f6..b5ac4878 100644
--- a/isdb-t/br-mg-CarmoDoRioClaro
+++ b/isdb-t/br-mg-CarmoDoRioClaro
@@ -1,5 +1,5 @@
 # Channel table for Carmo Do Rio Claro - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3735
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3735
 
 # Physical channel 39 (virtual 39.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-CasaGrande b/isdb-t/br-mg-CasaGrande
index a946574c..6860d77c 100644
--- a/isdb-t/br-mg-CasaGrande
+++ b/isdb-t/br-mg-CasaGrande
@@ -1,5 +1,5 @@
 # Channel table for Casa Grande - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3877
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3877
 
 # Physical channel 17 (virtual 17.2)
 [Rede Minas]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 31.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
diff --git a/isdb-t/br-mg-Cassia b/isdb-t/br-mg-Cassia
index ca62f3af..cce11249 100644
--- a/isdb-t/br-mg-Cassia
+++ b/isdb-t/br-mg-Cassia
@@ -1,5 +1,5 @@
-# Channel table for Cássia - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1449
+# Channel table for C�ssia - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1449
 
 # Physical channel 39 (virtual 34.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Cataguases b/isdb-t/br-mg-Cataguases
index 04743f01..47c7097b 100644
--- a/isdb-t/br-mg-Cataguases
+++ b/isdb-t/br-mg-Cataguases
@@ -1,7 +1,7 @@
 # Channel table for Cataguases - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/143
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=143
 
-# Physical channel 23 (virtual 24.1)
+# Physical channel 23 (virtual 8.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-mg-CedroDoAbaete b/isdb-t/br-mg-CedroDoAbaete
new file mode 100644
index 00000000..65fa2f37
--- /dev/null
+++ b/isdb-t/br-mg-CedroDoAbaete
@@ -0,0 +1,61 @@
+# Channel table for Cedro Do Abaet� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=882
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 31.1)
+[Rede Super]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Chacara b/isdb-t/br-mg-Chacara
index 9abdc885..01272cb3 100644
--- a/isdb-t/br-mg-Chacara
+++ b/isdb-t/br-mg-Chacara
@@ -1,5 +1,5 @@
-# Channel table for Chácara - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3431
+# Channel table for Ch�cara - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3431
 
 # Physical channel 30 (virtual 5.1)
 [TV Integração Juiz de Fora]
diff --git a/isdb-t/br-mg-Claraval b/isdb-t/br-mg-Claraval
index 3d353e2b..bd7a2ebb 100644
--- a/isdb-t/br-mg-Claraval
+++ b/isdb-t/br-mg-Claraval
@@ -1,5 +1,5 @@
 # Channel table for Claraval - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3241
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3241
 
 # Physical channel 20 (virtual 25.1)
 [Rede Vida]
diff --git a/isdb-t/br-ba-Aiquara b/isdb-t/br-mg-Claudio
index 31800692..42dd2767 100644
--- a/isdb-t/br-ba-Aiquara
+++ b/isdb-t/br-mg-Claudio
@@ -1,8 +1,8 @@
-# Channel table for Aiquara - BA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2758
+# Channel table for Cl�udio - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4096
 
-# Physical channel 28 (virtual 6.1)
-[TV Sudoeste]
+# Physical channel 28 (virtual 28.2)
+[Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-mg-Coimbra b/isdb-t/br-mg-Coimbra
index 8c0b07e5..2955e819 100644
--- a/isdb-t/br-mg-Coimbra
+++ b/isdb-t/br-mg-Coimbra
@@ -1,5 +1,5 @@
 # Channel table for Coimbra - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1796
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1796
 
 # Physical channel 30 (virtual 7.1)
 [TV Integração Juiz de Fora]
diff --git a/isdb-t/br-mg-ConceicaoDasAlagoas b/isdb-t/br-mg-ConceicaoDasAlagoas
index 4616305e..629d631e 100644
--- a/isdb-t/br-mg-ConceicaoDasAlagoas
+++ b/isdb-t/br-mg-ConceicaoDasAlagoas
@@ -1,5 +1,5 @@
-# Channel table for Conceição Das Alagoas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2911
+# Channel table for Concei��o Das Alagoas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2911
 
 # Physical channel 29 (virtual 21.1)
 [TV Paranaíba]
diff --git a/isdb-t/br-mg-Confins b/isdb-t/br-mg-Confins
index ed08e8eb..fd412328 100644
--- a/isdb-t/br-mg-Confins
+++ b/isdb-t/br-mg-Confins
@@ -1,8 +1,8 @@
 # Channel table for Confins - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3607
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3607
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 9.2)
+# Physical channel 17 (virtual 17.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 52.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.2)
-[Rede Super]
+[TV WSN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -378,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
+# Physical channel 45 (virtual 11.4)
 [TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede Vida]
+# Physical channel 49 (virtual 49.2)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-Congonhas b/isdb-t/br-mg-Congonhas
index d4c28c95..539c6ab6 100644
--- a/isdb-t/br-mg-Congonhas
+++ b/isdb-t/br-mg-Congonhas
@@ -1,8 +1,8 @@
 # Channel table for Congonhas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2945
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2945
 
 # Physical channel 31 (virtual 9.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
diff --git a/isdb-t/br-mg-CongonhasDoNorte b/isdb-t/br-mg-CongonhasDoNorte
new file mode 100644
index 00000000..0f828029
--- /dev/null
+++ b/isdb-t/br-mg-CongonhasDoNorte
@@ -0,0 +1,32 @@
+# Channel table for Congonhas Do Norte - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4097
+
+# Physical channel 51 (virtual 51.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Conquista b/isdb-t/br-mg-Conquista
index ae4f4269..b42ac532 100644
--- a/isdb-t/br-mg-Conquista
+++ b/isdb-t/br-mg-Conquista
@@ -1,5 +1,5 @@
 # Channel table for Conquista - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2934
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2934
 
 # Physical channel 31 (virtual 14.1)
 [TV Integração Uberaba]
diff --git a/isdb-t/br-mg-ConselheiroLafaiete b/isdb-t/br-mg-ConselheiroLafaiete
index 69e1d728..24f412d9 100644
--- a/isdb-t/br-mg-ConselheiroLafaiete
+++ b/isdb-t/br-mg-ConselheiroLafaiete
@@ -1,5 +1,5 @@
 # Channel table for Conselheiro Lafaiete - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/313
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=313
 
 # Physical channel 14 (virtual 14.1)
 [TV Lafaiete]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 6.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 49.1)
+# Physical channel 42 (virtual 42.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Contagem b/isdb-t/br-mg-Contagem
index 6ca748f9..d13f07b2 100644
--- a/isdb-t/br-mg-Contagem
+++ b/isdb-t/br-mg-Contagem
@@ -1,8 +1,8 @@
 # Channel table for Contagem - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3281
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3281
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
-[TV Novo Tempo]
+[Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede Gênesis]
+# Physical channel 23 (virtual 59.1)
+[TV Centro Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 59.1)
-[TV Centro Minas]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[RBI TV]
+# Physical channel 26 (virtual 52.1)
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 27 (virtual 31.1)
+[TV A Crítica]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 52.1)
-[RCI Minas]
+# Physical channel 28 (virtual 2.1)
+[Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 2.1)
-[Record TV Minas]
+# Physical channel 29 (virtual 29.1)
+[Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[Rede Super]
+[TV WSN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -494,7 +494,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 56.2)
+# Physical channel 38 (virtual 56.1)
 [CNT Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -523,11 +523,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.1)
-[TV Diversa]
+# Physical channel 39 (virtual 39.1)
+[TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -552,11 +552,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
-[RIT]
+# Physical channel 40 (virtual 40.1)
+[TV Diversa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -581,11 +581,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 45.1)
-[TV Canção Nova]
+# Physical channel 41 (virtual 41.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -610,11 +610,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 44.1)
-[TV Aparecida]
+# Physical channel 42 (virtual 45.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -639,11 +639,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
-[TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
+# Physical channel 44 (virtual 44.1)
+[TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -668,11 +668,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 50.1)
-[Rede Bênção]
+# Physical channel 45 (virtual 11.5)
+[TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -697,8 +697,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede Vida]
+# Physical channel 49 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-CoracaoDeJesus b/isdb-t/br-mg-CoracaoDeJesus
index 9c322622..782a998f 100644
--- a/isdb-t/br-mg-CoracaoDeJesus
+++ b/isdb-t/br-mg-CoracaoDeJesus
@@ -1,5 +1,5 @@
-# Channel table for Coração De Jesus - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3435
+# Channel table for Cora��o De Jesus - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3435
 
 # Physical channel 21 (virtual 11.1)
 [InterTV Grande Minas]
diff --git a/isdb-t/br-mg-Cordisburgo b/isdb-t/br-mg-Cordisburgo
index fc8bd0d3..9d317ed2 100644
--- a/isdb-t/br-mg-Cordisburgo
+++ b/isdb-t/br-mg-Cordisburgo
@@ -1,5 +1,5 @@
 # Channel table for Cordisburgo - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3869
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3869
 
 # Physical channel 17 (virtual 17.2)
 [Rede Minas]
diff --git a/isdb-t/br-mg-Coromandel b/isdb-t/br-mg-Coromandel
index 40529592..39a4f594 100644
--- a/isdb-t/br-mg-Coromandel
+++ b/isdb-t/br-mg-Coromandel
@@ -1,5 +1,5 @@
 # Channel table for Coromandel - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1007
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1007
 
 # Physical channel 23 (virtual 23.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-CoronelFabriciano b/isdb-t/br-mg-CoronelFabriciano
index 6af0e90e..c95132d7 100644
--- a/isdb-t/br-mg-CoronelFabriciano
+++ b/isdb-t/br-mg-CoronelFabriciano
@@ -1,5 +1,34 @@
 # Channel table for Coronel Fabriciano - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/379
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=379
+
+# Physical channel 16 (virtual 13.1)
+[TV Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 10.1)
 [InterTV dos Vales]
@@ -59,7 +88,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.2)
+# Physical channel 27 (virtual 27.1)
+[TV Pai Eterno MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 12.1)
 [TV Leste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,3 +175,90 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 8.1)
+[TV Alterosa Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 55.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 44.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-CorregoDanta b/isdb-t/br-mg-CorregoDanta
new file mode 100644
index 00000000..27cf53df
--- /dev/null
+++ b/isdb-t/br-mg-CorregoDanta
@@ -0,0 +1,32 @@
+# Channel table for C�rrego Danta - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4103
+
+# Physical channel 41 (virtual 41.1)
+[Rede Super]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Cristais b/isdb-t/br-mg-Cristais
new file mode 100644
index 00000000..e47181ef
--- /dev/null
+++ b/isdb-t/br-mg-Cristais
@@ -0,0 +1,32 @@
+# Channel table for Cristais - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4211
+
+# Physical channel 30 (virtual 30.1)
+[TV Alterosa Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-CruzeiroDaFortaleza b/isdb-t/br-mg-CruzeiroDaFortaleza
index 3395f6c9..b997c102 100644
--- a/isdb-t/br-mg-CruzeiroDaFortaleza
+++ b/isdb-t/br-mg-CruzeiroDaFortaleza
@@ -1,5 +1,5 @@
 # Channel table for Cruzeiro Da Fortaleza - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3287
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3287
 
 # Physical channel 30 (virtual 6.1)
 [TV Integração Uberlândia]
diff --git a/isdb-t/br-mg-Curvelo b/isdb-t/br-mg-Curvelo
index 19e21cf6..071e2c7f 100644
--- a/isdb-t/br-mg-Curvelo
+++ b/isdb-t/br-mg-Curvelo
@@ -1,5 +1,5 @@
 # Channel table for Curvelo - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/202
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=202
 
 # Physical channel 21 (virtual 8.1)
 [InterTV Grande Minas]
diff --git a/isdb-t/br-mg-Delta b/isdb-t/br-mg-Delta
index 37437e53..e7274939 100644
--- a/isdb-t/br-mg-Delta
+++ b/isdb-t/br-mg-Delta
@@ -1,5 +1,5 @@
 # Channel table for Delta - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3377
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3377
 
 # Physical channel 17 (virtual 7.1)
 [Band Triângulo]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 10.1)
+# Physical channel 26 (virtual 7.1)
 [EPTV Ribeirão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 28 (virtual 13.1)
+[Record TV Interior SP]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 13.1)
 [TV Paranaíba]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 4.3)
+[TV Cultura, Univesp, TV Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 3.1)
 [TV Integração Uberaba]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-Diamantina b/isdb-t/br-mg-Diamantina
index 2510dc23..f24ae2e0 100644
--- a/isdb-t/br-mg-Diamantina
+++ b/isdb-t/br-mg-Diamantina
@@ -1,5 +1,5 @@
 # Channel table for Diamantina - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/177
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=177
 
 # Physical channel 29 (virtual 29.1)
 [Rede Mundial]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 34.1)
+[TV Vale]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 49 (virtual 15.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-Dionisio b/isdb-t/br-mg-Dionisio
new file mode 100644
index 00000000..1229e4de
--- /dev/null
+++ b/isdb-t/br-mg-Dionisio
@@ -0,0 +1,32 @@
+# Channel table for Dion�sio - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4165
+
+# Physical channel 42 (virtual 56.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Divinopolis b/isdb-t/br-mg-Divinopolis
index c381fece..c28a5185 100644
--- a/isdb-t/br-mg-Divinopolis
+++ b/isdb-t/br-mg-Divinopolis
@@ -1,5 +1,5 @@
-# Channel table for Divinópolis - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/241
+# Channel table for Divin�polis - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=241
 
 # Physical channel 15 (virtual 14.1)
 [Record TV Minas]
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 32.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 17.1)
-[Rede Vida]
+# Physical channel 49 (virtual 49.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-DoresDeCampos b/isdb-t/br-mg-DoresDeCampos
index f5d58b0b..df1f11f1 100644
--- a/isdb-t/br-mg-DoresDeCampos
+++ b/isdb-t/br-mg-DoresDeCampos
@@ -1,5 +1,5 @@
 # Channel table for Dores De Campos - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3453
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3453
 
 # Physical channel 41 (virtual 41.1)
 [TV Diversa]
diff --git a/isdb-t/br-mg-EloiMendes b/isdb-t/br-mg-EloiMendes
index 581345f3..0303e43d 100644
--- a/isdb-t/br-mg-EloiMendes
+++ b/isdb-t/br-mg-EloiMendes
@@ -1,5 +1,5 @@
-# Channel table for Elói Mendes - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3350
+# Channel table for El�i Mendes - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3350
 
 # Physical channel 25 (virtual 4.1)
 [TV Alterosa]
diff --git a/isdb-t/br-mg-Esmeraldas b/isdb-t/br-mg-Esmeraldas
index bd023f23..23ebfbda 100644
--- a/isdb-t/br-mg-Esmeraldas
+++ b/isdb-t/br-mg-Esmeraldas
@@ -1,8 +1,8 @@
 # Channel table for Esmeraldas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3626
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3626
 
 # Physical channel 13 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 213142857
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 7.1)
-[Band MG]
+# Physical channel 15 (virtual 2.1)
+[Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 2.1)
-[Record TV Minas]
+# Physical channel 20 (virtual 7.1)
+[Band MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-mg-EwbankDaCamara b/isdb-t/br-mg-EwbankDaCamara
index 34625029..64b3a2b4 100644
--- a/isdb-t/br-mg-EwbankDaCamara
+++ b/isdb-t/br-mg-EwbankDaCamara
@@ -1,5 +1,5 @@
-# Channel table for Ewbank Da Câmara - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3423
+# Channel table for Ewbank Da C�mara - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3423
 
 # Physical channel 24 (virtual 43.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-Florestal b/isdb-t/br-mg-Florestal
index e5fa1675..2c76b121 100644
--- a/isdb-t/br-mg-Florestal
+++ b/isdb-t/br-mg-Florestal
@@ -1,11 +1,11 @@
 # Channel table for Florestal - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3605
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3605
 
-# Physical channel 15 (virtual 55,1)
-[Record TV Minas]
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 479142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 17.2)
-[Rede Minas]
+# Physical channel 22 (virtual 22.1)
+[Rede Gênesis]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede Gênesis]
+# Physical channel 28 (virtual 55.1)
+[Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 31.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-Formiga b/isdb-t/br-mg-Formiga
index eb8e02e2..1fc9b1f1 100644
--- a/isdb-t/br-mg-Formiga
+++ b/isdb-t/br-mg-Formiga
@@ -1,5 +1,5 @@
 # Channel table for Formiga - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/735
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=735
 
 # Physical channel 15 (virtual 19.1)
 [Record TV Minas]
diff --git a/isdb-t/br-mg-FortunaDeMinas b/isdb-t/br-mg-FortunaDeMinas
index 088c7086..e1d152cd 100644
--- a/isdb-t/br-mg-FortunaDeMinas
+++ b/isdb-t/br-mg-FortunaDeMinas
@@ -1,7 +1,7 @@
 # Channel table for Fortuna De Minas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3624
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3624
 
-# Physical channel 17 (virtual 17.1)
+# Physical channel 17 (virtual 17.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-Fronteira b/isdb-t/br-mg-Fronteira
index 442f7eba..49dd7aae 100644
--- a/isdb-t/br-mg-Fronteira
+++ b/isdb-t/br-mg-Fronteira
@@ -1,5 +1,5 @@
 # Channel table for Fronteira - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1027
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1027
 
 # Physical channel 23 (virtual 40.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-Frutal b/isdb-t/br-mg-Frutal
index 389bad94..90a8eca7 100644
--- a/isdb-t/br-mg-Frutal
+++ b/isdb-t/br-mg-Frutal
@@ -1,5 +1,5 @@
 # Channel table for Frutal - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/579
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=579
 
 # Physical channel 23 (virtual 40.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-Funilandia b/isdb-t/br-mg-Funilandia
index f2880b47..e7450f08 100644
--- a/isdb-t/br-mg-Funilandia
+++ b/isdb-t/br-mg-Funilandia
@@ -1,5 +1,5 @@
-# Channel table for Funilândia - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3628
+# Channel table for Funil�ndia - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3628
 
 # Physical channel 17 (virtual 17.2)
 [Rede Minas]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-GovernadorValadares b/isdb-t/br-mg-GovernadorValadares
index 33472295..a4aeaf0a 100644
--- a/isdb-t/br-mg-GovernadorValadares
+++ b/isdb-t/br-mg-GovernadorValadares
@@ -1,5 +1,5 @@
 # Channel table for Governador Valadares - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/10
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=10
 
 # Physical channel 15 (virtual 15.1)
 [TV Evangelizar]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 11.1)
-[InterTV dos Vales]
+# Physical channel 19 (virtual 23.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 503142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[RCI Minas]
+# Physical channel 22 (virtual 11.1)
+[InterTV dos Vales]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 20.1)
-[Rede Vida]
+# Physical channel 24 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 3.1)
-[TV Leste]
+# Physical channel 31 (virtual 3.2)
+[TV Leste, TV Educação GV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -175,6 +175,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 6.1)
+[TV Rio Doce]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 34.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 9.1)
 [Band MG]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 13.1)
-[TV Alterosa Leste]
+# Physical channel 38 (virtual 13.2)
+[TV Alterosa Leste, TV Educação GV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -262,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 43.1)
-[TV Mundial]
+# Physical channel 43 (virtual 14.1)
+[Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-mg-Guanhaes b/isdb-t/br-mg-Guanhaes
new file mode 100644
index 00000000..e0142e91
--- /dev/null
+++ b/isdb-t/br-mg-Guanhaes
@@ -0,0 +1,32 @@
+# Channel table for Guanh�es - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=87
+
+# Physical channel 31 (virtual 11.1)
+[TV Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Guaxupe b/isdb-t/br-mg-Guaxupe
index 537cca2e..2095b5b9 100644
--- a/isdb-t/br-mg-Guaxupe
+++ b/isdb-t/br-mg-Guaxupe
@@ -1,5 +1,5 @@
-# Channel table for Guaxupé - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2928
+# Channel table for Guaxup� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2928
 
 # Physical channel 20 (virtual 33.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-Guimarania b/isdb-t/br-mg-Guimarania
index 0a784eb0..94a798e3 100644
--- a/isdb-t/br-mg-Guimarania
+++ b/isdb-t/br-mg-Guimarania
@@ -1,5 +1,5 @@
-# Channel table for Guimarânia - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3298
+# Channel table for Guimar�nia - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3298
 
 # Physical channel 23 (virtual 28.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-Ibia b/isdb-t/br-mg-Ibia
new file mode 100644
index 00000000..d5a55fae
--- /dev/null
+++ b/isdb-t/br-mg-Ibia
@@ -0,0 +1,32 @@
+# Channel table for Ibi� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=372
+
+# Physical channel 30 (virtual 11.1)
+[TV Integração Araxá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Ibirite b/isdb-t/br-mg-Ibirite
index a35072a3..cfc2da61 100644
--- a/isdb-t/br-mg-Ibirite
+++ b/isdb-t/br-mg-Ibirite
@@ -1,5 +1,34 @@
-# Channel table for Ibirité - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3223
+# Channel table for Ibirit� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3223
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 7.1)
 [Band MG]
@@ -30,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 2.1)
 [Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
@@ -60,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 15.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -117,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 39.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 44 (virtual 44.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-Igarape b/isdb-t/br-mg-Igarape
index 114a2c9c..27fc5d7c 100644
--- a/isdb-t/br-mg-Igarape
+++ b/isdb-t/br-mg-Igarape
@@ -1,5 +1,5 @@
-# Channel table for Igarapé - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3613
+# Channel table for Igarap� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3613
 
 # Physical channel 15 (virtual 55.1)
 [Record TV Minas]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 31.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-Indianopolis b/isdb-t/br-mg-Indianopolis
index c365d96a..f2bce190 100644
--- a/isdb-t/br-mg-Indianopolis
+++ b/isdb-t/br-mg-Indianopolis
@@ -1,5 +1,5 @@
-# Channel table for Indianópolis - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4011
+# Channel table for Indian�polis - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4011
 
 # Physical channel 28 (virtual 14.1)
 [TV Paranaíba]
diff --git a/isdb-t/br-mg-Inhauma b/isdb-t/br-mg-Inhauma
index 8e0b4f16..34fac58b 100644
--- a/isdb-t/br-mg-Inhauma
+++ b/isdb-t/br-mg-Inhauma
@@ -1,5 +1,5 @@
-# Channel table for Inhaúma - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3623
+# Channel table for Inha�ma - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3623
 
 # Physical channel 15 (virtual 41.1)
 [Record TV Minas]
@@ -30,3 +30,90 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 18 (virtual 38.1)
+[TV Globo Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 34.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 3.1)
+[TV Alterosa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Ipatinga b/isdb-t/br-mg-Ipatinga
index af613047..7788e025 100644
--- a/isdb-t/br-mg-Ipatinga
+++ b/isdb-t/br-mg-Ipatinga
@@ -1,5 +1,34 @@
 # Channel table for Ipatinga - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/276
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=276
+
+# Physical channel 16 (virtual 13.1)
+[TV Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 10.1)
 [InterTV dos Vales]
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 27.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -146,7 +175,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 42.1)
+# Physical channel 38 (virtual 8.1)
+[TV Alterosa Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 55.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,3 +233,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 44.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Ipiacu b/isdb-t/br-mg-Ipiacu
index 37a102b8..b1975f3e 100644
--- a/isdb-t/br-mg-Ipiacu
+++ b/isdb-t/br-mg-Ipiacu
@@ -1,5 +1,5 @@
-# Channel table for Ipiaçu - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2142
+# Channel table for Ipia�u - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2142
 
 # Physical channel 27 (virtual 35.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Itabira b/isdb-t/br-mg-Itabira
index ead71c76..02c70223 100644
--- a/isdb-t/br-mg-Itabira
+++ b/isdb-t/br-mg-Itabira
@@ -1,8 +1,8 @@
 # Channel table for Itabira - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1391
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1391
 
 # Physical channel 14 (virtual 14.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 19.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -117,8 +117,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 44.1)
-[Rede Vida]
+# Physical channel 39 (virtual 39.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-Itabirito b/isdb-t/br-mg-Itabirito
index 4a5c0632..bb3afd76 100644
--- a/isdb-t/br-mg-Itabirito
+++ b/isdb-t/br-mg-Itabirito
@@ -1,8 +1,8 @@
 # Channel table for Itabirito - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3870
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3870
 
 # Physical channel 13 (virtual 9.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 213142857
diff --git a/isdb-t/br-mg-Itaguara b/isdb-t/br-mg-Itaguara
index afaccc35..f182dc3c 100644
--- a/isdb-t/br-mg-Itaguara
+++ b/isdb-t/br-mg-Itaguara
@@ -1,8 +1,8 @@
 # Channel table for Itaguara - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3324
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3324
 
 # Physical channel 13 (virtual 6.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 213142857
diff --git a/isdb-t/br-mg-Itajuba b/isdb-t/br-mg-Itajuba
index c72508e5..c171b9ed 100644
--- a/isdb-t/br-mg-Itajuba
+++ b/isdb-t/br-mg-Itajuba
@@ -1,5 +1,5 @@
-# Channel table for Itajubá - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/55
+# Channel table for Itajub� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=55
 
 # Physical channel 42 (virtual 5.1)
 [EPTV Sul de Minas]
diff --git a/isdb-t/br-mg-Itamarandiba b/isdb-t/br-mg-Itamarandiba
new file mode 100644
index 00000000..ea4b2723
--- /dev/null
+++ b/isdb-t/br-mg-Itamarandiba
@@ -0,0 +1,61 @@
+# Channel table for Itamarandiba - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4100
+
+# Physical channel 31 (virtual 31.1)
+[Rede Super]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 36.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-AlvoradaDoSul b/isdb-t/br-mg-Itaobim
index a9354543..b56ced5c 100644
--- a/isdb-t/br-pr-AlvoradaDoSul
+++ b/isdb-t/br-mg-Itaobim
@@ -1,8 +1,8 @@
-# Channel table for Alvorada Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1615
+# Channel table for Itaobim - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4174
 
-# Physical channel 16 (virtual 22.2)
-[Rede Mundial]
+# Physical channel 16 (virtual 16.2)
+[Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
diff --git a/isdb-t/br-mg-Itapagipe b/isdb-t/br-mg-Itapagipe
index ec0d9e17..0d46f7e3 100644
--- a/isdb-t/br-mg-Itapagipe
+++ b/isdb-t/br-mg-Itapagipe
@@ -1,5 +1,5 @@
 # Channel table for Itapagipe - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/521
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=521
 
 # Physical channel 23 (virtual 40.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-Itatiaiucu b/isdb-t/br-mg-Itatiaiucu
new file mode 100644
index 00000000..33275a8d
--- /dev/null
+++ b/isdb-t/br-mg-Itatiaiucu
@@ -0,0 +1,32 @@
+# Channel table for Itatiaiu�u - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4177
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Itauna b/isdb-t/br-mg-Itauna
index 2f84791d..5471e96b 100644
--- a/isdb-t/br-mg-Itauna
+++ b/isdb-t/br-mg-Itauna
@@ -1,5 +1,5 @@
-# Channel table for Itaúna - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2843
+# Channel table for Ita�na - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2843
 
 # Physical channel 15 (virtual 50.1)
 [Record TV Minas]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 43.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
-[Rede Vida]
+# Physical channel 49 (virtual 49.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-Ituiutaba b/isdb-t/br-mg-Ituiutaba
index 6e431448..7b61716d 100644
--- a/isdb-t/br-mg-Ituiutaba
+++ b/isdb-t/br-mg-Ituiutaba
@@ -1,5 +1,5 @@
 # Channel table for Ituiutaba - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/129
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=129
 
 # Physical channel 23 (virtual 5.1)
 [Rede Vida]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 27.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
diff --git a/isdb-t/br-mg-Iturama b/isdb-t/br-mg-Iturama
index 60b9fc54..1b77bd04 100644
--- a/isdb-t/br-mg-Iturama
+++ b/isdb-t/br-mg-Iturama
@@ -1,5 +1,5 @@
 # Channel table for Iturama - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/575
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=575
 
 # Physical channel 27 (virtual 23.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Jaboticatubas b/isdb-t/br-mg-Jaboticatubas
index 200679ad..35b9f607 100644
--- a/isdb-t/br-mg-Jaboticatubas
+++ b/isdb-t/br-mg-Jaboticatubas
@@ -1,5 +1,5 @@
 # Channel table for Jaboticatubas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3246
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3246
 
 # Physical channel 20 (virtual 7.1)
 [Band MG]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 31.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
diff --git a/isdb-t/br-mg-Jacutinga b/isdb-t/br-mg-Jacutinga
index c0116281..d5e95860 100644
--- a/isdb-t/br-mg-Jacutinga
+++ b/isdb-t/br-mg-Jacutinga
@@ -1,5 +1,5 @@
 # Channel table for Jacutinga - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/891
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=891
 
 # Physical channel 40 (virtual 59.1)
 [TV Cachoeira]
diff --git a/isdb-t/br-mg-Janauba b/isdb-t/br-mg-Janauba
index ca3f2a49..cb6e3c4c 100644
--- a/isdb-t/br-mg-Janauba
+++ b/isdb-t/br-mg-Janauba
@@ -1,5 +1,5 @@
-# Channel table for Janaúba - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/252
+# Channel table for Jana�ba - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=252
 
 # Physical channel 21 (virtual 7.1)
 [InterTV Grande Minas]
@@ -30,3 +30,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 26 (virtual 26.1)
+[TV Serra Geral]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 11.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Januaria b/isdb-t/br-mg-Januaria
index d88cc6d1..8b21e7fc 100644
--- a/isdb-t/br-mg-Januaria
+++ b/isdb-t/br-mg-Januaria
@@ -1,5 +1,5 @@
-# Channel table for Januária - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2087
+# Channel table for Janu�ria - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2087
 
 # Physical channel 15 (virtual 3.1)
 [Rede Mais]
diff --git a/isdb-t/br-mg-Jequitiba b/isdb-t/br-mg-Jequitiba
index efff0599..5035617e 100644
--- a/isdb-t/br-mg-Jequitiba
+++ b/isdb-t/br-mg-Jequitiba
@@ -1,5 +1,5 @@
-# Channel table for Jequitibá - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3602
+# Channel table for Jequitib� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3602
 
 # Physical channel 17 (virtual 17.1)
 [Rede Minas]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-Jequitinhonha b/isdb-t/br-mg-Jequitinhonha
index 9f81e2b7..4b8c95d0 100644
--- a/isdb-t/br-mg-Jequitinhonha
+++ b/isdb-t/br-mg-Jequitinhonha
@@ -1,5 +1,34 @@
 # Channel table for Jequitinhonha - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2990
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2990
+
+# Physical channel 31 (virtual 31.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 38.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Jesuania b/isdb-t/br-mg-Jesuania
new file mode 100644
index 00000000..6b6f595c
--- /dev/null
+++ b/isdb-t/br-mg-Jesuania
@@ -0,0 +1,61 @@
+# Channel table for Jesu�nia - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1439
+
+# Physical channel 42 (virtual 5.1)
+[EPTV Sul de Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 22.1)
+[Record TV Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-JoaoMonlevade b/isdb-t/br-mg-JoaoMonlevade
index 4d3be0db..28dd342a 100644
--- a/isdb-t/br-mg-JoaoMonlevade
+++ b/isdb-t/br-mg-JoaoMonlevade
@@ -1,5 +1,5 @@
-# Channel table for João Monlevade - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2846
+# Channel table for Jo�o Monlevade - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2846
 
 # Physical channel 15 (virtual 47.1)
 [Record TV Minas]
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 13.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 33 (virtual 24.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -59,11 +88,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 26.1)
+# Physical channel 38 (virtual 10.1)
+[TV Alterosa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-mg-JoaoPinheiro b/isdb-t/br-mg-JoaoPinheiro
index 1543215e..9869d4f7 100644
--- a/isdb-t/br-mg-JoaoPinheiro
+++ b/isdb-t/br-mg-JoaoPinheiro
@@ -1,5 +1,63 @@
-# Channel table for João Pinheiro - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2627
+# Channel table for Jo�o Pinheiro - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2627
+
+# Physical channel 14 (virtual 5.1)
+[TV Noroeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 36.1)
+[TV Rio Preto]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 57 (virtual 33.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Juatuba b/isdb-t/br-mg-Juatuba
index 841a9c4b..06e8c7d3 100644
--- a/isdb-t/br-mg-Juatuba
+++ b/isdb-t/br-mg-Juatuba
@@ -1,5 +1,5 @@
 # Channel table for Juatuba - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3617
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3617
 
 # Physical channel 15 (virtual 55.1)
 [Record TV Minas]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 31.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -117,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 34.1)
+[TV Alterosa Divinópolis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-JuizDeFora b/isdb-t/br-mg-JuizDeFora
index 24e29464..5cd957c0 100644
--- a/isdb-t/br-mg-JuizDeFora
+++ b/isdb-t/br-mg-JuizDeFora
@@ -1,34 +1,5 @@
 # Channel table for Juiz De Fora - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/24
-
-# Physical channel 14 (virtual 14.1)
-[RCI Minas]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 473142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=24
 
 # Physical channel 15 (virtual 15.1)
 [TV Evangelizar]
@@ -60,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 18.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -146,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 43.1)
-[Rede Vida]
+# Physical channel 24 (virtual 43.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 2.1)
-[Rede TV!]
+# Physical channel 27 (virtual 27.1)
+[Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.1)
-[Rede Super]
+# Physical channel 30 (virtual 5.1)
+[TV Integração Juiz de Fora]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 5.1)
-[TV Integração Juiz de Fora]
+# Physical channel 32 (virtual 10.2)
+[TV Alterosa Juiz de Fora, TV Educação GV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[TV Alterosa Juiz de Fora]
+# Physical channel 33 (virtual 33.1)
+[TV Verdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 33.1)
-[TV Verdade]
+# Physical channel 35 (virtual 35.5)
+[TV Câmara Juiz de Fora, TV Câmara, TV Assembleia MG, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 35.4)
-[TV Câmara Juiz de Fora, TV Câmara, TV Assembleia MG, TV Senado]
+# Physical channel 36 (virtual 7.1)
+[Band MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -378,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 7.1)
-[Band MG]
+# Physical channel 39 (virtual 14.1)
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -407,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
-[TV Diversa]
+# Physical channel 41 (virtual 41.2)
+[TV Diversa, Educa JFTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-mg-LagoaDaPrata b/isdb-t/br-mg-LagoaDaPrata
index 56cb39d0..91e891d9 100644
--- a/isdb-t/br-mg-LagoaDaPrata
+++ b/isdb-t/br-mg-LagoaDaPrata
@@ -1,5 +1,5 @@
 # Channel table for Lagoa Da Prata - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/719
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=719
 
 # Physical channel 31 (virtual 8.1)
 [TV Integração Araxá]
diff --git a/isdb-t/br-mg-LagoaSanta b/isdb-t/br-mg-LagoaSanta
index abe978d0..7e16475a 100644
--- a/isdb-t/br-mg-LagoaSanta
+++ b/isdb-t/br-mg-LagoaSanta
@@ -1,5 +1,5 @@
 # Channel table for Lagoa Santa - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3604
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3604
 
 # Physical channel 17 (virtual 17.2)
 [Rede Minas]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 43.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-Lambari b/isdb-t/br-mg-Lambari
index 26e43386..6c5b2eff 100644
--- a/isdb-t/br-mg-Lambari
+++ b/isdb-t/br-mg-Lambari
@@ -1,11 +1,11 @@
 # Channel table for Lambari - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1438
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1438
 
-# Physical channel 42 (virtual 5.1)
-[EPTV Sul de Minas]
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 22.1)
-[Record TV Minas]
+# Physical channel 40 (virtual 58.1)
+[Rede 7 TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 5.1)
+[EPTV Sul de Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 53 (virtual 53.1)
-[TV Verdade]
+# Physical channel 44 (virtual 22.1)
+[Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 707142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-mg-Lavras b/isdb-t/br-mg-Lavras
index ff0905ee..2167fdcb 100644
--- a/isdb-t/br-mg-Lavras
+++ b/isdb-t/br-mg-Lavras
@@ -1,5 +1,63 @@
 # Channel table for Lavras - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/64
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=64
+
+# Physical channel 17 (virtual 17.1)
+[Rede Super]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 18.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 23.1)
 [TV Alterosa Sul]
@@ -88,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.4)
-[TV Câmara Municipal, TV Câmara, TV Assembleia MG, TV Senado]
+# Physical channel 40 (virtual 6.4)
+[TV Câmara, TV Câmara Municipal, TV Assembleia MG, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
diff --git a/isdb-t/br-mg-Leopoldina b/isdb-t/br-mg-Leopoldina
index 8980d8a8..bb8433ea 100644
--- a/isdb-t/br-mg-Leopoldina
+++ b/isdb-t/br-mg-Leopoldina
@@ -1,5 +1,5 @@
 # Channel table for Leopoldina - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/299
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=299
 
 # Physical channel 23 (virtual 8.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-LimaDuarte b/isdb-t/br-mg-LimaDuarte
new file mode 100644
index 00000000..b4b7bc23
--- /dev/null
+++ b/isdb-t/br-mg-LimaDuarte
@@ -0,0 +1,32 @@
+# Channel table for Lima Duarte - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4102
+
+# Physical channel 43 (virtual 43.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Luminarias b/isdb-t/br-mg-Luminarias
index ece9d04b..60cfb5f5 100644
--- a/isdb-t/br-mg-Luminarias
+++ b/isdb-t/br-mg-Luminarias
@@ -1,5 +1,5 @@
-# Channel table for Luminárias - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2203
+# Channel table for Lumin�rias - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2203
 
 # Physical channel 23 (virtual 23.1)
 [TV Alterosa Sul]
diff --git a/isdb-t/br-mg-Luz b/isdb-t/br-mg-Luz
index 68d15577..4af7404f 100644
--- a/isdb-t/br-mg-Luz
+++ b/isdb-t/br-mg-Luz
@@ -1,5 +1,34 @@
 # Channel table for Luz - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4013
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4013
+
+# Physical channel 19 (virtual 19.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 29.1)
 [TV Integração Uberlândia]
diff --git a/isdb-t/br-mg-Machado b/isdb-t/br-mg-Machado
index 0f82933a..a1025bf9 100644
--- a/isdb-t/br-mg-Machado
+++ b/isdb-t/br-mg-Machado
@@ -1,5 +1,5 @@
 # Channel table for Machado - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/418
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=418
 
 # Physical channel 39 (virtual 58.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Manga b/isdb-t/br-mg-Manga
index 19b5eac1..1259ef31 100644
--- a/isdb-t/br-mg-Manga
+++ b/isdb-t/br-mg-Manga
@@ -1,5 +1,5 @@
 # Channel table for Manga - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1516
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1516
 
 # Physical channel 21 (virtual 5.1)
 [InterTV Grande Minas]
diff --git a/isdb-t/br-mg-Manhuacu b/isdb-t/br-mg-Manhuacu
index 38fbe521..a5e2cceb 100644
--- a/isdb-t/br-mg-Manhuacu
+++ b/isdb-t/br-mg-Manhuacu
@@ -1,8 +1,8 @@
-# Channel table for Manhuaçu - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/315
+# Channel table for Manhua�u - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=315
 
 # Physical channel 33 (virtual 22.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 27.2)
-[TV Alterosa Leste]
+[TV Alterosa Leste, TV Educação GV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-mg-Mantena b/isdb-t/br-mg-Mantena
new file mode 100644
index 00000000..d1af6427
--- /dev/null
+++ b/isdb-t/br-mg-Mantena
@@ -0,0 +1,61 @@
+# Channel table for Mantena - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=884
+
+# Physical channel 31 (virtual 18.1)
+[TV Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 46.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-MarDeEspanha b/isdb-t/br-mg-MarDeEspanha
new file mode 100644
index 00000000..a7729201
--- /dev/null
+++ b/isdb-t/br-mg-MarDeEspanha
@@ -0,0 +1,32 @@
+# Channel table for Mar De Espanha - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3442
+
+# Physical channel 51 (virtual 51.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Mariana b/isdb-t/br-mg-Mariana
index 59ea894e..fb1fc8f7 100644
--- a/isdb-t/br-mg-Mariana
+++ b/isdb-t/br-mg-Mariana
@@ -1,8 +1,8 @@
 # Channel table for Mariana - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3126
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3126
 
 # Physical channel 39 (virtual 39.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-mg-MarioCampos b/isdb-t/br-mg-MarioCampos
index 17c5db3c..f0fe8f53 100644
--- a/isdb-t/br-mg-MarioCampos
+++ b/isdb-t/br-mg-MarioCampos
@@ -1,8 +1,8 @@
-# Channel table for Mário Campos - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3615
+# Channel table for M�rio Campos - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3615
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 9.2)
+# Physical channel 17 (virtual 17.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -291,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
+# Physical channel 45 (virtual 11.4)
 [TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-mg-MataVerde b/isdb-t/br-mg-MataVerde
new file mode 100644
index 00000000..5682362e
--- /dev/null
+++ b/isdb-t/br-mg-MataVerde
@@ -0,0 +1,32 @@
+# Channel table for Mata Verde - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4098
+
+# Physical channel 26 (virtual 26.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-MateusLeme b/isdb-t/br-mg-MateusLeme
index ddaa5351..cf69bf55 100644
--- a/isdb-t/br-mg-MateusLeme
+++ b/isdb-t/br-mg-MateusLeme
@@ -1,8 +1,8 @@
 # Channel table for Mateus Leme - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2921
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2921
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 15 (virtual 2.1)
-[Record TV Minas]
+# Physical channel 16 (virtual 16.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 479142857
+	FREQUENCY = 485142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 16.1)
-[Ideal TV]
+# Physical channel 20 (virtual 7.1)
+[Band MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 7.1)
-[Band MG]
+# Physical channel 22 (virtual 22.1)
+[ETV Centro Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[Rede Gênesis]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 28 (virtual 2.1)
+[Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 31.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -320,6 +320,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 18.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 41.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -379,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 43.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-mg-MatiasBarbosa b/isdb-t/br-mg-MatiasBarbosa
index 8c534ce8..679364d4 100644
--- a/isdb-t/br-mg-MatiasBarbosa
+++ b/isdb-t/br-mg-MatiasBarbosa
@@ -1,5 +1,5 @@
 # Channel table for Matias Barbosa - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2856
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2856
 
 # Physical channel 48 (virtual 13.1)
 [Rede Mais]
diff --git a/isdb-t/br-mg-Matozinhos b/isdb-t/br-mg-Matozinhos
index 4f87244a..fa4bbdca 100644
--- a/isdb-t/br-mg-Matozinhos
+++ b/isdb-t/br-mg-Matozinhos
@@ -1,8 +1,8 @@
 # Channel table for Matozinhos - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3610
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3610
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 9.2)
+# Physical channel 17 (virtual 17.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede Vida]
+# Physical channel 49 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-MinasNovas b/isdb-t/br-mg-MinasNovas
index edf375aa..d3e39ccc 100644
--- a/isdb-t/br-mg-MinasNovas
+++ b/isdb-t/br-mg-MinasNovas
@@ -1,5 +1,5 @@
 # Channel table for Minas Novas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3523
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3523
 
 # Physical channel 20 (virtual 8.1)
 [InterTV Grande Minas]
diff --git a/isdb-t/br-mg-Moeda b/isdb-t/br-mg-Moeda
new file mode 100644
index 00000000..31e3fc5a
--- /dev/null
+++ b/isdb-t/br-mg-Moeda
@@ -0,0 +1,32 @@
+# Channel table for Moeda - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4175
+
+# Physical channel 28 (virtual 28.1)
+[Record TV Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Montalvania b/isdb-t/br-mg-Montalvania
new file mode 100644
index 00000000..4b283036
--- /dev/null
+++ b/isdb-t/br-mg-Montalvania
@@ -0,0 +1,32 @@
+# Channel table for Montalv�nia - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1517
+
+# Physical channel 21 (virtual 21.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-MonteAlegreDeMinas b/isdb-t/br-mg-MonteAlegreDeMinas
index 59d615df..c6eeb4c7 100644
--- a/isdb-t/br-mg-MonteAlegreDeMinas
+++ b/isdb-t/br-mg-MonteAlegreDeMinas
@@ -1,5 +1,5 @@
 # Channel table for Monte Alegre De Minas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2143
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2143
 
 # Physical channel 31 (virtual 6.1)
 [TV Integração Ituiutaba]
diff --git a/isdb-t/br-mg-MonteAzul b/isdb-t/br-mg-MonteAzul
index 25dd8506..bf24d8c2 100644
--- a/isdb-t/br-mg-MonteAzul
+++ b/isdb-t/br-mg-MonteAzul
@@ -1,5 +1,5 @@
 # Channel table for Monte Azul - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3905
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3905
 
 # Physical channel 21 (virtual 12.1)
 [InterTV Grande Minas]
diff --git a/isdb-t/br-mg-MonteBelo b/isdb-t/br-mg-MonteBelo
index 783d252a..c2591870 100644
--- a/isdb-t/br-mg-MonteBelo
+++ b/isdb-t/br-mg-MonteBelo
@@ -1,5 +1,5 @@
 # Channel table for Monte Belo - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1236
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1236
 
 # Physical channel 39 (virtual 39.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-MonteCarmelo b/isdb-t/br-mg-MonteCarmelo
index 27033bf5..2fbbfa3e 100644
--- a/isdb-t/br-mg-MonteCarmelo
+++ b/isdb-t/br-mg-MonteCarmelo
@@ -1,5 +1,34 @@
 # Channel table for Monte Carmelo - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/373
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=373
+
+# Physical channel 17 (virtual 7.1)
+[Band Triângulo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 9.1)
 [TV Integração Uberlândia]
diff --git a/isdb-t/br-mg-MonteSiao b/isdb-t/br-mg-MonteSiao
index b8d01d47..09099980 100644
--- a/isdb-t/br-mg-MonteSiao
+++ b/isdb-t/br-mg-MonteSiao
@@ -1,8 +1,8 @@
-# Channel table for Monte Sião - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3267
+# Channel table for Monte Si�o - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3267
 
-# Physical channel 20 (virtual 35.1)
-[Rede Vida]
+# Physical channel 20 (virtual 35.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -30,3 +30,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 29.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Alterosa Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-MontesClaros b/isdb-t/br-mg-MontesClaros
index b55e6514..f10ff520 100644
--- a/isdb-t/br-mg-MontesClaros
+++ b/isdb-t/br-mg-MontesClaros
@@ -1,5 +1,5 @@
 # Channel table for Montes Claros - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/68
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=68
 
 # Physical channel 15 (virtual 14.1)
 [Rede Mais]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 22.1)
-[Rede Vida]
+# Physical channel 23 (virtual 22.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -88,8 +88,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.4)
-[TV Câmara, TV Assembleia MG, TV Câmara Municipal, TV Senado]
+# Physical channel 25 (virtual 25.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 5.5)
+[TV Câmara, TV Assembleia MG, TV Câmara Montes Claros, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
diff --git a/isdb-t/br-mg-MorroDaGarca b/isdb-t/br-mg-MorroDaGarca
new file mode 100644
index 00000000..e9577add
--- /dev/null
+++ b/isdb-t/br-mg-MorroDaGarca
@@ -0,0 +1,32 @@
+# Channel table for Morro Da Gar�a - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2354
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Muriae b/isdb-t/br-mg-Muriae
index c7098290..811c1976 100644
--- a/isdb-t/br-mg-Muriae
+++ b/isdb-t/br-mg-Muriae
@@ -1,34 +1,5 @@
-# Channel table for Muriaé - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/298
-
-# Physical channel 18 (virtual 7.1)
-[TV Atividade]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 497142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+# Channel table for Muria� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=298
 
 # Physical channel 23 (virtual 44.1)
 [Rede Vida]
@@ -59,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.1)
-[TV Canção Nova]
+# Physical channel 30 (virtual 25.1)
+[TV Integração Juiz de Fora]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 25.1)
-[TV Integração Juiz de Fora]
+# Physical channel 40 (virtual 40.1)
+[TV Diversa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.1)
-[TV Diversa]
+# Physical channel 42 (virtual 27.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-mg-Nanuque b/isdb-t/br-mg-Nanuque
index 9e947628..a304646d 100644
--- a/isdb-t/br-mg-Nanuque
+++ b/isdb-t/br-mg-Nanuque
@@ -1,5 +1,34 @@
 # Channel table for Nanuque - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/256
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=256
+
+# Physical channel 25 (virtual 25.1)
+[InterTV dos Vales]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 9.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Nepomuceno b/isdb-t/br-mg-Nepomuceno
index f79ce23d..86ef2ff4 100644
--- a/isdb-t/br-mg-Nepomuceno
+++ b/isdb-t/br-mg-Nepomuceno
@@ -1,5 +1,63 @@
 # Channel table for Nepomuceno - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/54
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=54
+
+# Physical channel 30 (virtual 30.1)
+[TV Alterosa Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 43.1)
+[Rede Super]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 51.1)
 [Expansão Cultural]
diff --git a/isdb-t/br-to-Peixe b/isdb-t/br-mg-NovaEra
index e809b4c0..8855095a 100644
--- a/isdb-t/br-to-Peixe
+++ b/isdb-t/br-mg-NovaEra
@@ -1,8 +1,8 @@
-# Channel table for Peixe - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/619
+# Channel table for Nova Era - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4099
 
-# Physical channel 23 (virtual 11.1)
-[TV Anhanguera Gurupi]
+# Physical channel 23 (virtual 23.2)
+[Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-mg-NovaLima b/isdb-t/br-mg-NovaLima
index 16738d53..d791269e 100644
--- a/isdb-t/br-mg-NovaLima
+++ b/isdb-t/br-mg-NovaLima
@@ -1,5 +1,5 @@
 # Channel table for Nova Lima - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2975
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2975
 
 # Physical channel 15 (virtual 54.1)
 [Record TV Minas]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -349,7 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
+# Physical channel 45 (virtual 11.4)
 [TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede Vida]
+# Physical channel 49 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-NovaResende b/isdb-t/br-mg-NovaResende
index 47ccb19a..7a44d1fe 100644
--- a/isdb-t/br-mg-NovaResende
+++ b/isdb-t/br-mg-NovaResende
@@ -1,5 +1,34 @@
 # Channel table for Nova Resende - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1452
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1452
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 5.1)
 [EPTV Sul de Minas]
diff --git a/isdb-t/br-mg-NovaUniao b/isdb-t/br-mg-NovaUniao
index 883e5904..8e2b65a8 100644
--- a/isdb-t/br-mg-NovaUniao
+++ b/isdb-t/br-mg-NovaUniao
@@ -1,5 +1,34 @@
-# Channel table for Nova União - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3646
+# Channel table for Nova Uni�o - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3646
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 2.1)
 [Record TV Minas]
diff --git a/isdb-t/br-mg-OlimpioNoronha b/isdb-t/br-mg-OlimpioNoronha
index 43d9107a..e241e63a 100644
--- a/isdb-t/br-mg-OlimpioNoronha
+++ b/isdb-t/br-mg-OlimpioNoronha
@@ -1,5 +1,5 @@
-# Channel table for Olímpio Noronha - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3458
+# Channel table for Ol�mpio Noronha - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3458
 
 # Physical channel 42 (virtual 5.1)
 [EPTV Sul de Minas]
diff --git a/isdb-t/br-mg-Oliveira b/isdb-t/br-mg-Oliveira
index f718208a..5b4e37a8 100644
--- a/isdb-t/br-mg-Oliveira
+++ b/isdb-t/br-mg-Oliveira
@@ -1,5 +1,34 @@
 # Channel table for Oliveira - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2963
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2963
+
+# Physical channel 34 (virtual 34.1)
+[Rede Super]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 5.1)
 [Record TV Minas]
diff --git a/isdb-t/br-mg-OuroBranco b/isdb-t/br-mg-OuroBranco
index 3d0abe99..c10dfc27 100644
--- a/isdb-t/br-mg-OuroBranco
+++ b/isdb-t/br-mg-OuroBranco
@@ -1,5 +1,5 @@
 # Channel table for Ouro Branco - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2916
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2916
 
 # Physical channel 15 (virtual 2.1)
 [Record TV Minas]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 6.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
diff --git a/isdb-t/br-mg-OuroFino b/isdb-t/br-mg-OuroFino
index 49707d5d..2f16a520 100644
--- a/isdb-t/br-mg-OuroFino
+++ b/isdb-t/br-mg-OuroFino
@@ -1,5 +1,5 @@
 # Channel table for Ouro Fino - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/849
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=849
 
 # Physical channel 15 (virtual 11.1)
 [TV Ouro Fino]
diff --git a/isdb-t/br-mg-OuroPreto b/isdb-t/br-mg-OuroPreto
index 8e4101f7..5edf4496 100644
--- a/isdb-t/br-mg-OuroPreto
+++ b/isdb-t/br-mg-OuroPreto
@@ -1,5 +1,34 @@
 # Channel table for Ouro Preto - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/333
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=333
+
+# Physical channel 20 (virtual 20.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 28.1)
 [Rede Mundial]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-mg-ParaDeMinas b/isdb-t/br-mg-ParaDeMinas
index c8039bca..b27c0ac3 100644
--- a/isdb-t/br-mg-ParaDeMinas
+++ b/isdb-t/br-mg-ParaDeMinas
@@ -1,5 +1,5 @@
-# Channel table for Pará De Minas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2903
+# Channel table for Par� De Minas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2903
 
 # Physical channel 15 (virtual 49.1)
 [Record TV Minas]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 39.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-mg-Paracatu b/isdb-t/br-mg-Paracatu
index 406deb59..799b030a 100644
--- a/isdb-t/br-mg-Paracatu
+++ b/isdb-t/br-mg-Paracatu
@@ -1,5 +1,34 @@
 # Channel table for Paracatu - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/572
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=572
+
+# Physical channel 18 (virtual 3.1)
+[TV Minas Brasil]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 26.1)
 [Band Triângulo]
diff --git a/isdb-t/br-mg-Paraguacu b/isdb-t/br-mg-Paraguacu
index 61a7d887..39c9cb28 100644
--- a/isdb-t/br-mg-Paraguacu
+++ b/isdb-t/br-mg-Paraguacu
@@ -1,5 +1,5 @@
-# Channel table for Paraguaçu - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/398
+# Channel table for Paragua�u - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=398
 
 # Physical channel 51 (virtual 17.1)
 [TV Objetiva]
diff --git a/isdb-t/br-mg-Paraopeba b/isdb-t/br-mg-Paraopeba
index 0ad22a3c..9dcfb7c4 100644
--- a/isdb-t/br-mg-Paraopeba
+++ b/isdb-t/br-mg-Paraopeba
@@ -1,8 +1,8 @@
 # Channel table for Paraopeba - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3634
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3634
 
 # Physical channel 33 (virtual 33.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-Passos b/isdb-t/br-mg-Passos
index 86f4c9db..922eb158 100644
--- a/isdb-t/br-mg-Passos
+++ b/isdb-t/br-mg-Passos
@@ -1,8 +1,8 @@
 # Channel table for Passos - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/438
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=438
 
 # Physical channel 22 (virtual 22.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 23.1)
+[TV Alterosa Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 27 (virtual 11.1)
 [TV Paranaíba]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 29.1)
+[TV IndSOL]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 35.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-PatosDeMinas b/isdb-t/br-mg-PatosDeMinas
index f537db15..4600cc97 100644
--- a/isdb-t/br-mg-PatosDeMinas
+++ b/isdb-t/br-mg-PatosDeMinas
@@ -1,5 +1,5 @@
 # Channel table for Patos De Minas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/205
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=205
 
 # Physical channel 17 (virtual 2.1)
 [Band Triângulo]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 39.1)
-[Rede Vida]
+# Physical channel 23 (virtual 39.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 27.1)
+[Canal em teste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 12.1)
 [TV Paranaíba]
 	DELIVERY_SYSTEM = ISDBT
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 34.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-mg-Patrocinio b/isdb-t/br-mg-Patrocinio
index 8874488c..058ba9e0 100644
--- a/isdb-t/br-mg-Patrocinio
+++ b/isdb-t/br-mg-Patrocinio
@@ -1,5 +1,34 @@
-# Channel table for Patrocínio - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/327
+# Channel table for Patroc�nio - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=327
+
+# Physical channel 29 (virtual 9.1)
+[TV Paranaíba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 6.1)
 [TV Integração Uberlândia]
diff --git a/isdb-t/br-mg-PedroLeopoldo b/isdb-t/br-mg-PedroLeopoldo
index c4a78814..2118ff6e 100644
--- a/isdb-t/br-mg-PedroLeopoldo
+++ b/isdb-t/br-mg-PedroLeopoldo
@@ -1,11 +1,11 @@
 # Channel table for Pedro Leopoldo - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2933
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2933
 
-# Physical channel 17 (virtual 17.2)
-[Rede Minas]
+# Physical channel 15 (virtual 34.1)
+[Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 7.1)
-[Band MG]
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 59.1)
-[TV Centro Minas]
+# Physical channel 20 (virtual 7.1)
+[Band MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 34.1)
-[Record TV Minas]
+# Physical channel 23 (virtual 59.1)
+[TV Centro Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 19.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
diff --git a/isdb-t/br-mg-Pequi b/isdb-t/br-mg-Pequi
new file mode 100644
index 00000000..30d84b58
--- /dev/null
+++ b/isdb-t/br-mg-Pequi
@@ -0,0 +1,32 @@
+# Channel table for Pequi - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1831
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Perdigao b/isdb-t/br-mg-Perdigao
index f1f2d444..695cf19e 100644
--- a/isdb-t/br-mg-Perdigao
+++ b/isdb-t/br-mg-Perdigao
@@ -1,5 +1,5 @@
-# Channel table for Perdigão - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1037
+# Channel table for Perdig�o - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1037
 
 # Physical channel 42 (virtual 40.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-mg-Periquito b/isdb-t/br-mg-Periquito
index e2749175..a2f31a18 100644
--- a/isdb-t/br-mg-Periquito
+++ b/isdb-t/br-mg-Periquito
@@ -1,5 +1,34 @@
 # Channel table for Periquito - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2997
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2997
+
+# Physical channel 22 (virtual 11.1)
+[InterTV dos Vales]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 3.1)
 [TV Leste]
@@ -30,3 +59,119 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 6.1)
+[TV Rio Doce]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 9.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 13.2)
+[TV Alterosa Leste, TV Educação GV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 7.1)
+[TV Kéfas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-PiedadeDosGerais b/isdb-t/br-mg-PiedadeDosGerais
new file mode 100644
index 00000000..f5038aed
--- /dev/null
+++ b/isdb-t/br-mg-PiedadeDosGerais
@@ -0,0 +1,32 @@
+# Channel table for Piedade Dos Gerais - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3717
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Pimenta b/isdb-t/br-mg-Pimenta
index 1859283a..ca7173fe 100644
--- a/isdb-t/br-mg-Pimenta
+++ b/isdb-t/br-mg-Pimenta
@@ -1,5 +1,5 @@
 # Channel table for Pimenta - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3131
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3131
 
 # Physical channel 15 (virtual 19.1)
 [Record TV Minas]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 34.1)
+[TV Alterosa Divinópolis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Pirajuba b/isdb-t/br-mg-Pirajuba
index 6713d945..ecad457c 100644
--- a/isdb-t/br-mg-Pirajuba
+++ b/isdb-t/br-mg-Pirajuba
@@ -1,5 +1,5 @@
 # Channel table for Pirajuba - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3285
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3285
 
 # Physical channel 23 (virtual 40.1)
 [Rede Vida]
diff --git a/isdb-t/br-mg-Pirapora b/isdb-t/br-mg-Pirapora
index 227157eb..ab480109 100644
--- a/isdb-t/br-mg-Pirapora
+++ b/isdb-t/br-mg-Pirapora
@@ -1,7 +1,7 @@
 # Channel table for Pirapora - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/638
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=638
 
-# Physical channel 21 (virtual 22.1)
+# Physical channel 21 (virtual 7.1)
 [InterTV Grande Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 6.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 15.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-Piumhi b/isdb-t/br-mg-Piumhi
index ff8dd144..376bbf92 100644
--- a/isdb-t/br-mg-Piumhi
+++ b/isdb-t/br-mg-Piumhi
@@ -1,5 +1,5 @@
 # Channel table for Piumhi - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/680
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=680
 
 # Physical channel 34 (virtual 56.1)
 [TV Alterosa Divinópolis]
diff --git a/isdb-t/br-mg-Planura b/isdb-t/br-mg-Planura
index 5d615b33..8d9d782b 100644
--- a/isdb-t/br-mg-Planura
+++ b/isdb-t/br-mg-Planura
@@ -1,5 +1,5 @@
 # Channel table for Planura - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1026
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1026
 
 # Physical channel 23 (virtual 40.1)
 [Rede Vida]
@@ -88,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 7.1)
+[EPTV Ribeirão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-PocosDeCaldas b/isdb-t/br-mg-PocosDeCaldas
index 099bae1c..59075fec 100644
--- a/isdb-t/br-mg-PocosDeCaldas
+++ b/isdb-t/br-mg-PocosDeCaldas
@@ -1,11 +1,11 @@
-# Channel table for Poços De Caldas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/21
+# Channel table for Po�os De Caldas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=21
 
-# Physical channel 17 (virtual 17.1)
+# Physical channel 15 (virtual 15.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 28 (virtual 28.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 34.1)
 [Band MG]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
-[Rede Vida]
+# Physical channel 49 (virtual 49.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-PonteNova b/isdb-t/br-mg-PonteNova
index fdb74886..d24a05e7 100644
--- a/isdb-t/br-mg-PonteNova
+++ b/isdb-t/br-mg-PonteNova
@@ -1,8 +1,37 @@
 # Channel table for Ponte Nova - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/135
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=135
+
+# Physical channel 16 (virtual 11.1)
+[TV Educar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 3.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -30,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Porteirinha b/isdb-t/br-mg-Porteirinha
index d3c8053d..701dff9e 100644
--- a/isdb-t/br-mg-Porteirinha
+++ b/isdb-t/br-mg-Porteirinha
@@ -1,5 +1,5 @@
 # Channel table for Porteirinha - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1973
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1973
 
 # Physical channel 20 (virtual 10.1)
 [InterTV Grande Minas]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 51.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-PousoAlegre b/isdb-t/br-mg-PousoAlegre
index 9c8987b7..f7c67bd9 100644
--- a/isdb-t/br-mg-PousoAlegre
+++ b/isdb-t/br-mg-PousoAlegre
@@ -1,8 +1,8 @@
 # Channel table for Pouso Alegre - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/14
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=14
 
-# Physical channel 18 (virtual 18.4)
-[TV Senado, TV Câmara, TV Assembleia MG, TV Câmara Prof. Breno Coutinho]
+# Physical channel 18 (virtual 18.5)
+[TV Senado, TV Câmara, TV Assembleia MG, TV Câmara Prof. Breno Coutinho, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 6.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.1)
-[TV Libertas]
+# Physical channel 40 (virtual 3.1)
+[Rede América]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -204,7 +204,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
+# Physical channel 46 (virtual 46.1)
+[TV Diversa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 45.1)
 [TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-mg-Prados b/isdb-t/br-mg-Prados
index 5af02475..a0966610 100644
--- a/isdb-t/br-mg-Prados
+++ b/isdb-t/br-mg-Prados
@@ -1,5 +1,5 @@
 # Channel table for Prados - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2989
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2989
 
 # Physical channel 41 (virtual 41.1)
 [TV Diversa]
diff --git a/isdb-t/br-mg-Prata b/isdb-t/br-mg-Prata
index 02440c18..a9a477d6 100644
--- a/isdb-t/br-mg-Prata
+++ b/isdb-t/br-mg-Prata
@@ -1,5 +1,5 @@
 # Channel table for Prata - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2144
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2144
 
 # Physical channel 28 (virtual 4.1)
 [TV Paranaíba]
diff --git a/isdb-t/br-mg-PrudenteDeMorais b/isdb-t/br-mg-PrudenteDeMorais
index 6f01f4b3..6ee5dfd2 100644
--- a/isdb-t/br-mg-PrudenteDeMorais
+++ b/isdb-t/br-mg-PrudenteDeMorais
@@ -1,8 +1,8 @@
 # Channel table for Prudente De Morais - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3621
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3621
 
 # Physical channel 18 (virtual 38.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 30.1)
-[Rede Vida]
+# Physical channel 49 (virtual 7.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-Queluzito b/isdb-t/br-mg-Queluzito
new file mode 100644
index 00000000..346389a0
--- /dev/null
+++ b/isdb-t/br-mg-Queluzito
@@ -0,0 +1,32 @@
+# Channel table for Queluzito - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1131
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Raposos b/isdb-t/br-mg-Raposos
index 4eb9f292..8d790411 100644
--- a/isdb-t/br-mg-Raposos
+++ b/isdb-t/br-mg-Raposos
@@ -1,5 +1,5 @@
 # Channel table for Raposos - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3608
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3608
 
 # Physical channel 14 (virtual 14.2)
 [Rede Minas]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede Vida]
+# Physical channel 49 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-RaulSoares b/isdb-t/br-mg-RaulSoares
index a1b10aa5..0b6a78f1 100644
--- a/isdb-t/br-mg-RaulSoares
+++ b/isdb-t/br-mg-RaulSoares
@@ -1,5 +1,5 @@
 # Channel table for Raul Soares - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2915
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2915
 
 # Physical channel 26 (virtual 41.1)
 [Rede Século 21]
diff --git a/isdb-t/br-mg-RibeiraoDasNeves b/isdb-t/br-mg-RibeiraoDasNeves
index 13c63146..9a6955be 100644
--- a/isdb-t/br-mg-RibeiraoDasNeves
+++ b/isdb-t/br-mg-RibeiraoDasNeves
@@ -1,5 +1,5 @@
-# Channel table for Ribeirão Das Neves - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3622
+# Channel table for Ribeir�o Das Neves - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3622
 
 # Physical channel 15 (virtual 2.1)
 [Record TV Minas]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 9.2)
+# Physical channel 17 (virtual 17.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.2)
-[Rede Super]
+# Physical channel 32 (virtual 32.1)
+[TV WSN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -407,7 +407,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
+# Physical channel 45 (virtual 11.4)
 [TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-mg-RioAcima b/isdb-t/br-mg-RioAcima
index e721fa51..f65bfcbe 100644
--- a/isdb-t/br-mg-RioAcima
+++ b/isdb-t/br-mg-RioAcima
@@ -1,5 +1,5 @@
 # Channel table for Rio Acima - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3612
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3612
 
 # Physical channel 17 (virtual 9.1)
 [Rede Minas]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
diff --git a/isdb-t/br-mg-RioManso b/isdb-t/br-mg-RioManso
new file mode 100644
index 00000000..70da85ef
--- /dev/null
+++ b/isdb-t/br-mg-RioManso
@@ -0,0 +1,32 @@
+# Channel table for Rio Manso - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1039
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-RioPardoDeMinas b/isdb-t/br-mg-RioPardoDeMinas
new file mode 100644
index 00000000..d20ceca5
--- /dev/null
+++ b/isdb-t/br-mg-RioPardoDeMinas
@@ -0,0 +1,32 @@
+# Channel table for Rio Pardo De Minas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3097
+
+# Physical channel 21 (virtual 8.1)
+[InterTV Grande Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Sabara b/isdb-t/br-mg-Sabara
index a43415de..06e8d846 100644
--- a/isdb-t/br-mg-Sabara
+++ b/isdb-t/br-mg-Sabara
@@ -1,5 +1,5 @@
-# Channel table for Sabará - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3609
+# Channel table for Sabar� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3609
 
 # Physical channel 12 (virtual 12.1)
 [Rede Super]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 15.1)
-[TV Horizonte]
+# Physical channel 30 (virtual 15.2)
+[TV Horizonte, TV Horizonte Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 10.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -233,6 +233,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 32.1)
+[TV WSN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 5.1)
 [TV Alterosa]
 	DELIVERY_SYSTEM = ISDBT
@@ -291,6 +320,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 39.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 40.1)
+[TV Diversa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 58.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -321,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 43.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -378,6 +465,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 11.4)
+[TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 50 (virtual 27.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-Sacramento b/isdb-t/br-mg-Sacramento
index c281311b..5c29a12d 100644
--- a/isdb-t/br-mg-Sacramento
+++ b/isdb-t/br-mg-Sacramento
@@ -1,5 +1,5 @@
 # Channel table for Sacramento - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/877
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=877
 
 # Physical channel 28 (virtual 9.1)
 [TV Paranaíba]
diff --git a/isdb-t/br-mg-Salinas b/isdb-t/br-mg-Salinas
index 98df58e3..670ac277 100644
--- a/isdb-t/br-mg-Salinas
+++ b/isdb-t/br-mg-Salinas
@@ -1,5 +1,5 @@
 # Channel table for Salinas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/251
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=251
 
 # Physical channel 21 (virtual 4.1)
 [InterTV Grande Minas]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 51.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-SantaBarbara b/isdb-t/br-mg-SantaBarbara
index f691db1f..138de053 100644
--- a/isdb-t/br-mg-SantaBarbara
+++ b/isdb-t/br-mg-SantaBarbara
@@ -1,5 +1,5 @@
-# Channel table for Santa Bárbara - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3222
+# Channel table for Santa B�rbara - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3222
 
 # Physical channel 28 (virtual 2.1)
 [Record TV Minas]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 6.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 35 (virtual 35.1)
+[TV Caraça]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-SantaLuzia b/isdb-t/br-mg-SantaLuzia
index 52f98417..267f4144 100644
--- a/isdb-t/br-mg-SantaLuzia
+++ b/isdb-t/br-mg-SantaLuzia
@@ -1,8 +1,8 @@
 # Channel table for Santa Luzia - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3313
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3313
 
-# Physical channel 15 (virtual 2.1)
-[TV Canal Livre, Record TV Minas]
+# Physical channel 15 (virtual 15.1)
+[Record TV Minas, TV Canal Livre]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 9.2)
+# Physical channel 17 (virtual 17.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
-[TV Novo Tempo]
+[Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 52.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -262,6 +262,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 31.1)
+[TV A Crítica]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 2.1)
 [Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
@@ -350,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -407,7 +436,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 56.2)
+# Physical channel 38 (virtual 56.1)
 [CNT Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -523,7 +552,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
+# Physical channel 45 (virtual 11.4)
 [TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -553,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 50.1)
-[Rede Bênção]
+[Rede América]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
@@ -581,8 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede Vida]
+# Physical channel 49 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-SantaRitaDoSapucai b/isdb-t/br-mg-SantaRitaDoSapucai
index f4a4d044..32707049 100644
--- a/isdb-t/br-mg-SantaRitaDoSapucai
+++ b/isdb-t/br-mg-SantaRitaDoSapucai
@@ -1,5 +1,5 @@
-# Channel table for Santa Rita Do Sapucaí - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/377
+# Channel table for Santa Rita Do Sapuca� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=377
 
 # Physical channel 19 (virtual 19.1)
 [Band MG]
@@ -30,6 +30,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 30.1)
+[TV Alterosa Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 5.1)
 [EPTV Sul de Minas]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-SantaVitoria b/isdb-t/br-mg-SantaVitoria
index 11b84eeb..486bcbfe 100644
--- a/isdb-t/br-mg-SantaVitoria
+++ b/isdb-t/br-mg-SantaVitoria
@@ -1,5 +1,5 @@
-# Channel table for Santa Vitória - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/569
+# Channel table for Santa Vit�ria - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=569
 
 # Physical channel 28 (virtual 4.1)
 [TV Paranaíba]
diff --git a/isdb-t/br-sp-PiraporaDoBomJesus b/isdb-t/br-mg-SantanaDePirapama
index ce1f1776..eb88ec05 100644
--- a/isdb-t/br-sp-PiraporaDoBomJesus
+++ b/isdb-t/br-mg-SantanaDePirapama
@@ -1,8 +1,8 @@
-# Channel table for Pirapora Do Bom Jesus - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3717
+# Channel table for Santana De Pirapama - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4246
 
 # Physical channel 20 (virtual 7.1)
-[Record TV]
+[Band MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-mg-SantanaDoRiacho b/isdb-t/br-mg-SantanaDoRiacho
new file mode 100644
index 00000000..a25d9c6f
--- /dev/null
+++ b/isdb-t/br-mg-SantanaDoRiacho
@@ -0,0 +1,32 @@
+# Channel table for Santana Do Riacho - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2476
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-SantosDumont b/isdb-t/br-mg-SantosDumont
index 795a786b..21d5077f 100644
--- a/isdb-t/br-mg-SantosDumont
+++ b/isdb-t/br-mg-SantosDumont
@@ -1,5 +1,5 @@
 # Channel table for Santos Dumont - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3289
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3289
 
 # Physical channel 41 (virtual 41.1)
 [TV Diversa]
diff --git a/isdb-t/br-mg-SaoBrasDeSuacui b/isdb-t/br-mg-SaoBrasDeSuacui
new file mode 100644
index 00000000..b30946dd
--- /dev/null
+++ b/isdb-t/br-mg-SaoBrasDeSuacui
@@ -0,0 +1,32 @@
+# Channel table for S�o Br�s De Sua�u� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1148
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-SaoFrancisco b/isdb-t/br-mg-SaoFrancisco
index 744d47e2..03fcce4b 100644
--- a/isdb-t/br-mg-SaoFrancisco
+++ b/isdb-t/br-mg-SaoFrancisco
@@ -1,5 +1,5 @@
-# Channel table for São Francisco - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2946
+# Channel table for S�o Francisco - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2946
 
 # Physical channel 21 (virtual 4.1)
 [InterTV Grande Minas]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 26 (virtual 26.1)
+[TV Rio Preto]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 11.1)
 [Band MG]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-SaoFranciscoDeSales b/isdb-t/br-mg-SaoFranciscoDeSales
index 4d7beac6..f88a3247 100644
--- a/isdb-t/br-mg-SaoFranciscoDeSales
+++ b/isdb-t/br-mg-SaoFranciscoDeSales
@@ -1,5 +1,5 @@
-# Channel table for São Francisco De Sales - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2145
+# Channel table for S�o Francisco De Sales - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2145
 
 # Physical channel 29 (virtual 25.1)
 [TV Paranaíba]
diff --git a/isdb-t/br-mg-SaoGoncaloDoPara b/isdb-t/br-mg-SaoGoncaloDoPara
new file mode 100644
index 00000000..94838f17
--- /dev/null
+++ b/isdb-t/br-mg-SaoGoncaloDoPara
@@ -0,0 +1,177 @@
+# Channel table for S�o Gon�alo Do Par� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4146
+
+# Physical channel 15 (virtual 14.1)
+[Record TV Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 3.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 8.1)
+[TV Integração Araxá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 10.1)
+[TV Alterosa Divinópolis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 22.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-SaoGoncaloDoRioAbaixo b/isdb-t/br-mg-SaoGoncaloDoRioAbaixo
new file mode 100644
index 00000000..50f3106e
--- /dev/null
+++ b/isdb-t/br-mg-SaoGoncaloDoRioAbaixo
@@ -0,0 +1,90 @@
+# Channel table for S�o Gon�alo Do Rio Abaixo - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4077
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 2.1)
+[Record TV Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 33.1)
+[TV Globo Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-SaoJoaoDelRei b/isdb-t/br-mg-SaoJoaoDelRei
index 8da9724c..612d3bc0 100644
--- a/isdb-t/br-mg-SaoJoaoDelRei
+++ b/isdb-t/br-mg-SaoJoaoDelRei
@@ -1,7 +1,7 @@
-# Channel table for São João Del Rei - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/173
+# Channel table for S�o Jo�o Del Rei - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=173
 
-# Physical channel 24 (virtual 19.1)
+# Physical channel 24 (virtual 24.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-mg-SaoJoaoDoParaiso b/isdb-t/br-mg-SaoJoaoDoParaiso
index 76488377..56ca4c5d 100644
--- a/isdb-t/br-mg-SaoJoaoDoParaiso
+++ b/isdb-t/br-mg-SaoJoaoDoParaiso
@@ -1,5 +1,5 @@
-# Channel table for São João Do Paraíso - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3675
+# Channel table for S�o Jo�o Do Para�so - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3675
 
 # Physical channel 21 (virtual 9.1)
 [InterTV Grande Minas]
diff --git a/isdb-t/br-mg-SaoJoaquimDeBicas b/isdb-t/br-mg-SaoJoaquimDeBicas
index cfd2d846..73876972 100644
--- a/isdb-t/br-mg-SaoJoaquimDeBicas
+++ b/isdb-t/br-mg-SaoJoaquimDeBicas
@@ -1,8 +1,8 @@
-# Channel table for São Joaquim De Bicas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3618
+# Channel table for S�o Joaquim De Bicas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3618
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 9.2)
+# Physical channel 17 (virtual 17.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -262,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
+# Physical channel 45 (virtual 11.4)
 [TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede Vida]
+# Physical channel 49 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-SaoJoseDaLapa b/isdb-t/br-mg-SaoJoseDaLapa
index fc940d47..4b2075af 100644
--- a/isdb-t/br-mg-SaoJoseDaLapa
+++ b/isdb-t/br-mg-SaoJoseDaLapa
@@ -1,8 +1,8 @@
-# Channel table for São José Da Lapa - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3616
+# Channel table for S�o Jos� Da Lapa - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3616
 
 # Physical channel 14 (virtual 14.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 52.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.2)
-[Rede Super]
+[TV WSN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -378,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
+# Physical channel 45 (virtual 11.4)
 [TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede Vida]
+# Physical channel 49 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-SaoJoseDaVarginha b/isdb-t/br-mg-SaoJoseDaVarginha
index e2f84a5c..b30bab71 100644
--- a/isdb-t/br-mg-SaoJoseDaVarginha
+++ b/isdb-t/br-mg-SaoJoseDaVarginha
@@ -1,5 +1,34 @@
-# Channel table for São José Da Varginha - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3614
+# Channel table for S�o Jos� Da Varginha - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3614
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 2.1)
 [Record TV Minas]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-mg-SaoLourenco b/isdb-t/br-mg-SaoLourenco
index 5677071b..b8a83be8 100644
--- a/isdb-t/br-mg-SaoLourenco
+++ b/isdb-t/br-mg-SaoLourenco
@@ -1,5 +1,5 @@
-# Channel table for São Lourenço - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/334
+# Channel table for S�o Louren�o - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=334
 
 # Physical channel 38 (virtual 38.1)
 [TV Diversa]
diff --git a/isdb-t/br-mg-SaoSebastiaoDoOeste b/isdb-t/br-mg-SaoSebastiaoDoOeste
new file mode 100644
index 00000000..b06210fb
--- /dev/null
+++ b/isdb-t/br-mg-SaoSebastiaoDoOeste
@@ -0,0 +1,206 @@
+# Channel table for S�o Sebasti�o Do Oeste - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4145
+
+# Physical channel 15 (virtual 14.1)
+[Record TV Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 3.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 8.1)
+[TV Integração Araxá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 10.1)
+[TV Alterosa Divinópolis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 22.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 13.1)
+[TV Candidés]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-SaoSebastiaoDoParaiso b/isdb-t/br-mg-SaoSebastiaoDoParaiso
index ddd5909b..2d05d2f5 100644
--- a/isdb-t/br-mg-SaoSebastiaoDoParaiso
+++ b/isdb-t/br-mg-SaoSebastiaoDoParaiso
@@ -1,5 +1,5 @@
-# Channel table for São Sebastião Do Paraíso - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/136
+# Channel table for S�o Sebasti�o Do Para�so - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=136
 
 # Physical channel 23 (virtual 23.1)
 [TV Alterosa Sul]
diff --git a/isdb-t/br-mg-Sarzedo b/isdb-t/br-mg-Sarzedo
index 5b481d05..7da26e18 100644
--- a/isdb-t/br-mg-Sarzedo
+++ b/isdb-t/br-mg-Sarzedo
@@ -1,8 +1,8 @@
 # Channel table for Sarzedo - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3606
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3606
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 9.2)
+# Physical channel 17 (virtual 17.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -291,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
+# Physical channel 45 (virtual 11.4)
 [TV Câmara, TV Assembleia MG, TV Câmara Municipal BH, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-mg-SerraDoSalitre b/isdb-t/br-mg-SerraDoSalitre
index e7cf83b6..1062def8 100644
--- a/isdb-t/br-mg-SerraDoSalitre
+++ b/isdb-t/br-mg-SerraDoSalitre
@@ -1,5 +1,5 @@
 # Channel table for Serra Do Salitre - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3286
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3286
 
 # Physical channel 30 (virtual 6.1)
 [TV Integração Araxá]
diff --git a/isdb-t/br-mg-SeteLagoas b/isdb-t/br-mg-SeteLagoas
index c3c3ce84..cebf1656 100644
--- a/isdb-t/br-mg-SeteLagoas
+++ b/isdb-t/br-mg-SeteLagoas
@@ -1,5 +1,5 @@
 # Channel table for Sete Lagoas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/294
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=294
 
 # Physical channel 12 (virtual 12.1)
 [Rede Super]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 38.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 43.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 46.4)
-[TV Câmara, TV Câmara Municipal Sete Lagoas, TV Assembleia MG, TV Senado]
+# Physical channel 46 (virtual 11.5)
+[TV Câmara, TV Câmara Municipal Sete Lagoas, TV Assembleia MG, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 30.1)
-[Rede Vida]
+# Physical channel 49 (virtual 7.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mg-SoledadeDeMinas b/isdb-t/br-mg-SoledadeDeMinas
new file mode 100644
index 00000000..965c69d2
--- /dev/null
+++ b/isdb-t/br-mg-SoledadeDeMinas
@@ -0,0 +1,32 @@
+# Channel table for Soledade De Minas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4192
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Taiobeiras b/isdb-t/br-mg-Taiobeiras
index 8fa11057..c94c557c 100644
--- a/isdb-t/br-mg-Taiobeiras
+++ b/isdb-t/br-mg-Taiobeiras
@@ -1,5 +1,5 @@
 # Channel table for Taiobeiras - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1514
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1514
 
 # Physical channel 21 (virtual 11.1)
 [InterTV Grande Minas]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-TaquaracuDeMinas b/isdb-t/br-mg-TaquaracuDeMinas
index 229170f4..6512ff6d 100644
--- a/isdb-t/br-mg-TaquaracuDeMinas
+++ b/isdb-t/br-mg-TaquaracuDeMinas
@@ -1,7 +1,7 @@
-# Channel table for Taquaraçu De Minas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3627
+# Channel table for Taquara�u De Minas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3627
 
-# Physical channel 15 (virtual 2.1)
+# Physical channel 15 (virtual 15.1)
 [Record TV Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
-[TV Novo Tempo]
+[Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -146,37 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[RBI TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 25 (virtual 4.1)
-[Rede TV! MG]
+# Physical channel 25 (virtual 4.2)
+[Rede TV! MG, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -205,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 52.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -263,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -320,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 56.2)
+# Physical channel 38 (virtual 56.1)
 [CNT Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-mg-TeofiloOtoni b/isdb-t/br-mg-TeofiloOtoni
index d9d5ccff..9bce4112 100644
--- a/isdb-t/br-mg-TeofiloOtoni
+++ b/isdb-t/br-mg-TeofiloOtoni
@@ -1,8 +1,8 @@
-# Channel table for Teófilo Otoni - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/290
+# Channel table for Te�filo Otoni - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=290
 
 # Physical channel 14 (virtual 14.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 17.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -117,11 +146,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 52 (virtual 52.1)
+# Physical channel 38 (virtual 10.1)
+[TV Alterosa Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 4.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 701142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-mg-Timoteo b/isdb-t/br-mg-Timoteo
index 128eb72f..b25a53b9 100644
--- a/isdb-t/br-mg-Timoteo
+++ b/isdb-t/br-mg-Timoteo
@@ -1,5 +1,34 @@
-# Channel table for Timóteo - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2947
+# Channel table for Tim�teo - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2947
+
+# Physical channel 16 (virtual 13.1)
+[TV Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 10.1)
 [InterTV dos Vales]
@@ -59,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 12.1)
-[TV Leste]
+# Physical channel 36 (virtual 6.1)
+[Band MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 575142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +117,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 6.1)
-[Band MG]
+# Physical channel 38 (virtual 8.1)
+[TV Alterosa Leste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 44.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-mg-Tiradentes b/isdb-t/br-mg-Tiradentes
index 8f2d1e64..90755b53 100644
--- a/isdb-t/br-mg-Tiradentes
+++ b/isdb-t/br-mg-Tiradentes
@@ -1,8 +1,8 @@
 # Channel table for Tiradentes - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3066
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3066
 
 # Physical channel 18 (virtual 18.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -30,93 +30,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
-[Band MG]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 23 (virtual 23.1)
-[Rede Mundial]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 27 (virtual 27.1)
-[TV Alterosa Juiz de Fora]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 41 (virtual 41.1)
 [TV Diversa]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-TresCoracoes b/isdb-t/br-mg-TresCoracoes
index 8000267d..aa303998 100644
--- a/isdb-t/br-mg-TresCoracoes
+++ b/isdb-t/br-mg-TresCoracoes
@@ -1,5 +1,5 @@
-# Channel table for Três Corações - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/380
+# Channel table for Tr�s Cora��es - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=380
 
 # Physical channel 14 (virtual 13.1)
 [TV Rio Verde]
@@ -88,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[Rede Mais]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-TresMarias b/isdb-t/br-mg-TresMarias
index 31798e4b..1e109894 100644
--- a/isdb-t/br-mg-TresMarias
+++ b/isdb-t/br-mg-TresMarias
@@ -1,5 +1,5 @@
-# Channel table for Três Marias - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2869
+# Channel table for Tr�s Marias - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2869
 
 # Physical channel 17 (virtual 7.1)
 [TV Três Marias]
diff --git a/isdb-t/br-mg-TresPontas b/isdb-t/br-mg-TresPontas
index 6e1d39c9..a70d4529 100644
--- a/isdb-t/br-mg-TresPontas
+++ b/isdb-t/br-mg-TresPontas
@@ -1,5 +1,34 @@
-# Channel table for Três Pontas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/106
+# Channel table for Tr�s Pontas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=106
+
+# Physical channel 16 (virtual 16.1)
+[Rede Século 21]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 17 (virtual 17.2)
 [Rede Minas]
@@ -30,8 +59,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 23.1)
-[TV Alterosa Sul]
+# Physical channel 24 (virtual 24.1)
+[Universo TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.2)
+[TV Alterosa Sul, Canal em teste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-mg-Tumiritinga b/isdb-t/br-mg-Tumiritinga
new file mode 100644
index 00000000..4a13bb56
--- /dev/null
+++ b/isdb-t/br-mg-Tumiritinga
@@ -0,0 +1,380 @@
+# Channel table for Tumiritinga - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4322
+
+# Physical channel 15 (virtual 15.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 19 (virtual 23.1)
+[TV Pai Eterno MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 11.1)
+[InterTV dos Vales]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 28.1)
+[Rede Família]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 3.1)
+[TV Leste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 6.1)
+[TV Rio Doce]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 34.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 9.1)
+[Band MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 13.2)
+[TV Alterosa Leste, TV Educação GV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 14.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 7.1)
+[TV Kéfas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-go-BuritiAlegre b/isdb-t/br-mg-Tupaciguara
index f4678312..73a2f9f4 100644
--- a/isdb-t/br-go-BuritiAlegre
+++ b/isdb-t/br-mg-Tupaciguara
@@ -1,8 +1,8 @@
-# Channel table for Buriti Alegre - GO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1715
+# Channel table for Tupaciguara - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2146
 
-# Physical channel 16 (virtual 11.1)
-[TV Anhanguera Itumbiara]
+# Physical channel 16 (virtual 16.2)
+[Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
diff --git a/isdb-t/br-mg-Uba b/isdb-t/br-mg-Uba
index 33dcb74d..9ae92975 100644
--- a/isdb-t/br-mg-Uba
+++ b/isdb-t/br-mg-Uba
@@ -1,5 +1,5 @@
-# Channel table for Ubá - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/247
+# Channel table for Ub� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=247
 
 # Physical channel 29 (virtual 29.1)
 [TV Integração Juiz de Fora]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 48.1)
+# Physical channel 42 (virtual 27.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-mg-Uberaba b/isdb-t/br-mg-Uberaba
index 215ae67c..8384b75d 100644
--- a/isdb-t/br-mg-Uberaba
+++ b/isdb-t/br-mg-Uberaba
@@ -1,5 +1,5 @@
 # Channel table for Uberaba - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/150
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=150
 
 # Physical channel 17 (virtual 7.1)
 [Band Triângulo]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 18.1)
-[Rede Vida]
+# Physical channel 23 (virtual 18.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 30.1)
+[ISTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 31 (virtual 11.1)
 [TV Mundo Maior/TV CEI]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 5.1)
+[TV Universitária]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 3.1)
 [TV Integração Uberaba]
 	DELIVERY_SYSTEM = ISDBT
@@ -175,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 10.1)
+# Physical channel 40 (virtual 40.1)
 [TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -205,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -262,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
-[TV Câmara, TV Assembleia MG, TV Câmara Municipal Uberaba, TV Senado]
+# Physical channel 45 (virtual 4.5)
+[TV Câmara, TV Assembleia MG, TV Câmara Municipal Uberaba, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-mg-Uberlandia b/isdb-t/br-mg-Uberlandia
index 7fe60550..6f31ef0d 100644
--- a/isdb-t/br-mg-Uberlandia
+++ b/isdb-t/br-mg-Uberlandia
@@ -1,5 +1,5 @@
-# Channel table for Uberlândia - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/30
+# Channel table for Uberl�ndia - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=30
 
 # Physical channel 14 (virtual 14.1)
 [TV Novo Tempo]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 15 (virtual 15.2)
-[Rede Mundial]
+# Physical channel 15 (virtual 15.1)
+[Rede TV! Sul]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[Rede Vida]
+# Physical channel 23 (virtual 23.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 8.1)
-[TV Integração Uberlândia]
+# Physical channel 30 (virtual 8.2)
+[TV Integração Uberlândia, Canal em teste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -320,6 +320,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 40.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 42.1)
 [Rede Gênesis]
 	DELIVERY_SYSTEM = ISDBT
@@ -349,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.4)
-[TV Câmara, TV Assembleia MG, TV Câmara Uberlândia, TV Senado]
+# Physical channel 45 (virtual 9.5)
+[TV Câmara, TV Assembleia MG, TV Câmara Uberlândia, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-mg-Unai b/isdb-t/br-mg-Unai
index c6d9a138..2618d73e 100644
--- a/isdb-t/br-mg-Unai
+++ b/isdb-t/br-mg-Unai
@@ -1,5 +1,5 @@
-# Channel table for Unaí - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2137
+# Channel table for Una� - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2137
 
 # Physical channel 15 (virtual 51.1)
 [Rede Mais]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 26 (virtual 13.1)
+[TV Rio Preto]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 9.1)
 [Band Triângulo]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-Urucuia b/isdb-t/br-mg-Urucuia
new file mode 100644
index 00000000..ba514f13
--- /dev/null
+++ b/isdb-t/br-mg-Urucuia
@@ -0,0 +1,32 @@
+# Channel table for Urucuia - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4041
+
+# Physical channel 26 (virtual 26.1)
+[TV Rio Preto]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-Varginha b/isdb-t/br-mg-Varginha
index 441cc432..eaa0229d 100644
--- a/isdb-t/br-mg-Varginha
+++ b/isdb-t/br-mg-Varginha
@@ -1,5 +1,34 @@
 # Channel table for Varginha - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/149
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=149
+
+# Physical channel 22 (virtual 22.1)
+[TV Diversa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 4.1)
 [TV Alterosa Sul]
@@ -30,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 28 (virtual 28.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 11.1)
 [Rede Mais]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 58.1)
+[Rede 7 TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 5.1)
 [EPTV Sul de Minas]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,3 +233,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-VarzeaDaPalma b/isdb-t/br-mg-VarzeaDaPalma
index ed7bda62..a609728f 100644
--- a/isdb-t/br-mg-VarzeaDaPalma
+++ b/isdb-t/br-mg-VarzeaDaPalma
@@ -1,5 +1,5 @@
-# Channel table for Várzea Da Palma - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3441
+# Channel table for V�rzea Da Palma - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3441
 
 # Physical channel 20 (virtual 9.1)
 [InterTV Grande Minas]
diff --git a/isdb-t/br-mg-Vespasiano b/isdb-t/br-mg-Vespasiano
index 4594c332..884c8586 100644
--- a/isdb-t/br-mg-Vespasiano
+++ b/isdb-t/br-mg-Vespasiano
@@ -1,5 +1,5 @@
 # Channel table for Vespasiano - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3086
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3086
 
 # Physical channel 15 (virtual 2.1)
 [Record TV Minas]
@@ -30,7 +30,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 17.2)
+# Physical channel 16 (virtual 16.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 9.2)
 [Rede Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,8 +117,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 31.1)
+[TV A Crítica]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 33 (virtual 12.1)
-[Globo Minas]
+[TV Globo Minas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -146,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 40.1)
+[TV Diversa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 51.1)
 [Universo TV]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mg-Vicosa b/isdb-t/br-mg-Vicosa
index cddfaeb3..06011182 100644
--- a/isdb-t/br-mg-Vicosa
+++ b/isdb-t/br-mg-Vicosa
@@ -1,5 +1,5 @@
-# Channel table for Viçosa - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/125
+# Channel table for Vi�osa - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=125
 
 # Physical channel 15 (virtual 19.1)
 [Record TV Minas]
diff --git a/isdb-t/br-mg-ViscondeDoRioBranco b/isdb-t/br-mg-ViscondeDoRioBranco
new file mode 100644
index 00000000..7f35b703
--- /dev/null
+++ b/isdb-t/br-mg-ViscondeDoRioBranco
@@ -0,0 +1,32 @@
+# Channel table for Visconde Do Rio Branco - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2926
+
+# Physical channel 38 (virtual 38.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-VoltaGrande b/isdb-t/br-mg-VoltaGrande
new file mode 100644
index 00000000..d1c12156
--- /dev/null
+++ b/isdb-t/br-mg-VoltaGrande
@@ -0,0 +1,32 @@
+# Channel table for Volta Grande - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3510
+
+# Physical channel 17 (virtual 17.2)
+[Rede Minas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-AguaComprida b/isdb-t/br-mg-aguaComprida
index 82cd5707..63868e28 100644
--- a/isdb-t/br-mg-AguaComprida
+++ b/isdb-t/br-mg-aguaComprida
@@ -1,5 +1,5 @@
-# Channel table for Água Comprida - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3049
+# Channel table for �gua Comprida - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3049
 
 # Physical channel 17 (virtual 7.1)
 [Band Triângulo]
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 61.4)
-[TV Câmara, TV Assembleia MG, TV Câmara Municipal Uberaba, Canal sem transmissão]
+# Physical channel 45 (virtual 4.5)
+[TV Câmara, TV Assembleia MG, TV Câmara Municipal Uberaba, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-mg-AguasFormosas b/isdb-t/br-mg-aguasFormosas
index 9fe5cefc..df3acec1 100644
--- a/isdb-t/br-mg-AguasFormosas
+++ b/isdb-t/br-mg-aguasFormosas
@@ -1,5 +1,5 @@
-# Channel table for Águas Formosas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2882
+# Channel table for �guas Formosas - MG - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2882
 
 # Physical channel 42 (virtual 27.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-ms-Amambai b/isdb-t/br-ms-Amambai
index fbad074e..13436bbe 100644
--- a/isdb-t/br-ms-Amambai
+++ b/isdb-t/br-ms-Amambai
@@ -1,5 +1,5 @@
-# Channel table for Amambaí - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/844
+# Channel table for Amamba� - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=844
 
 # Physical channel 30 (virtual 11.1)
 [TV Morena Ponta Porã]
diff --git a/isdb-t/br-ms-Anastacio b/isdb-t/br-ms-Anastacio
index 46ef42b5..9c88765e 100644
--- a/isdb-t/br-ms-Anastacio
+++ b/isdb-t/br-ms-Anastacio
@@ -1,5 +1,5 @@
-# Channel table for Anastácio - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2567
+# Channel table for Anast�cio - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2567
 
 # Physical channel 30 (virtual 10.1)
 [TV Morena]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 13.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Aquidauana b/isdb-t/br-ms-Aquidauana
index 6193d2a8..77fe00d4 100644
--- a/isdb-t/br-ms-Aquidauana
+++ b/isdb-t/br-ms-Aquidauana
@@ -1,5 +1,5 @@
 # Channel table for Aquidauana - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/411
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=411
 
 # Physical channel 30 (virtual 10.1)
 [TV Morena]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 13.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Bandeirantes b/isdb-t/br-ms-Bandeirantes
index f9ed3af2..eeaf945b 100644
--- a/isdb-t/br-ms-Bandeirantes
+++ b/isdb-t/br-ms-Bandeirantes
@@ -1,5 +1,5 @@
 # Channel table for Bandeirantes - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/749
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=749
 
 # Physical channel 31 (virtual 31.1)
 [TV Morena]
diff --git a/isdb-t/br-ms-Bataypora b/isdb-t/br-ms-Bataypora
new file mode 100644
index 00000000..ac71a4ba
--- /dev/null
+++ b/isdb-t/br-ms-Bataypora
@@ -0,0 +1,32 @@
+# Channel table for Bataypor� - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2770
+
+# Physical channel 41 (virtual 13.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-BelaVista b/isdb-t/br-ms-BelaVista
index 125f78d8..d67e88d2 100644
--- a/isdb-t/br-ms-BelaVista
+++ b/isdb-t/br-ms-BelaVista
@@ -1,5 +1,5 @@
 # Channel table for Bela Vista - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2572
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2572
 
 # Physical channel 35 (virtual 35.1)
 [TV Morena Ponta Porã]
diff --git a/isdb-t/br-ms-Bodoquena b/isdb-t/br-ms-Bodoquena
index c3976216..e63a595e 100644
--- a/isdb-t/br-ms-Bodoquena
+++ b/isdb-t/br-ms-Bodoquena
@@ -1,5 +1,5 @@
 # Channel table for Bodoquena - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2573
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2573
 
 # Physical channel 30 (virtual 12.1)
 [TV Morena]
diff --git a/isdb-t/br-ms-Bonito b/isdb-t/br-ms-Bonito
index aafa6365..038e39df 100644
--- a/isdb-t/br-ms-Bonito
+++ b/isdb-t/br-ms-Bonito
@@ -1,11 +1,40 @@
 # Channel table for Bonito - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/744
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=744
 
-# Physical channel 30 (virtual 7.1)
+# Physical channel 29 (virtual 29.1)
 [TV Morena]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 10.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ms-Caarapo b/isdb-t/br-ms-Caarapo
index cd4d3518..66a64049 100644
--- a/isdb-t/br-ms-Caarapo
+++ b/isdb-t/br-ms-Caarapo
@@ -1,8 +1,8 @@
-# Channel table for Caarapó - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2575
+# Channel table for Caarap� - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2575
 
-# Physical channel 29 (virtual 13.1)
-[TVE Cultura]
+# Physical channel 29 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 10.1)
+[SBT MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 38 (virtual 38.1)
 [TV MS]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,3 +117,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 5.1)
+[RIT Dourados]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-CampoGrande b/isdb-t/br-ms-CampoGrande
index c22620cf..f2f93f88 100644
--- a/isdb-t/br-ms-CampoGrande
+++ b/isdb-t/br-ms-CampoGrande
@@ -1,8 +1,8 @@
 # Channel table for Campo Grande - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/204
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=204
 
 # Physical channel 14 (virtual 15.1)
-[TV Imaculada Conceição]
+[TV Imaculada]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 13.1)
-[TV Interativa]
+[TV Guanandi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 23.1)
+[RBTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 24 (virtual 24.1)
 [Rede Brasil MS]
 	DELIVERY_SYSTEM = ISDBT
@@ -175,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 29.1)
-[RIT]
+# Physical channel 27 (virtual 27.1)
+[RIT Dourados]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 39.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -349,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 4.1)
-[TVE Cultura]
+# Physical channel 42 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -378,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[Rede Vida]
+# Physical channel 45 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ms-ChapadaoDoSul b/isdb-t/br-ms-ChapadaoDoSul
index 4ec72712..67951bc5 100644
--- a/isdb-t/br-ms-ChapadaoDoSul
+++ b/isdb-t/br-ms-ChapadaoDoSul
@@ -1,5 +1,5 @@
-# Channel table for Chapadão Do Sul - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/382
+# Channel table for Chapad�o Do Sul - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=382
 
 # Physical channel 30 (virtual 30.1)
 [TV Morena]
diff --git a/isdb-t/br-ms-Corguinho b/isdb-t/br-ms-Corguinho
new file mode 100644
index 00000000..350bed18
--- /dev/null
+++ b/isdb-t/br-ms-Corguinho
@@ -0,0 +1,32 @@
+# Channel table for Corguinho - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2590
+
+# Physical channel 30 (virtual 12.1)
+[TV Morena]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Corumba b/isdb-t/br-ms-Corumba
index eb7ae78a..58f34db6 100644
--- a/isdb-t/br-ms-Corumba
+++ b/isdb-t/br-ms-Corumba
@@ -1,5 +1,34 @@
-# Channel table for Corumbá - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/176
+# Channel table for Corumb� - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=176
+
+# Physical channel 26 (virtual 35.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 5.1)
 [TV Morena Corumbá]
@@ -30,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 11.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 43 (virtual 19.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ms-Coxim b/isdb-t/br-ms-Coxim
index e788516e..87efa5e5 100644
--- a/isdb-t/br-ms-Coxim
+++ b/isdb-t/br-ms-Coxim
@@ -1,5 +1,5 @@
 # Channel table for Coxim - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/654
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=654
 
 # Physical channel 43 (virtual 11.1)
 [Rede Vida]
diff --git a/isdb-t/br-ms-DoisIrmaosDoBuriti b/isdb-t/br-ms-DoisIrmaosDoBuriti
new file mode 100644
index 00000000..cdb093f1
--- /dev/null
+++ b/isdb-t/br-ms-DoisIrmaosDoBuriti
@@ -0,0 +1,61 @@
+# Channel table for Dois Irm�os Do Buriti - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4133
+
+# Physical channel 30 (virtual 6.1)
+[TV Morena]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 11.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Douradina b/isdb-t/br-ms-Douradina
index bb097e5a..efaf62b1 100644
--- a/isdb-t/br-ms-Douradina
+++ b/isdb-t/br-ms-Douradina
@@ -1,5 +1,34 @@
 # Channel table for Douradina - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3817
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3817
+
+# Physical channel 24 (virtual 24.1)
+[TV Novo Tempo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 21.1)
 [TV Canção Nova]
@@ -30,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 13.1)
-[TVE Cultura]
+# Physical channel 29 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-ms-Dourados b/isdb-t/br-ms-Dourados
index d2143146..fa9ee5da 100644
--- a/isdb-t/br-ms-Dourados
+++ b/isdb-t/br-ms-Dourados
@@ -1,5 +1,34 @@
 # Channel table for Dourados - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/152
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=152
+
+# Physical channel 24 (virtual 24.1)
+[TV Novo Tempo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 21.1)
 [TV Canção Nova]
@@ -30,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 13.1)
-[TVE Cultura]
+# Physical channel 29 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 27.1)
-[Rede Vida]
+# Physical channel 43 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-ms-FatimaDoSul b/isdb-t/br-ms-FatimaDoSul
index 0b7b3c68..3cc308a3 100644
--- a/isdb-t/br-ms-FatimaDoSul
+++ b/isdb-t/br-ms-FatimaDoSul
@@ -1,5 +1,5 @@
-# Channel table for Fátima Do Sul - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/748
+# Channel table for F�tima Do Sul - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=748
 
 # Physical channel 26 (virtual 21.1)
 [TV Canção Nova]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 13.1)
-[TVE Cultura]
+# Physical channel 29 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-ms-Figueirao b/isdb-t/br-ms-Figueirao
new file mode 100644
index 00000000..37934018
--- /dev/null
+++ b/isdb-t/br-ms-Figueirao
@@ -0,0 +1,32 @@
+# Channel table for Figueir�o - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4076
+
+# Physical channel 35 (virtual 35.1)
+[TV Morena]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-GloriaDeDourados b/isdb-t/br-ms-GloriaDeDourados
new file mode 100644
index 00000000..f1b92e38
--- /dev/null
+++ b/isdb-t/br-ms-GloriaDeDourados
@@ -0,0 +1,61 @@
+# Channel table for Gl�ria De Dourados - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2593
+
+# Physical channel 41 (virtual 11.1)
+[RIT Dourados]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 8
+[TV Morena Ponta Porã]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 183142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Itapora b/isdb-t/br-ms-Itapora
index b40db8c4..8ffa8b28 100644
--- a/isdb-t/br-ms-Itapora
+++ b/isdb-t/br-ms-Itapora
@@ -1,5 +1,34 @@
-# Channel table for Itaporã - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3647
+# Channel table for Itapor� - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3647
+
+# Physical channel 24 (virtual 24.1)
+[TV Novo Tempo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 21.1)
 [TV Canção Nova]
@@ -30,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 13.1)
-[TVE Cultura]
+# Physical channel 29 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 27.1)
-[Rede Vida]
+# Physical channel 43 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -233,3 +262,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 27.2)
+[Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Itaquirai b/isdb-t/br-ms-Itaquirai
index 3cd02c5c..b6ed3998 100644
--- a/isdb-t/br-ms-Itaquirai
+++ b/isdb-t/br-ms-Itaquirai
@@ -1,5 +1,5 @@
-# Channel table for Itaquiraí - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2529
+# Channel table for Itaquira� - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2529
 
 # Physical channel 30 (virtual 3.1)
 [TV Morena Ponta Porã]
diff --git a/isdb-t/br-ms-Ivinhema b/isdb-t/br-ms-Ivinhema
new file mode 100644
index 00000000..91404e69
--- /dev/null
+++ b/isdb-t/br-ms-Ivinhema
@@ -0,0 +1,32 @@
+# Channel table for Ivinhema - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2550
+
+# Physical channel 29 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Jardim b/isdb-t/br-ms-Jardim
index 4d7a1cfd..c8cc66f9 100644
--- a/isdb-t/br-ms-Jardim
+++ b/isdb-t/br-ms-Jardim
@@ -1,5 +1,5 @@
 # Channel table for Jardim - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2595
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2595
 
 # Physical channel 43 (virtual 7.1)
 [Rede Vida]
diff --git a/isdb-t/br-ms-Ladario b/isdb-t/br-ms-Ladario
index b71c9034..b7ddacc6 100644
--- a/isdb-t/br-ms-Ladario
+++ b/isdb-t/br-ms-Ladario
@@ -1,5 +1,5 @@
-# Channel table for Ladário - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1154
+# Channel table for Lad�rio - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1154
 
 # Physical channel 31 (virtual 5.1)
 [TV Morena Corumbá]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 11.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-LagunaCarapa b/isdb-t/br-ms-LagunaCarapa
new file mode 100644
index 00000000..3fed86a9
--- /dev/null
+++ b/isdb-t/br-ms-LagunaCarapa
@@ -0,0 +1,32 @@
+# Channel table for Laguna Carap� - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4316
+
+# Physical channel 31 (virtual 31.1)
+[TV Morena Ponta Porã]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Maracaju b/isdb-t/br-ms-Maracaju
index c7fda23e..8e5303f0 100644
--- a/isdb-t/br-ms-Maracaju
+++ b/isdb-t/br-ms-Maracaju
@@ -1,11 +1,40 @@
 # Channel table for Maracaju - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2486
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2486
 
-# Physical channel 30 (virtual 7.1)
+# Physical channel 33 (virtual 2.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 35.1)
 [TV Morena Ponta Porã]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ms-Miranda b/isdb-t/br-ms-Miranda
index 0d5f1786..69d3cfdb 100644
--- a/isdb-t/br-ms-Miranda
+++ b/isdb-t/br-ms-Miranda
@@ -1,5 +1,5 @@
 # Channel table for Miranda - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/593
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=593
 
 # Physical channel 31 (virtual 5.1)
 [TV Morena]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 36.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Navirai b/isdb-t/br-ms-Navirai
index 2545a67d..26201d31 100644
--- a/isdb-t/br-ms-Navirai
+++ b/isdb-t/br-ms-Navirai
@@ -1,5 +1,5 @@
-# Channel table for Naviraí - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/747
+# Channel table for Navira� - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=747
 
 # Physical channel 23 (virtual 23.1)
 [TV Evangelizar]
@@ -88,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 36.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-NovaAndradina b/isdb-t/br-ms-NovaAndradina
index c8031a30..8a6b0ed9 100644
--- a/isdb-t/br-ms-NovaAndradina
+++ b/isdb-t/br-ms-NovaAndradina
@@ -1,5 +1,5 @@
 # Channel table for Nova Andradina - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/424
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=424
 
 # Physical channel 35 (virtual 4.1)
 [TV Morena Ponta Porã]
diff --git a/isdb-t/br-ms-NovoHorizonteDoSul b/isdb-t/br-ms-NovoHorizonteDoSul
new file mode 100644
index 00000000..19bf8ad4
--- /dev/null
+++ b/isdb-t/br-ms-NovoHorizonteDoSul
@@ -0,0 +1,32 @@
+# Channel table for Novo Horizonte Do Sul - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4326
+
+# Physical channel 30 (virtual 30.1)
+[TV Morena Ponta Porã]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Paranaiba b/isdb-t/br-ms-Paranaiba
index d768c48e..ca821a28 100644
--- a/isdb-t/br-ms-Paranaiba
+++ b/isdb-t/br-ms-Paranaiba
@@ -1,5 +1,5 @@
-# Channel table for Paranaíba - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/528
+# Channel table for Parana�ba - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=528
 
 # Physical channel 31 (virtual 9.1)
 [TV Morena Ponta Porã]
diff --git a/isdb-t/br-ms-PedroGomes b/isdb-t/br-ms-PedroGomes
index a5d675dd..113ea85e 100644
--- a/isdb-t/br-ms-PedroGomes
+++ b/isdb-t/br-ms-PedroGomes
@@ -1,5 +1,5 @@
 # Channel table for Pedro Gomes - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2577
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2577
 
 # Physical channel 29 (virtual 29.1)
 [TV Morena]
diff --git a/isdb-t/br-ms-PontaPora b/isdb-t/br-ms-PontaPora
index f5abde16..9f379682 100644
--- a/isdb-t/br-ms-PontaPora
+++ b/isdb-t/br-ms-PontaPora
@@ -1,5 +1,92 @@
-# Channel table for Ponta Porã - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/209
+# Channel table for Ponta Por� - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=209
+
+# Physical channel 10
+[SBT MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 195142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 12
+[TVE Cultura]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 207142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18
+[TV Guanandi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 25.1)
 [TV Canção Nova]
@@ -59,7 +146,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 33 (virtual 33.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 11.1)
 [RIT Dourados]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-ms-RibasDoRioPardo b/isdb-t/br-ms-RibasDoRioPardo
new file mode 100644
index 00000000..44eaca67
--- /dev/null
+++ b/isdb-t/br-ms-RibasDoRioPardo
@@ -0,0 +1,90 @@
+# Channel table for Ribas Do Rio Pardo - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2578
+
+# Physical channel 12
+[TV Cidade Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 207142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35
+[Boas Novas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-RioBrilhante b/isdb-t/br-ms-RioBrilhante
index 08dfcfbe..e38f64f8 100644
--- a/isdb-t/br-ms-RioBrilhante
+++ b/isdb-t/br-ms-RioBrilhante
@@ -1,5 +1,5 @@
 # Channel table for Rio Brilhante - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2579
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2579
 
 # Physical channel 32 (virtual 32.1)
 [TV Morena Ponta Porã]
diff --git a/isdb-t/br-ms-RioNegro b/isdb-t/br-ms-RioNegro
new file mode 100644
index 00000000..5db29be1
--- /dev/null
+++ b/isdb-t/br-ms-RioNegro
@@ -0,0 +1,32 @@
+# Channel table for Rio Negro - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2580
+
+# Physical channel 30 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-RioVerdeDeMatoGrosso b/isdb-t/br-ms-RioVerdeDeMatoGrosso
index 7222bd9c..e032771b 100644
--- a/isdb-t/br-ms-RioVerdeDeMatoGrosso
+++ b/isdb-t/br-ms-RioVerdeDeMatoGrosso
@@ -1,5 +1,5 @@
 # Channel table for Rio Verde De Mato Grosso - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1153
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1153
 
 # Physical channel 35 (virtual 35.1)
 [TV Morena]
diff --git a/isdb-t/br-ms-Rochedo b/isdb-t/br-ms-Rochedo
index cd873a09..707f66f1 100644
--- a/isdb-t/br-ms-Rochedo
+++ b/isdb-t/br-ms-Rochedo
@@ -1,5 +1,5 @@
 # Channel table for Rochedo - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2922
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2922
 
 # Physical channel 31 (virtual 31.1)
 [TV Morena]
diff --git a/isdb-t/br-ms-SaoGabrielDoOeste b/isdb-t/br-ms-SaoGabrielDoOeste
index b5916afa..f13dccd5 100644
--- a/isdb-t/br-ms-SaoGabrielDoOeste
+++ b/isdb-t/br-ms-SaoGabrielDoOeste
@@ -1,11 +1,11 @@
-# Channel table for São Gabriel Do Oeste - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2582
+# Channel table for S�o Gabriel Do Oeste - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2582
 
-# Physical channel 30 (virtual 10.1)
+# Physical channel 35 (virtual 35.1)
 [TV Morena]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ms-Selviria b/isdb-t/br-ms-Selviria
new file mode 100644
index 00000000..d5992db3
--- /dev/null
+++ b/isdb-t/br-ms-Selviria
@@ -0,0 +1,32 @@
+# Channel table for Selv�ria - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2923
+
+# Physical channel 35 (virtual 35.1)
+[TV Morena Ponta Porã]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-SeteQuedas b/isdb-t/br-ms-SeteQuedas
new file mode 100644
index 00000000..1baf951c
--- /dev/null
+++ b/isdb-t/br-ms-SeteQuedas
@@ -0,0 +1,32 @@
+# Channel table for Sete Quedas - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=750
+
+# Physical channel 31 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Sidrolandia b/isdb-t/br-ms-Sidrolandia
index 7e5a52ea..4173a6c0 100644
--- a/isdb-t/br-ms-Sidrolandia
+++ b/isdb-t/br-ms-Sidrolandia
@@ -1,5 +1,5 @@
-# Channel table for Sidrolândia - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2583
+# Channel table for Sidrol�ndia - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2583
 
 # Physical channel 30 (virtual 6.1)
 [TV Morena]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 48.1)
-[TV Aparecida]
+# Physical channel 46 (virtual 9.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 665142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ms-Taquarussu b/isdb-t/br-ms-Taquarussu
new file mode 100644
index 00000000..60b2b9be
--- /dev/null
+++ b/isdb-t/br-ms-Taquarussu
@@ -0,0 +1,32 @@
+# Channel table for Taquarussu - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2773
+
+# Physical channel 30 (virtual 30.1)
+[TV Morena Ponta Porã]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-Terenos b/isdb-t/br-ms-Terenos
new file mode 100644
index 00000000..6ce2274e
--- /dev/null
+++ b/isdb-t/br-ms-Terenos
@@ -0,0 +1,496 @@
+# Channel table for Terenos - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4128
+
+# Physical channel 14 (virtual 15.1)
+[TV Imaculada]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 19 (virtual 2.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 20.1)
+[Rede Gênesis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 13.1)
+[TV Guanandi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 24.1)
+[Rede Brasil MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 26.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 29.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 8.1)
+[SBT MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 6.1)
+[TV Morena]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 11.1)
+[TV MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 39.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 41.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 44.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 48.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 42.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 50.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ms-TresLagoas b/isdb-t/br-ms-TresLagoas
index 35d33091..50e56293 100644
--- a/isdb-t/br-ms-TresLagoas
+++ b/isdb-t/br-ms-TresLagoas
@@ -1,5 +1,5 @@
-# Channel table for Três Lagoas - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/175
+# Channel table for Tr�s Lagoas - MS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=175
 
 # Physical channel 18 (virtual 18.1)
 [TV Evangelizar]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 15.1)
-[Rede Vida]
+# Physical channel 31 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 13.1)
-[TVC Canal 13]
+# Physical channel 45 (virtual 13.3)
+[TVC Canal 13, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 45.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-ms-Vicentina b/isdb-t/br-ms-Vicentina
index 822a8355..fed27a72 100644
--- a/isdb-t/br-ms-Vicentina
+++ b/isdb-t/br-ms-Vicentina
@@ -1,5 +1,5 @@
 # Channel table for Vicentina - MS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3818
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3818
 
 # Physical channel 26 (virtual 21.1)
 [TV Canção Nova]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 13.1)
-[TVE Cultura]
+# Physical channel 29 (virtual 4.3)
+[TVE Cultura, TV REME, TV SED MS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-mt-Acorizal b/isdb-t/br-mt-Acorizal
new file mode 100644
index 00000000..69119d58
--- /dev/null
+++ b/isdb-t/br-mt-Acorizal
@@ -0,0 +1,554 @@
+# Channel table for Acorizal - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4309
+
+# Physical channel 15 (virtual 14.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 17.1)
+[TV Mais]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[TV Gazeta MT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 22.1)
+[TV Pantanal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 2.1)
+[TV Universidade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 27.1)
+[TV Mato Grosso]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 7.1)
+[Record News Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 3.5)
+[TV Câmara, TV Assembleia MT, TV Câmara Municipal, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 33.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 59.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 4.1)
+[TV Centro América]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 10.1)
+[TV Vila Real]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 8.1)
+[TV Brasil Oeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 12.1)
+[TV Cidade Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 5.1)
+[SBT Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 46.1)
+[TV Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-AltaFloresta b/isdb-t/br-mt-AltaFloresta
index 6e96cd30..26684d2d 100644
--- a/isdb-t/br-mt-AltaFloresta
+++ b/isdb-t/br-mt-AltaFloresta
@@ -1,5 +1,5 @@
 # Channel table for Alta Floresta - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/113
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=113
 
 # Physical channel 16 (virtual 16.1)
 [TV Aparecida]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 7.1)
+[TV Nativa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-AltoGarcas b/isdb-t/br-mt-AltoGarcas
new file mode 100644
index 00000000..b67df422
--- /dev/null
+++ b/isdb-t/br-mt-AltoGarcas
@@ -0,0 +1,32 @@
+# Channel table for Alto Gar�as - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2490
+
+# Physical channel 14 (virtual 14.1)
+[Record TV Alto Araguaia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-AltoTaquari b/isdb-t/br-mt-AltoTaquari
index b9a667a6..351948fa 100644
--- a/isdb-t/br-mt-AltoTaquari
+++ b/isdb-t/br-mt-AltoTaquari
@@ -1,5 +1,5 @@
 # Channel table for Alto Taquari - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/675
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=675
 
 # Physical channel 33 (virtual 33.1)
 [TV Taquari]
diff --git a/isdb-t/br-mt-Araputanga b/isdb-t/br-mt-Araputanga
index d4920234..864dd1f2 100644
--- a/isdb-t/br-mt-Araputanga
+++ b/isdb-t/br-mt-Araputanga
@@ -1,5 +1,5 @@
 # Channel table for Araputanga - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/282
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=282
 
 # Physical channel 31 (virtual 31.1)
 [TV Centro América]
diff --git a/isdb-t/br-mt-BaraoDeMelgaco b/isdb-t/br-mt-BaraoDeMelgaco
new file mode 100644
index 00000000..d6706b05
--- /dev/null
+++ b/isdb-t/br-mt-BaraoDeMelgaco
@@ -0,0 +1,525 @@
+# Channel table for Bar�o De Melga�o - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2554
+
+# Physical channel 15 (virtual 14.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 17.1)
+[TV Mais]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[TV Gazeta MT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 22.1)
+[TV Pantanal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 2.1)
+[TV Universidade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 7.1)
+[Record News Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 30.2)
+[TV Assembleia MT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 3.5)
+[TV Câmara, TV Assembleia MT, TV Senado, TV Câmara Municipal, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 34.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 59.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 4.1)
+[TV Centro América]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 10.1)
+[TV Vila Real]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 8.1)
+[TV Brasil Oeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 12.1)
+[TV Cidade Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 44.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 5.1)
+[SBT Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-BarraDoBugres b/isdb-t/br-mt-BarraDoBugres
index b01952ba..ab1fa1f1 100644
--- a/isdb-t/br-mt-BarraDoBugres
+++ b/isdb-t/br-mt-BarraDoBugres
@@ -1,5 +1,5 @@
 # Channel table for Barra Do Bugres - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/305
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=305
 
 # Physical channel 36 (virtual 11.1)
 [TV Centro América]
diff --git a/isdb-t/br-mt-BarraDoGarcas b/isdb-t/br-mt-BarraDoGarcas
index 0fdf56ed..0e6e9b5b 100644
--- a/isdb-t/br-mt-BarraDoGarcas
+++ b/isdb-t/br-mt-BarraDoGarcas
@@ -1,5 +1,34 @@
-# Channel table for Barra Do Garças - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/417
+# Channel table for Barra Do Gar�as - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=417
+
+# Physical channel 28 (virtual 4.1)
+[TV Araguaia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 10.1)
 [TV Centro América]
@@ -59,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 7.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-Caceres b/isdb-t/br-mt-Caceres
index 6de0d4f2..039c3e62 100644
--- a/isdb-t/br-mt-Caceres
+++ b/isdb-t/br-mt-Caceres
@@ -1,5 +1,5 @@
-# Channel table for Cáceres - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/172
+# Channel table for C�ceres - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=172
 
 # Physical channel 15 (virtual 20.1)
 [TV Aparecida]
diff --git a/isdb-t/br-mt-CampoNovoDoParecis b/isdb-t/br-mt-CampoNovoDoParecis
new file mode 100644
index 00000000..1d3595b6
--- /dev/null
+++ b/isdb-t/br-mt-CampoNovoDoParecis
@@ -0,0 +1,61 @@
+# Channel table for Campo Novo Do Parecis - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=376
+
+# Physical channel 36 (virtual 10.1)
+[TV Centro América]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 12.1)
+[Rede TV! Campo Novo do Parecis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-CampoVerde b/isdb-t/br-mt-CampoVerde
index 8c9ef884..3f7e779f 100644
--- a/isdb-t/br-mt-CampoVerde
+++ b/isdb-t/br-mt-CampoVerde
@@ -1,5 +1,5 @@
 # Channel table for Campo Verde - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2867
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2867
 
 # Physical channel 51 (virtual 7.1)
 [TV Real]
diff --git a/isdb-t/br-mt-Canarana b/isdb-t/br-mt-Canarana
new file mode 100644
index 00000000..41f79634
--- /dev/null
+++ b/isdb-t/br-mt-Canarana
@@ -0,0 +1,32 @@
+# Channel table for Canarana - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2761
+
+# Physical channel 20 (virtual 20.1)
+[TV Cidade Interativa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-ChapadaDosGuimaraes b/isdb-t/br-mt-ChapadaDosGuimaraes
index f9dcd061..0aa0cbd4 100644
--- a/isdb-t/br-mt-ChapadaDosGuimaraes
+++ b/isdb-t/br-mt-ChapadaDosGuimaraes
@@ -1,5 +1,5 @@
-# Channel table for Chapada Dos Guimarães - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3921
+# Channel table for Chapada Dos Guimar�es - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3921
 
 # Physical channel 36 (virtual 4.1)
 [TV Centro América]
diff --git a/isdb-t/br-mt-Claudia b/isdb-t/br-mt-Claudia
index a4b53205..3e87dd0e 100644
--- a/isdb-t/br-mt-Claudia
+++ b/isdb-t/br-mt-Claudia
@@ -1,8 +1,8 @@
-# Channel table for Cláudia - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/711
+# Channel table for Cl�udia - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=711
 
 # Physical channel 32 (virtual 32.1)
-[TV Centro América Sinop]
+[TV Centro América Norte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-mt-Colider b/isdb-t/br-mt-Colider
index 266adb79..9e4df934 100644
--- a/isdb-t/br-mt-Colider
+++ b/isdb-t/br-mt-Colider
@@ -1,5 +1,5 @@
-# Channel table for Colíder - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2147
+# Channel table for Col�der - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2147
 
 # Physical channel 39 (virtual 5.1)
 [TV Nova Visão]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 9.1)
-[TV Piraíba]
+[TV Cidade Verde Colíder]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-mt-Comodoro b/isdb-t/br-mt-Comodoro
new file mode 100644
index 00000000..a381b5c1
--- /dev/null
+++ b/isdb-t/br-mt-Comodoro
@@ -0,0 +1,32 @@
+# Channel table for Comodoro - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=330
+
+# Physical channel 38 (virtual 13.1)
+[TV Portal da Amazônia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-Cuiaba b/isdb-t/br-mt-Cuiaba
index d21d3d39..4b823abf 100644
--- a/isdb-t/br-mt-Cuiaba
+++ b/isdb-t/br-mt-Cuiaba
@@ -1,8 +1,8 @@
-# Channel table for Cuiabá - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/200
+# Channel table for Cuiab� - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=200
 
 # Physical channel 14 (virtual 15.1)
-[Band]
+[Band Mato Grosso]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[Ideal TV]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 7.1)
-[TV Cidadã]
+[Record News Cuiabá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 30.2)
-[TV Assembleia MT, Canal sem transmissão]
+[TV Assembleia MT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.4)
-[TV Câmara, TV Assembleia MT, TV Senado, TV Câmara Municipal]
+# Physical channel 32 (virtual 3.5)
+[TV Câmara, TV Assembleia MT, TV Câmara Municipal, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -378,7 +378,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
+# Physical channel 33 (virtual 6.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 33.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -552,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -581,8 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 5.1)
-[SBT Cuiabá]
+# Physical channel 45 (virtual 5.2)
+[SBT Cuiabá, Canal sem transmissão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -640,7 +669,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -669,7 +698,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 48.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-mt-Diamantino b/isdb-t/br-mt-Diamantino
new file mode 100644
index 00000000..6635c5f3
--- /dev/null
+++ b/isdb-t/br-mt-Diamantino
@@ -0,0 +1,32 @@
+# Channel table for Diamantino - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=492
+
+# Physical channel 19 (virtual 15.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-DomAquino b/isdb-t/br-mt-DomAquino
new file mode 100644
index 00000000..562cb24e
--- /dev/null
+++ b/isdb-t/br-mt-DomAquino
@@ -0,0 +1,32 @@
+# Channel table for Dom Aquino - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2859
+
+# Physical channel 35 (virtual 9.1)
+[TV Centro América Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-GuarantaDoNorte b/isdb-t/br-mt-GuarantaDoNorte
index d258d2f6..12f695f4 100644
--- a/isdb-t/br-mt-GuarantaDoNorte
+++ b/isdb-t/br-mt-GuarantaDoNorte
@@ -1,5 +1,5 @@
-# Channel table for Guarantã Do Norte - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/486
+# Channel table for Guarant� Do Norte - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=486
 
 # Physical channel 38 (virtual 8.1)
 [TV Amplitude]
diff --git a/isdb-t/br-mt-Guiratinga b/isdb-t/br-mt-Guiratinga
index b8502443..e460745f 100644
--- a/isdb-t/br-mt-Guiratinga
+++ b/isdb-t/br-mt-Guiratinga
@@ -1,5 +1,5 @@
 # Channel table for Guiratinga - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1413
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1413
 
 # Physical channel 19 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-mt-Itiquira b/isdb-t/br-mt-Itiquira
index 650fb2a9..e93474eb 100644
--- a/isdb-t/br-mt-Itiquira
+++ b/isdb-t/br-mt-Itiquira
@@ -1,5 +1,5 @@
 # Channel table for Itiquira - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3998
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3998
 
 # Physical channel 32 (virtual 12.1)
 [TV Centro América Sul]
diff --git a/isdb-t/br-mt-Jaciara b/isdb-t/br-mt-Jaciara
index 82c6f26f..7a75b372 100644
--- a/isdb-t/br-mt-Jaciara
+++ b/isdb-t/br-mt-Jaciara
@@ -1,5 +1,34 @@
 # Channel table for Jaciara - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/681
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=681
+
+# Physical channel 17 (virtual 13.1)
+[TV Cidade Jaciara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 11.1)
 [TV Centro América Sul]
diff --git a/isdb-t/br-mt-Jangada b/isdb-t/br-mt-Jangada
new file mode 100644
index 00000000..c62ce168
--- /dev/null
+++ b/isdb-t/br-mt-Jangada
@@ -0,0 +1,554 @@
+# Channel table for Jangada - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4308
+
+# Physical channel 15 (virtual 14.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 17.1)
+[TV Mais]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[TV Gazeta MT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 22.1)
+[TV Pantanal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 2.1)
+[TV Universidade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 27.1)
+[TV Mato Grosso]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 7.1)
+[Record News Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 3.5)
+[TV Câmara, TV Assembleia MT, TV Câmara Municipal, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 33.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 59.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 4.1)
+[TV Centro América]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 10.1)
+[TV Vila Real]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 8.1)
+[TV Brasil Oeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 12.1)
+[TV Cidade Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 5.1)
+[SBT Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 46.1)
+[TV Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-Juara b/isdb-t/br-mt-Juara
index a0b12baf..5061beeb 100644
--- a/isdb-t/br-mt-Juara
+++ b/isdb-t/br-mt-Juara
@@ -1,8 +1,8 @@
 # Channel table for Juara - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1692
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1692
 
 # Physical channel 31 (virtual 12.1)
-[TV Centro América Sinop]
+[TV Centro América Norte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 7.1)
+[TV Amplitude]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-Juina b/isdb-t/br-mt-Juina
index 277cb187..592e5493 100644
--- a/isdb-t/br-mt-Juina
+++ b/isdb-t/br-mt-Juina
@@ -1,8 +1,8 @@
-# Channel table for Juína - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/237
+# Channel table for Ju�na - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=237
 
 # Physical channel 16 (virtual 5.1)
-[TV Nazaré]
+[TV Nazaré Juína]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 7.1)
+[SBT Juína]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 3.1)
 [TV Centro América]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,8 +88,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 8.1)
+[TV Amplitude]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 40 (virtual 10.1)
-[TV Cidade Verde]
+[TV Cidade Verde Juína]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
diff --git a/isdb-t/br-mt-Juscimeira b/isdb-t/br-mt-Juscimeira
index cffb6742..8fb8d175 100644
--- a/isdb-t/br-mt-Juscimeira
+++ b/isdb-t/br-mt-Juscimeira
@@ -1,5 +1,5 @@
 # Channel table for Juscimeira - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1927
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1927
 
 # Physical channel 31 (virtual 7.1)
 [TV Centro América Sul]
diff --git a/isdb-t/br-mt-LucasDoRioVerde b/isdb-t/br-mt-LucasDoRioVerde
index fda006da..e094fc3e 100644
--- a/isdb-t/br-mt-LucasDoRioVerde
+++ b/isdb-t/br-mt-LucasDoRioVerde
@@ -1,8 +1,37 @@
 # Channel table for Lucas Do Rio Verde - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/490
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=490
+
+# Physical channel 15 (virtual 15.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 11.1)
-[TV Centro América]
+[TV Centro América Norte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -59,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 8.1)
+[TV Rio Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-Marcelandia b/isdb-t/br-mt-Marcelandia
index cf7fc7a1..95e7bc6f 100644
--- a/isdb-t/br-mt-Marcelandia
+++ b/isdb-t/br-mt-Marcelandia
@@ -1,8 +1,8 @@
-# Channel table for Marcelândia - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/302
+# Channel table for Marcel�ndia - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=302
 
 # Physical channel 49 (virtual 13.1)
-[Record TV Marcelândia]
+[PBC TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-mt-Nobres b/isdb-t/br-mt-Nobres
index fe0b226f..c0d93902 100644
--- a/isdb-t/br-mt-Nobres
+++ b/isdb-t/br-mt-Nobres
@@ -1,5 +1,5 @@
 # Channel table for Nobres - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/704
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=704
 
 # Physical channel 23 (virtual 3.1)
 [Rede Século 21]
diff --git a/isdb-t/br-mt-NossaSenhoraDoLivramento b/isdb-t/br-mt-NossaSenhoraDoLivramento
new file mode 100644
index 00000000..214427c2
--- /dev/null
+++ b/isdb-t/br-mt-NossaSenhoraDoLivramento
@@ -0,0 +1,351 @@
+# Channel table for Nossa Senhora Do Livramento - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4083
+
+# Physical channel 15 (virtual 14.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 22.1)
+[TV Pantanal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 27.1)
+[TV Mato Grosso]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 3.5)
+[TV Câmara, TV Assembleia MT, TV Câmara Municipal, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 34.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 4.1)
+[TV Centro América]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 10.1)
+[TV Vila Real]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 8.1)
+[TV Brasil Oeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 12.1)
+[TV Cidade Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 44.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 5.1)
+[SBT Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 46.1)
+[TV Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-NovaCanaaDoNorte b/isdb-t/br-mt-NovaCanaaDoNorte
new file mode 100644
index 00000000..f4456680
--- /dev/null
+++ b/isdb-t/br-mt-NovaCanaaDoNorte
@@ -0,0 +1,32 @@
+# Channel table for Nova Cana� Do Norte - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4075
+
+# Physical channel 32 (virtual 7.1)
+[TV Centro América]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-NovaMarilandia b/isdb-t/br-mt-NovaMarilandia
new file mode 100644
index 00000000..2a34c049
--- /dev/null
+++ b/isdb-t/br-mt-NovaMarilandia
@@ -0,0 +1,32 @@
+# Channel table for Nova Maril�ndia - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2499
+
+# Physical channel 36 (virtual 13.1)
+[TV Centro América Tangará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-NovaMaringa b/isdb-t/br-mt-NovaMaringa
index 18b5a5cf..83aaad1a 100644
--- a/isdb-t/br-mt-NovaMaringa
+++ b/isdb-t/br-mt-NovaMaringa
@@ -1,8 +1,8 @@
-# Channel table for Nova Maringá - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3723
+# Channel table for Nova Maring� - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3723
 
 # Physical channel 32 (virtual 11.1)
-[TV Centro América Sinop]
+[TV Centro América Norte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-mt-NovaMutum b/isdb-t/br-mt-NovaMutum
index 00c6703f..63edf433 100644
--- a/isdb-t/br-mt-NovaMutum
+++ b/isdb-t/br-mt-NovaMutum
@@ -1,11 +1,11 @@
 # Channel table for Nova Mutum - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/250
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=250
 
-# Physical channel 31 (virtual 13.1)
-[TV Centro América Sinop]
+# Physical channel 36 (virtual 13.1)
+[TV Centro América Norte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 575142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 9.1)
-[TV Arinos]
+# Physical channel 39 (virtual 7.1)
+[TV Cidade Nova Mutum]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 9.1)
+[SBT Nova Mutum]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 11.1)
 [TV Mutum]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-mt-NovaOlimpia b/isdb-t/br-mt-NovaOlimpia
index 64f3ce7e..d1a5815c 100644
--- a/isdb-t/br-mt-NovaOlimpia
+++ b/isdb-t/br-mt-NovaOlimpia
@@ -1,5 +1,5 @@
-# Channel table for Nova Olímpia - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/652
+# Channel table for Nova Ol�mpia - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=652
 
 # Physical channel 31 (virtual 9.1)
 [TV Centro América]
diff --git a/isdb-t/br-mt-PedraPreta b/isdb-t/br-mt-PedraPreta
new file mode 100644
index 00000000..649f5ff0
--- /dev/null
+++ b/isdb-t/br-mt-PedraPreta
@@ -0,0 +1,32 @@
+# Channel table for Pedra Preta - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2607
+
+# Physical channel 36 (virtual 13.1)
+[TV Centro América Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-PeixotoDeAzevedo b/isdb-t/br-mt-PeixotoDeAzevedo
index caa8f6bb..a6dd1f13 100644
--- a/isdb-t/br-mt-PeixotoDeAzevedo
+++ b/isdb-t/br-mt-PeixotoDeAzevedo
@@ -1,8 +1,8 @@
 # Channel table for Peixoto De Azevedo - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/226
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=226
 
 # Physical channel 31 (virtual 13.1)
-[TV Centro América Sinop]
+[TV Centro América Norte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
diff --git a/isdb-t/br-mt-PontalDoAraguaia b/isdb-t/br-mt-PontalDoAraguaia
index 1c7547e4..1823e636 100644
--- a/isdb-t/br-mt-PontalDoAraguaia
+++ b/isdb-t/br-mt-PontalDoAraguaia
@@ -1,5 +1,34 @@
 # Channel table for Pontal Do Araguaia - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/137
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=137
+
+# Physical channel 28 (virtual 4.1)
+[TV Araguaia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 10.1)
 [TV Centro América]
@@ -59,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 7.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-PontesELacerda b/isdb-t/br-mt-PontesELacerda
index 558b40a0..8f2c29e3 100644
--- a/isdb-t/br-mt-PontesELacerda
+++ b/isdb-t/br-mt-PontesELacerda
@@ -1,8 +1,66 @@
 # Channel table for Pontes E Lacerda - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/83
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=83
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 8.1)
+[TV Guaporeí­]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 6.1)
-[TV Centro Oeste/PL]
+[TVCO Pontes e Lacerda]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -30,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 12.1)
+[TV Portal da Amazônia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-PrimaveraDoLeste b/isdb-t/br-mt-PrimaveraDoLeste
index a4a5ce8f..801da896 100644
--- a/isdb-t/br-mt-PrimaveraDoLeste
+++ b/isdb-t/br-mt-PrimaveraDoLeste
@@ -1,5 +1,5 @@
 # Channel table for Primavera Do Leste - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2501
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2501
 
 # Physical channel 35 (virtual 13.1)
 [TV Centro América Sul]
diff --git a/isdb-t/br-mt-Rondonopolis b/isdb-t/br-mt-Rondonopolis
index 4a6a4d2f..7e6864b8 100644
--- a/isdb-t/br-mt-Rondonopolis
+++ b/isdb-t/br-mt-Rondonopolis
@@ -1,5 +1,5 @@
-# Channel table for Rondonópolis - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/383
+# Channel table for Rondon�polis - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=383
 
 # Physical channel 15 (virtual 15.1)
 [TV Aparecida]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 26.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 14.1)
-[TV Cidadã]
+# Physical channel 33 (virtual 33.1)
+[TV Novo Tempo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 33.1)
-[TV Novo Tempo]
+# Physical channel 34 (virtual 20.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 20.1)
-[TV Canção Nova]
+# Physical channel 36 (virtual 12.1)
+[TV Centro América Sul]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 12.1)
-[TV Centro América Sul]
+# Physical channel 38 (virtual 5.1)
+[TV Cidade Rondonópolis]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 5.1)
-[TV Cidade Rondonópolis]
+# Physical channel 39 (virtual 14.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 18.1)
-[Rede Vida]
+# Physical channel 43 (virtual 18.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 48.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-mt-RosarioOeste b/isdb-t/br-mt-RosarioOeste
index d07e8ae5..d1c8720f 100644
--- a/isdb-t/br-mt-RosarioOeste
+++ b/isdb-t/br-mt-RosarioOeste
@@ -1,5 +1,5 @@
-# Channel table for Rosário Oeste - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2863
+# Channel table for Ros�rio Oeste - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2863
 
 # Physical channel 23 (virtual 23.1)
 [Rede Século 21]
diff --git a/isdb-t/br-mt-SantaCarmem b/isdb-t/br-mt-SantaCarmem
new file mode 100644
index 00000000..31e3317d
--- /dev/null
+++ b/isdb-t/br-mt-SantaCarmem
@@ -0,0 +1,32 @@
+# Channel table for Santa Carmem - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4318
+
+# Physical channel 25 (virtual 8.1)
+[Real TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-SantoAntonioDoLeverger b/isdb-t/br-mt-SantoAntonioDoLeverger
new file mode 100644
index 00000000..d7519e85
--- /dev/null
+++ b/isdb-t/br-mt-SantoAntonioDoLeverger
@@ -0,0 +1,525 @@
+# Channel table for Santo Ant�nio Do Leverger - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4082
+
+# Physical channel 15 (virtual 14.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 17.1)
+[TV Mais]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[TV Gazeta MT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 22.1)
+[TV Pantanal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 2.1)
+[TV Universidade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 7.1)
+[Record News Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 30.2)
+[TV Assembleia MT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 3.5)
+[TV Câmara, TV Assembleia MT, TV Senado, TV Câmara Municipal, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 34.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 59.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 4.1)
+[TV Centro América]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 10.1)
+[TV Vila Real]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 8.1)
+[TV Brasil Oeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 12.1)
+[TV Cidade Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 44.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 5.2)
+[SBT Cuiabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-SaoJoseDoPovo b/isdb-t/br-mt-SaoJoseDoPovo
new file mode 100644
index 00000000..bf957224
--- /dev/null
+++ b/isdb-t/br-mt-SaoJoseDoPovo
@@ -0,0 +1,32 @@
+# Channel table for S�o Jos� Do Povo - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4325
+
+# Physical channel 30 (virtual 30.1)
+[TV Centro América Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mt-SaoJoseDoRioClaro b/isdb-t/br-mt-SaoJoseDoRioClaro
index b6b80021..fa199fb7 100644
--- a/isdb-t/br-mt-SaoJoseDoRioClaro
+++ b/isdb-t/br-mt-SaoJoseDoRioClaro
@@ -1,5 +1,5 @@
-# Channel table for São José Do Rio Claro - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1036
+# Channel table for S�o Jos� Do Rio Claro - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1036
 
 # Physical channel 36 (virtual 2.1)
 [TV Centro América]
diff --git a/isdb-t/br-mt-Sapezal b/isdb-t/br-mt-Sapezal
index 3cdf997f..d5c6dfa1 100644
--- a/isdb-t/br-mt-Sapezal
+++ b/isdb-t/br-mt-Sapezal
@@ -1,5 +1,34 @@
 # Channel table for Sapezal - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2555
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2555
+
+# Physical channel 26 (virtual 11.1)
+[TV Sapezal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 9.1)
 [TV Centro América]
diff --git a/isdb-t/br-mt-Sinop b/isdb-t/br-mt-Sinop
index 9de5a2c7..fc04379b 100644
--- a/isdb-t/br-mt-Sinop
+++ b/isdb-t/br-mt-Sinop
@@ -1,5 +1,5 @@
 # Channel table for Sinop - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/301
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=301
 
 # Physical channel 20 (virtual 2.1)
 [TV Regional]
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 22 (virtual 13.1)
+[TV Mais]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 25 (virtual 8.1)
-[TV Capital]
+[Real TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 5.1)
-[TV Centro América Sinop]
+[TV Centro América Norte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 6.1)
-[TV Cidade Verde]
+[TV Cidade Verde Sinop]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -117,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 15.1)
-[Rede Vida]
+# Physical channel 48 (virtual 4.1)
+[SBT Sinop]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 4.1)
-[SBT Sinop]
+# Physical channel 50 (virtual 10.1)
+[TV Nova Capital]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 689142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-mt-Sorriso b/isdb-t/br-mt-Sorriso
index e118f049..d8983fac 100644
--- a/isdb-t/br-mt-Sorriso
+++ b/isdb-t/br-mt-Sorriso
@@ -1,8 +1,8 @@
 # Channel table for Sorriso - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/235
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=235
 
-# Physical channel 19 (virtual 16.1)
-[Rede Vida]
+# Physical channel 19 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 12.1)
-[TV Cidade Verde]
+[TV Cidade Verde Sorriso]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-mt-TangaraDaSerra b/isdb-t/br-mt-TangaraDaSerra
index 83372170..54b41fde 100644
--- a/isdb-t/br-mt-TangaraDaSerra
+++ b/isdb-t/br-mt-TangaraDaSerra
@@ -1,5 +1,5 @@
-# Channel table for Tangará Da Serra - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/206
+# Channel table for Tangar� Da Serra - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=206
 
 # Physical channel 14 (virtual 3.1)
 [Bem TV]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 10.1)
-[TV Cidade Verde]
+[TV Cidade Verde Tangará]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
diff --git a/isdb-t/br-mt-Tapurah b/isdb-t/br-mt-Tapurah
index 582f7722..51331ca4 100644
--- a/isdb-t/br-mt-Tapurah
+++ b/isdb-t/br-mt-Tapurah
@@ -1,5 +1,5 @@
 # Channel table for Tapurah - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/710
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=710
 
 # Physical channel 39 (virtual 7.1)
 [TV Buritis]
diff --git a/isdb-t/br-mt-VarzeaGrande b/isdb-t/br-mt-VarzeaGrande
index 31d18de6..2954c088 100644
--- a/isdb-t/br-mt-VarzeaGrande
+++ b/isdb-t/br-mt-VarzeaGrande
@@ -1,8 +1,8 @@
-# Channel table for Várzea Grande - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3841
+# Channel table for V�rzea Grande - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3841
 
 # Physical channel 14 (virtual 15.1)
-[Band]
+[Band Mato Grosso]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[Ideal TV]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 7.1)
-[TV Cidadã]
+[Record News Cuiabá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 30.2)
-[TV Assembleia MT, Canal sem transmissão]
+[TV Assembleia MT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.4)
-[TV Câmara, TV Assembleia MT, TV Senado, TV Câmara Municipal]
+# Physical channel 32 (virtual 3.5)
+[TV Câmara, TV Assembleia MT, TV Câmara Municipal, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -378,7 +378,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
+# Physical channel 33 (virtual 6.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 33.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -552,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 44.1)
-[Rede Vida]
+# Physical channel 43 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -581,8 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 5.1)
-[SBT Cuiabá]
+# Physical channel 45 (virtual 5.2)
+[SBT Cuiabá, Canal sem transmissão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -640,7 +669,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -669,7 +698,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 48.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-mt-CampoNovoDosParecis b/isdb-t/br-mt-VilaRica
index fb5e9ecb..576aee20 100644
--- a/isdb-t/br-mt-CampoNovoDosParecis
+++ b/isdb-t/br-mt-VilaRica
@@ -1,7 +1,7 @@
-# Channel table for Campo Novo Dos Parecis - MT - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/376
+# Channel table for Vila Rica - MT - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2778
 
-# Physical channel 36 (virtual 10.1)
+# Physical channel 36 (virtual 11.1)
 [TV Centro América]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pa-Abaetetuba b/isdb-t/br-pa-Abaetetuba
index 47285f14..007a7c0f 100644
--- a/isdb-t/br-pa-Abaetetuba
+++ b/isdb-t/br-pa-Abaetetuba
@@ -1,8 +1,8 @@
 # Channel table for Abaetetuba - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/303
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=303
 
-# Physical channel 16 (virtual 21.1)
-[Rede Vida]
+# Physical channel 16 (virtual 21.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 11.1)
+[Rede Cultura do Pará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 49 (virtual 53.1)
 [TV Liberal]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pa-Afua b/isdb-t/br-pa-Afua
index 924dfebd..287268df 100644
--- a/isdb-t/br-pa-Afua
+++ b/isdb-t/br-pa-Afua
@@ -1,8 +1,8 @@
-# Channel table for Afuá - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/466
+# Channel table for Afu� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=466
 
-# Physical channel 39 (virtual 40.1)
-[Rede Vida]
+# Physical channel 39 (virtual 40.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pa-Alenquer b/isdb-t/br-pa-Alenquer
index 1b0496b3..8901635a 100644
--- a/isdb-t/br-pa-Alenquer
+++ b/isdb-t/br-pa-Alenquer
@@ -1,8 +1,37 @@
 # Channel table for Alenquer - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/345
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=345
 
-# Physical channel 18 (virtual 17.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -59,8 +88,95 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 29.1)
+[TV Princesa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 26.1)
+[TV Encontro]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 15.1)
+[TV Guarany]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 12.1)
-[RBA TV]
+[RBA Santarém]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-pa-Almeirim(monteDourado) b/isdb-t/br-pa-Almeirim(monteDourado)
new file mode 100644
index 00000000..154653e8
--- /dev/null
+++ b/isdb-t/br-pa-Almeirim(monteDourado)
@@ -0,0 +1,32 @@
+# Channel table for Almeirim (monte Dourado) - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2960
+
+# Physical channel 38 (virtual 7.1)
+[TV Verdade Jari]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Altamira b/isdb-t/br-pa-Altamira
index 2e801ae9..e3cdc338 100644
--- a/isdb-t/br-pa-Altamira
+++ b/isdb-t/br-pa-Altamira
@@ -1,5 +1,34 @@
 # Channel table for Altamira - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/89
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=89
+
+# Physical channel 36 (virtual 19.1)
+[TV Cidade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.1)
 [TV Vale do Xingu]
diff --git a/isdb-t/br-pa-Ananindeua b/isdb-t/br-pa-Ananindeua
index c647a5fa..67875e1f 100644
--- a/isdb-t/br-pa-Ananindeua
+++ b/isdb-t/br-pa-Ananindeua
@@ -1,5 +1,34 @@
 # Channel table for Ananindeua - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3794
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3794
+
+# Physical channel 14 (virtual 15.1)
+[TV One]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 14.1)
 [TV Grão-Pará]
@@ -30,6 +59,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 16.1)
+[TVM]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 17.1)
+[Rede Capital]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 18 (virtual 18.1)
 [CNT]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 19.1)
-[Rede Vida]
+# Physical channel 20 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -176,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -263,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -407,6 +494,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 9.1)
+[TV + Belém]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 38.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -436,6 +552,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 40.1)
+[TV A Crítica Pará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 2.1)
 [Rede Cultura do Pará]
 	DELIVERY_SYSTEM = ISDBT
@@ -494,8 +639,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.3)
-[TV Senado, TV ALEPA, TV Câmara]
+# Physical channel 45 (virtual 8.5)
+[TV Senado, TV ALEPA, TV Câmara, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -523,6 +668,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 47.1)
 [Rede TV! Belém]
 	DELIVERY_SYSTEM = ISDBT
@@ -553,7 +727,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 32.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pa-AugustoCorreia b/isdb-t/br-pa-AugustoCorreia
new file mode 100644
index 00000000..d24a8d13
--- /dev/null
+++ b/isdb-t/br-pa-AugustoCorreia
@@ -0,0 +1,61 @@
+# Channel table for Augusto Correia - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2966
+
+# Physical channel 26 (virtual 26.1)
+[SBT Bragança]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 33.1)
+[TV Mania]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Barcarena b/isdb-t/br-pa-Barcarena
index 27a29956..c706f7c5 100644
--- a/isdb-t/br-pa-Barcarena
+++ b/isdb-t/br-pa-Barcarena
@@ -1,5 +1,34 @@
 # Channel table for Barcarena - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2891
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2891
+
+# Physical channel 14 (virtual 15.1)
+[TV One]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 14.1)
 [TV Grão-Pará]
@@ -30,6 +59,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 16.1)
+[TVM]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 17.1)
+[Rede Capital]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 18 (virtual 18.1)
 [CNT]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 19.1)
-[Rede Vida]
+# Physical channel 20 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -176,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -378,6 +465,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 9.1)
+[TV + Belém]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 38.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -407,6 +523,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 40.1)
+[TV A Crítica Pará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 2.1)
 [Rede Cultura do Pará]
 	DELIVERY_SYSTEM = ISDBT
@@ -465,8 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.3)
-[TV Senado, TV ALEPA, TV Câmara]
+# Physical channel 45 (virtual 8.5)
+[TV Senado, TV ALEPA, TV Câmara, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -494,6 +639,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 47.1)
 [Rede TV! Belém]
 	DELIVERY_SYSTEM = ISDBT
@@ -524,7 +698,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 32.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -552,3 +726,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 51.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 50.1)
+[TV Marajoara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Belem b/isdb-t/br-pa-Belem
index b27d8094..5b178ec0 100644
--- a/isdb-t/br-pa-Belem
+++ b/isdb-t/br-pa-Belem
@@ -1,5 +1,34 @@
-# Channel table for Belém - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/104
+# Channel table for Bel�m - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=104
+
+# Physical channel 14 (virtual 15.1)
+[TV One]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 14.1)
 [TV Grão-Pará]
@@ -30,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 17.1)
-[Rede Brasil Pará]
+# Physical channel 16 (virtual 16.1)
+[TVM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 17 (virtual 17.1)
-[TCN]
+[Rede Capital]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -117,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 19.1)
-[Rede Vida]
+# Physical channel 20 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -321,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -465,6 +494,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 9.1)
+[TV + Belém]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 38.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -494,6 +552,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 40.1)
+[TV A Crítica Pará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 2.1)
 [Rede Cultura do Pará]
 	DELIVERY_SYSTEM = ISDBT
@@ -552,8 +639,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.3)
-[TV Senado, TV ALEPA, TV Câmara]
+# Physical channel 45 (virtual 8.5)
+[TV Senado, TV ALEPA, TV Câmara, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -640,7 +727,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 32.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pa-Belterra b/isdb-t/br-pa-Belterra
index 17c92871..3c5eb178 100644
--- a/isdb-t/br-pa-Belterra
+++ b/isdb-t/br-pa-Belterra
@@ -1,8 +1,8 @@
 # Channel table for Belterra - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/630
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=630
 
-# Physical channel 18 (virtual 17.1)
-[Rede Vida]
+# Physical channel 18 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -59,8 +59,95 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 5.1)
+[TV Ponta Negra Santarém]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 26.1)
+[TV Encontro]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 15.1)
+[TV Guarany]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 12.1)
-[RBA TV]
+[RBA Santarém]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -88,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 10.1)
+[Rede TV! Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Benevides b/isdb-t/br-pa-Benevides
index 706053ea..14eb0fef 100644
--- a/isdb-t/br-pa-Benevides
+++ b/isdb-t/br-pa-Benevides
@@ -1,5 +1,5 @@
 # Channel table for Benevides - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3795
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3795
 
 # Physical channel 15 (virtual 14.1)
 [TV Grão-Pará]
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 19.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.1)
+[TVM]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -175,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 29.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 31 (virtual 30.1)
 [TV Nazaré]
 	DELIVERY_SYSTEM = ISDBT
@@ -291,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 38.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 2.1)
 [Rede Cultura do Pará]
 	DELIVERY_SYSTEM = ISDBT
@@ -320,6 +407,93 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 54.1)
+[TV Novo Tempo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 8.5)
+[TV Senado, TV ALEPA, TV Câmara, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 47.1)
+[Rede TV! Belém]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 50.1)
 [TV Marajoara]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pa-Braganca b/isdb-t/br-pa-Braganca
index fdc38e2b..b2a96478 100644
--- a/isdb-t/br-pa-Braganca
+++ b/isdb-t/br-pa-Braganca
@@ -1,7 +1,7 @@
-# Channel table for Bragança - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/650
+# Channel table for Bragan�a - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=650
 
-# Physical channel 26 (virtual 4.1)
+# Physical channel 26 (virtual 26.1)
 [SBT Bragança]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 33.1)
+[TV Mania]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Breves b/isdb-t/br-pa-Breves
new file mode 100644
index 00000000..821112b3
--- /dev/null
+++ b/isdb-t/br-pa-Breves
@@ -0,0 +1,32 @@
+# Channel table for Breves - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=467
+
+# Physical channel 27 (virtual 27.1)
+[Marajó TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Cameta b/isdb-t/br-pa-Cameta
index bc76d372..1fa6547d 100644
--- a/isdb-t/br-pa-Cameta
+++ b/isdb-t/br-pa-Cameta
@@ -1,8 +1,8 @@
-# Channel table for Cametá - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/130
+# Channel table for Camet� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=130
 
-# Physical channel 16 (virtual 15.1)
-[Rede Vida]
+# Physical channel 16 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
diff --git a/isdb-t/br-pa-CanaaDosCarajas b/isdb-t/br-pa-CanaaDosCarajas
index b8d22ece..b3b1571d 100644
--- a/isdb-t/br-pa-CanaaDosCarajas
+++ b/isdb-t/br-pa-CanaaDosCarajas
@@ -1,8 +1,8 @@
-# Channel table for Canaã Dos Carajás - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/285
+# Channel table for Cana� Dos Caraj�s - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=285
 
 # Physical channel 17 (virtual 17.1)
-[Rede TV! Canaã]
+[Rede TV! Karajás]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
diff --git a/isdb-t/br-pa-Capanema b/isdb-t/br-pa-Capanema
index cb4e6cfb..5f5a610e 100644
--- a/isdb-t/br-pa-Capanema
+++ b/isdb-t/br-pa-Capanema
@@ -1,5 +1,5 @@
 # Channel table for Capanema - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/582
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=582
 
 # Physical channel 26 (virtual 6.1)
 [SBT Capanema]
@@ -30,3 +30,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 30.1)
+[TV Mãe de Deus]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 7.1)
+[Record TV Capanema]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-CapitaoPoco b/isdb-t/br-pa-CapitaoPoco
index 40f03461..b9daed92 100644
--- a/isdb-t/br-pa-CapitaoPoco
+++ b/isdb-t/br-pa-CapitaoPoco
@@ -1,5 +1,5 @@
-# Channel table for Capitão Poço - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/349
+# Channel table for Capit�o Po�o - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=349
 
 # Physical channel 31 (virtual 31.1)
 [TV Nazaré]
diff --git a/isdb-t/br-pa-Castanhal b/isdb-t/br-pa-Castanhal
index 1b9afb8e..092f8605 100644
--- a/isdb-t/br-pa-Castanhal
+++ b/isdb-t/br-pa-Castanhal
@@ -1,5 +1,5 @@
 # Channel table for Castanhal - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/364
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=364
 
 # Physical channel 18 (virtual 6.1)
 [RBA Castanhal]
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 22 (virtual 22.1)
+[Record TV Belém]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 25 (virtual 3.1)
-[SBT Castanhal]
+[TV Paraense]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -59,8 +88,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 27.1)
+[Rede TV! Belém]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 31 (virtual 31.1)
-[TV Nazaré]
+[TV Mãe de Deus]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -88,3 +146,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 11.1)
+[TV Liberal Castanhal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Curuca b/isdb-t/br-pa-Curuca
index 4e0d3b2b..190daf3f 100644
--- a/isdb-t/br-pa-Curuca
+++ b/isdb-t/br-pa-Curuca
@@ -1,5 +1,5 @@
-# Channel table for Curuçá - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/350
+# Channel table for Curu�� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=350
 
 # Physical channel 31 (virtual 31.1)
 [TV Nazaré]
diff --git a/isdb-t/br-pa-GoianesiaDoPara b/isdb-t/br-pa-GoianesiaDoPara
index 235ff788..17b1e160 100644
--- a/isdb-t/br-pa-GoianesiaDoPara
+++ b/isdb-t/br-pa-GoianesiaDoPara
@@ -1,5 +1,5 @@
-# Channel table for Goianésia Do Pará - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/351
+# Channel table for Goian�sia Do Par� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=351
 
 # Physical channel 26 (virtual 8.1)
 [TV Floresta]
diff --git a/isdb-t/br-pa-Itaituba b/isdb-t/br-pa-Itaituba
index 5c72f9fc..ca2c4f4d 100644
--- a/isdb-t/br-pa-Itaituba
+++ b/isdb-t/br-pa-Itaituba
@@ -1,5 +1,5 @@
 # Channel table for Itaituba - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/90
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=90
 
 # Physical channel 25 (virtual 25.1)
 [TV Tapajoara]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 35 (virtual 35.1)
+[TV Eldorado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Itupiranga b/isdb-t/br-pa-Itupiranga
new file mode 100644
index 00000000..796bd157
--- /dev/null
+++ b/isdb-t/br-pa-Itupiranga
@@ -0,0 +1,177 @@
+# Channel table for Itupiranga - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=622
+
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 22.1)
+[Rede Cultura do Pará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 7.1)
+[TV Kairós]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 26.1)
+[TV Correio]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 2.1)
+[RBA Marabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 5.1)
+[TV Liberal Marabá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-MagalhaesBarata b/isdb-t/br-pa-MagalhaesBarata
index d9a24ee5..fb7538a8 100644
--- a/isdb-t/br-pa-MagalhaesBarata
+++ b/isdb-t/br-pa-MagalhaesBarata
@@ -1,5 +1,5 @@
-# Channel table for Magalhães Barata - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3862
+# Channel table for Magalh�es Barata - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3862
 
 # Physical channel 30 (virtual 30.1)
 [TV Nazaré]
diff --git a/isdb-t/br-pa-Maraba b/isdb-t/br-pa-Maraba
index cb93d78a..730f8438 100644
--- a/isdb-t/br-pa-Maraba
+++ b/isdb-t/br-pa-Maraba
@@ -1,5 +1,34 @@
-# Channel table for Marabá - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/240
+# Channel table for Marab� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=240
+
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 20.1)
 [TV Evangelizar]
@@ -117,6 +146,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 45.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 32.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 35.1)
 [TV Verdade]
 	DELIVERY_SYSTEM = ISDBT
@@ -147,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 2.1)
-[RBA TV]
+[RBA Marabá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -205,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 38.1)
-[Rede TV! Belém]
+[TV Livre]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-pa-Marituba b/isdb-t/br-pa-Marituba
index 8e8e2d07..f2a795a9 100644
--- a/isdb-t/br-pa-Marituba
+++ b/isdb-t/br-pa-Marituba
@@ -1,5 +1,34 @@
 # Channel table for Marituba - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3798
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3798
+
+# Physical channel 14 (virtual 15.1)
+[TV One]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 14.1)
 [TV Grão-Pará]
@@ -30,6 +59,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 16.1)
+[TVM]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 17.1)
+[Rede Capital]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 18 (virtual 18.1)
 [CNT]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 19.1)
-[Rede Vida]
+# Physical channel 20 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -176,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -263,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -407,6 +494,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 9.1)
+[TV + Belém]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 38.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -436,6 +552,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 40.1)
+[TV A Crítica Pará]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 2.1)
 [Rede Cultura do Pará]
 	DELIVERY_SYSTEM = ISDBT
@@ -494,6 +639,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 8.5)
+[TV Senado, TV ALEPA, TV Câmara, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 46.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 47.1)
 [Rede TV! Belém]
 	DELIVERY_SYSTEM = ISDBT
@@ -524,7 +727,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 32.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -552,6 +755,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 51.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 50.1)
 [TV Marajoara]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pa-Mocajuba b/isdb-t/br-pa-Mocajuba
new file mode 100644
index 00000000..099e5ca5
--- /dev/null
+++ b/isdb-t/br-pa-Mocajuba
@@ -0,0 +1,32 @@
+# Channel table for Mocajuba - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3096
+
+# Physical channel 36 (virtual 13.1)
+[STM]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Moju b/isdb-t/br-pa-Moju
index 0d7bf66a..0968d36c 100644
--- a/isdb-t/br-pa-Moju
+++ b/isdb-t/br-pa-Moju
@@ -1,5 +1,5 @@
 # Channel table for Moju - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/346
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=346
 
 # Physical channel 21 (virtual 7.1)
 [TV Liberal]
diff --git a/isdb-t/br-pa-MojuiDosCampos b/isdb-t/br-pa-MojuiDosCampos
index 2fff31d6..55f85bde 100644
--- a/isdb-t/br-pa-MojuiDosCampos
+++ b/isdb-t/br-pa-MojuiDosCampos
@@ -1,8 +1,8 @@
-# Channel table for Mojuí Dos Campos - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/347
+# Channel table for Moju� Dos Campos - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=347
 
-# Physical channel 18 (virtual 17.1)
-[Rede Vida]
+# Physical channel 18 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -59,8 +59,95 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 5.1)
+[TV Ponta Negra Santarém]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 26.1)
+[TV Encontro]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 15.1)
+[TV Guarany]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 12.1)
-[RBA TV]
+[RBA Santarém]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -117,3 +204,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 10.1)
+[Rede TV! Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-NovaTimboteua b/isdb-t/br-pa-NovaTimboteua
index 356abac7..42fec426 100644
--- a/isdb-t/br-pa-NovaTimboteua
+++ b/isdb-t/br-pa-NovaTimboteua
@@ -1,5 +1,5 @@
 # Channel table for Nova Timboteua - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3042
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3042
 
 # Physical channel 31 (virtual 31.1)
 [TV Nazaré]
diff --git a/isdb-t/br-pa-NovoRepartimento b/isdb-t/br-pa-NovoRepartimento
index 2c90ba08..053e7a7e 100644
--- a/isdb-t/br-pa-NovoRepartimento
+++ b/isdb-t/br-pa-NovoRepartimento
@@ -1,5 +1,5 @@
 # Channel table for Novo Repartimento - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2684
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2684
 
 # Physical channel 25 (virtual 8.1)
 [TV Floresta]
diff --git a/isdb-t/br-pa-Oriximina b/isdb-t/br-pa-Oriximina
index 321de985..ee2cbff0 100644
--- a/isdb-t/br-pa-Oriximina
+++ b/isdb-t/br-pa-Oriximina
@@ -1,8 +1,8 @@
-# Channel table for Oriximiná - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/342
+# Channel table for Oriximin� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=342
 
 # Physical channel 43 (virtual 43.1)
-[Boas Novas]
+[TV MBN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-pa-OurilandiaDoNorte b/isdb-t/br-pa-OurilandiaDoNorte
new file mode 100644
index 00000000..90ce26e8
--- /dev/null
+++ b/isdb-t/br-pa-OurilandiaDoNorte
@@ -0,0 +1,61 @@
+# Channel table for Ouril�ndia Do Norte - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=229
+
+# Physical channel 16 (virtual 16.1)
+[Rede TV! Karajás]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 25.1)
+[TV Tucumã]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Paragominas b/isdb-t/br-pa-Paragominas
index 587881c8..61ca28f9 100644
--- a/isdb-t/br-pa-Paragominas
+++ b/isdb-t/br-pa-Paragominas
@@ -1,5 +1,34 @@
 # Channel table for Paragominas - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/91
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=91
+
+# Physical channel 22 (virtual 22.1)
+[MVTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
 [SBT Paragominas]
diff --git a/isdb-t/br-pa-Parauapebas b/isdb-t/br-pa-Parauapebas
index a0666268..bb49c2c5 100644
--- a/isdb-t/br-pa-Parauapebas
+++ b/isdb-t/br-pa-Parauapebas
@@ -1,5 +1,5 @@
 # Channel table for Parauapebas - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/236
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=236
 
 # Physical channel 25 (virtual 25.1)
 [Amazônia TV]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 35 (virtual 30.1)
+[RBA Parauapebas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Parauapebas(carajas) b/isdb-t/br-pa-Parauapebas(carajas)
index 15c55f7f..1d734af2 100644
--- a/isdb-t/br-pa-Parauapebas(carajas)
+++ b/isdb-t/br-pa-Parauapebas(carajas)
@@ -1,8 +1,8 @@
-# Channel table for Parauapebas (carajás) - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1551
+# Channel table for Parauapebas (caraj�s) - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1551
 
 # Physical channel 20 (virtual 7.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 13.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
diff --git a/isdb-t/br-pa-PontaDePedras b/isdb-t/br-pa-PontaDePedras
index 55b21f44..7169cc2c 100644
--- a/isdb-t/br-pa-PontaDePedras
+++ b/isdb-t/br-pa-PontaDePedras
@@ -1,5 +1,5 @@
 # Channel table for Ponta De Pedras - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2879
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2879
 
 # Physical channel 21 (virtual 7.1)
 [TV Liberal]
diff --git a/isdb-t/br-pa-Portel b/isdb-t/br-pa-Portel
new file mode 100644
index 00000000..3fe1cdde
--- /dev/null
+++ b/isdb-t/br-pa-Portel
@@ -0,0 +1,32 @@
+# Channel table for Portel - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3077
+
+# Physical channel 51 (virtual 51.1)
+[TV Portel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Redencao b/isdb-t/br-pa-Redencao
new file mode 100644
index 00000000..38841d08
--- /dev/null
+++ b/isdb-t/br-pa-Redencao
@@ -0,0 +1,32 @@
+# Channel table for Reden��o - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=255
+
+# Physical channel 29 (virtual 7.1)
+[TV Cidade Redenção]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Salinopolis b/isdb-t/br-pa-Salinopolis
index ca3cd4d6..989d69a2 100644
--- a/isdb-t/br-pa-Salinopolis
+++ b/isdb-t/br-pa-Salinopolis
@@ -1,5 +1,5 @@
-# Channel table for Salinópolis - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/400
+# Channel table for Salin�polis - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=400
 
 # Physical channel 25 (virtual 6.1)
 [SBT Salinas]
diff --git a/isdb-t/br-pa-SantaBarbaraDoPara b/isdb-t/br-pa-SantaBarbaraDoPara
index 27d9c947..7406e0b5 100644
--- a/isdb-t/br-pa-SantaBarbaraDoPara
+++ b/isdb-t/br-pa-SantaBarbaraDoPara
@@ -1,5 +1,5 @@
-# Channel table for Santa Bárbara Do Pará - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3799
+# Channel table for Santa B�rbara Do Par� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3799
 
 # Physical channel 15 (virtual 14.1)
 [TV Grão-Pará]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 19.1)
-[Rede Vida]
+# Physical channel 20 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-pa-SantaIsabelDoPara b/isdb-t/br-pa-SantaIsabelDoPara
index 99a99912..cb85ed53 100644
--- a/isdb-t/br-pa-SantaIsabelDoPara
+++ b/isdb-t/br-pa-SantaIsabelDoPara
@@ -1,5 +1,5 @@
-# Channel table for Santa Isabel Do Pará - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3800
+# Channel table for Santa Isabel Do Par� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3800
 
 # Physical channel 15 (virtual 14.1)
 [TV Grão-Pará]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 19.1)
-[Rede Vida]
+# Physical channel 20 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-pa-SantaMariaDoPara b/isdb-t/br-pa-SantaMariaDoPara
index 61923e7d..04d94caf 100644
--- a/isdb-t/br-pa-SantaMariaDoPara
+++ b/isdb-t/br-pa-SantaMariaDoPara
@@ -1,5 +1,5 @@
-# Channel table for Santa Maria Do Pará - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/423
+# Channel table for Santa Maria Do Par� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=423
 
 # Physical channel 31 (virtual 31.1)
 [TV Nazaré]
diff --git a/isdb-t/br-pa-Santarem b/isdb-t/br-pa-Santarem
index a1fadb27..4710d6fe 100644
--- a/isdb-t/br-pa-Santarem
+++ b/isdb-t/br-pa-Santarem
@@ -1,5 +1,5 @@
-# Channel table for Santarém - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/103
+# Channel table for Santar�m - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=103
 
 # Physical channel 16 (virtual 16.1)
 [TV Evangelizar]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 17.1)
-[Rede Vida]
+# Physical channel 18 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -88,8 +88,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 5.1)
+[TV Ponta Negra Santarém]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 29.1)
-[TV Lago Verde]
+[TV Princesa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -117,8 +146,95 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 26.1)
+[TV Encontro]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 31.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 15.1)
+[TV Guarany]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 12.1)
-[RBA TV]
+[RBA Santarém]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,3 +291,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 10.1)
+[Rede TV! Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-SaoDomingosDoCapim b/isdb-t/br-pa-SaoDomingosDoCapim
new file mode 100644
index 00000000..0d1e5263
--- /dev/null
+++ b/isdb-t/br-pa-SaoDomingosDoCapim
@@ -0,0 +1,32 @@
+# Channel table for S�o Domingos Do Capim - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3046
+
+# Physical channel 31 (virtual 31.1)
+[TV Nazaré]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Tailandia b/isdb-t/br-pa-Tailandia
index 23693f4e..2854b063 100644
--- a/isdb-t/br-pa-Tailandia
+++ b/isdb-t/br-pa-Tailandia
@@ -1,5 +1,5 @@
-# Channel table for Tailândia - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/353
+# Channel table for Tail�ndia - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=353
 
 # Physical channel 33 (virtual 7.1)
 [TV Guajará]
diff --git a/isdb-t/br-pa-Tome-acu b/isdb-t/br-pa-Tome-acu
index 938197b3..06329737 100644
--- a/isdb-t/br-pa-Tome-acu
+++ b/isdb-t/br-pa-Tome-acu
@@ -1,5 +1,5 @@
-# Channel table for Tomé-açu - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/341
+# Channel table for Tom�-a�u - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=341
 
 # Physical channel 46 (virtual 46.1)
 [SBT Tomé Açu]
diff --git a/isdb-t/br-pa-Tucuma b/isdb-t/br-pa-Tucuma
index fddfaecd..6b669299 100644
--- a/isdb-t/br-pa-Tucuma
+++ b/isdb-t/br-pa-Tucuma
@@ -1,5 +1,34 @@
-# Channel table for Tucumã - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/286
+# Channel table for Tucum� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=286
+
+# Physical channel 16 (virtual 16.1)
+[Rede TV! Karajás]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 6.1)
 [TV Tucumã]
diff --git a/isdb-t/br-pa-Tucurui b/isdb-t/br-pa-Tucurui
index 760435ee..f850086a 100644
--- a/isdb-t/br-pa-Tucurui
+++ b/isdb-t/br-pa-Tucurui
@@ -1,5 +1,34 @@
-# Channel table for Tucuruí - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/581
+# Channel table for Tucuru� - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=581
+
+# Physical channel 23 (virtual 2.1)
+[Record TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 12.1)
 [TV Floresta]
@@ -30,3 +59,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 6.1)
+[TV Cultura]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 4.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pa-Obidos b/isdb-t/br-pa-obidos
index 52bc3206..9e616b0c 100644
--- a/isdb-t/br-pa-Obidos
+++ b/isdb-t/br-pa-obidos
@@ -1,5 +1,5 @@
-# Channel table for Óbidos - PA - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/124
+# Channel table for �bidos - PA - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=124
 
 # Physical channel 31 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-pb-AlagoaGrande b/isdb-t/br-pb-AlagoaGrande
index 357af720..8efbba1a 100644
--- a/isdb-t/br-pb-AlagoaGrande
+++ b/isdb-t/br-pb-AlagoaGrande
@@ -1,5 +1,5 @@
 # Channel table for Alagoa Grande - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/960
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=960
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-AlagoaNova b/isdb-t/br-pb-AlagoaNova
new file mode 100644
index 00000000..f17a00df
--- /dev/null
+++ b/isdb-t/br-pb-AlagoaNova
@@ -0,0 +1,90 @@
+# Channel table for Alagoa Nova - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4035
+
+# Physical channel 19 (virtual 7.1)
+[TV Cabo Branco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 5.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 11.1)
+[TV Maior]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Alagoinha b/isdb-t/br-pb-Alagoinha
index c10e8bb6..07556de8 100644
--- a/isdb-t/br-pb-Alagoinha
+++ b/isdb-t/br-pb-Alagoinha
@@ -1,5 +1,5 @@
 # Channel table for Alagoinha - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3234
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3234
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Aparecida b/isdb-t/br-pb-Aparecida
index 996647d1..e006f7f8 100644
--- a/isdb-t/br-pb-Aparecida
+++ b/isdb-t/br-pb-Aparecida
@@ -1,5 +1,5 @@
 # Channel table for Aparecida - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3262
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3262
 
 # Physical channel 21 (virtual 9.1)
 [TV Paraíba]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Itararé]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pb-Arara b/isdb-t/br-pb-Arara
index 91ebd2c7..f1ae999d 100644
--- a/isdb-t/br-pb-Arara
+++ b/isdb-t/br-pb-Arara
@@ -1,5 +1,5 @@
 # Channel table for Arara - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1781
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1781
 
 # Physical channel 31 (virtual 5.1)
 [TV Tambaú]
diff --git a/isdb-t/br-pb-Araruna b/isdb-t/br-pb-Araruna
new file mode 100644
index 00000000..9c1162ec
--- /dev/null
+++ b/isdb-t/br-pb-Araruna
@@ -0,0 +1,32 @@
+# Channel table for Araruna - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1780
+
+# Physical channel 17 (virtual 22.1)
+[TV Correio]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Areia b/isdb-t/br-pb-Areia
index b72cbe6d..84398c17 100644
--- a/isdb-t/br-pb-Areia
+++ b/isdb-t/br-pb-Areia
@@ -1,5 +1,5 @@
 # Channel table for Areia - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2454
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2454
 
 # Physical channel 16 (virtual 10.1)
 [TV Manaíra]
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 7.1)
+[TV Cabo Branco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 21 (virtual 3.1)
 [TV Paraíba]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 23.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 31 (virtual 5.1)
 [TV Tambaú]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pb-Areia(santaMaria) b/isdb-t/br-pb-Areia(santaMaria)
new file mode 100644
index 00000000..0e91ea8e
--- /dev/null
+++ b/isdb-t/br-pb-Areia(santaMaria)
@@ -0,0 +1,32 @@
+# Channel table for Areia (santa Maria) - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2468
+
+# Physical channel 31 (virtual 5.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-BaiaDaTraicao b/isdb-t/br-pb-BaiaDaTraicao
index 2fc04b97..faab0062 100644
--- a/isdb-t/br-pb-BaiaDaTraicao
+++ b/isdb-t/br-pb-BaiaDaTraicao
@@ -1,5 +1,5 @@
-# Channel table for Baía Da Traição - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2638
+# Channel table for Ba�a Da Trai��o - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2638
 
 # Physical channel 19 (virtual 7.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Bananeiras b/isdb-t/br-pb-Bananeiras
index 418a25e8..9e2d9afd 100644
--- a/isdb-t/br-pb-Bananeiras
+++ b/isdb-t/br-pb-Bananeiras
@@ -1,5 +1,5 @@
 # Channel table for Bananeiras - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1454
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1454
 
 # Physical channel 17 (virtual 22.1)
 [TV Correio]
diff --git a/isdb-t/br-pb-Bayeux b/isdb-t/br-pb-Bayeux
index a0bd6333..d5670fa8 100644
--- a/isdb-t/br-pb-Bayeux
+++ b/isdb-t/br-pb-Bayeux
@@ -1,5 +1,5 @@
 # Channel table for Bayeux - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2624
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2624
 
 # Physical channel 15 (virtual 15.1)
 [RBI TV]
@@ -117,35 +117,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 20.1)
-[Rede Brasil]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 23 (virtual 14.1)
 [TV Arapuan]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.4)
+# Physical channel 27 (virtual 27.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -321,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -350,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 35.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -407,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.2)
+# Physical channel 39 (virtual 6.2)
 [TV Câmara João Pessoa, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -436,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 40.3)
-[TV Senado, TV Assembleia PB, TV Câmara]
+# Physical channel 41 (virtual 8.4)
+[TV Senado, TV Assembleia PB, Paraíba Educa, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -523,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 48.1)
-[Rede Vida]
+# Physical channel 47 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-pb-BelemDoBrejoDoCruz b/isdb-t/br-pb-BelemDoBrejoDoCruz
index 9d42a38a..1dd46ebc 100644
--- a/isdb-t/br-pb-BelemDoBrejoDoCruz
+++ b/isdb-t/br-pb-BelemDoBrejoDoCruz
@@ -1,5 +1,5 @@
-# Channel table for Belém Do Brejo Do Cruz - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3117
+# Channel table for Bel�m Do Brejo Do Cruz - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3117
 
 # Physical channel 20 (virtual 3.1)
 [TV Paraíba]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 24.1)
+[TV Arapuan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-BoaVista b/isdb-t/br-pb-BoaVista
index f8f961b6..4912bf1a 100644
--- a/isdb-t/br-pb-BoaVista
+++ b/isdb-t/br-pb-BoaVista
@@ -1,5 +1,5 @@
 # Channel table for Boa Vista - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2952
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2952
 
 # Physical channel 18 (virtual 18.1)
 [TV Itararé]
diff --git a/isdb-t/br-pb-BomJesus b/isdb-t/br-pb-BomJesus
index f3630e9b..7f998c62 100644
--- a/isdb-t/br-pb-BomJesus
+++ b/isdb-t/br-pb-BomJesus
@@ -1,5 +1,5 @@
 # Channel table for Bom Jesus - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2813
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2813
 
 # Physical channel 19 (virtual 12.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-BomSucesso b/isdb-t/br-pb-BomSucesso
index 09e61a20..394074d3 100644
--- a/isdb-t/br-pb-BomSucesso
+++ b/isdb-t/br-pb-BomSucesso
@@ -1,5 +1,5 @@
 # Channel table for Bom Sucesso - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3278
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3278
 
 # Physical channel 21 (virtual 29.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-Borborema b/isdb-t/br-pb-Borborema
index ff4f820b..6374dff1 100644
--- a/isdb-t/br-pb-Borborema
+++ b/isdb-t/br-pb-Borborema
@@ -1,5 +1,5 @@
 # Channel table for Borborema - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2645
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2645
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-BrejoDoCruz b/isdb-t/br-pb-BrejoDoCruz
index 4ddc197b..ed8489c4 100644
--- a/isdb-t/br-pb-BrejoDoCruz
+++ b/isdb-t/br-pb-BrejoDoCruz
@@ -1,5 +1,5 @@
 # Channel table for Brejo Do Cruz - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2562
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2562
 
 # Physical channel 20 (virtual 3.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-BrejoDosSantos b/isdb-t/br-pb-BrejoDosSantos
index d3a69329..c88a50b8 100644
--- a/isdb-t/br-pb-BrejoDosSantos
+++ b/isdb-t/br-pb-BrejoDosSantos
@@ -1,5 +1,5 @@
 # Channel table for Brejo Dos Santos - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2806
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2806
 
 # Physical channel 20 (virtual 3.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-Caapora b/isdb-t/br-pb-Caapora
index e63eda57..dea350dc 100644
--- a/isdb-t/br-pb-Caapora
+++ b/isdb-t/br-pb-Caapora
@@ -1,5 +1,5 @@
-# Channel table for Caaporã - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2821
+# Channel table for Caapor� - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2821
 
 # Physical channel 19 (virtual 7.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Cabedelo b/isdb-t/br-pb-Cabedelo
index 68e2823d..1dc4c679 100644
--- a/isdb-t/br-pb-Cabedelo
+++ b/isdb-t/br-pb-Cabedelo
@@ -1,5 +1,5 @@
 # Channel table for Cabedelo - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3238
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3238
 
 # Physical channel 15 (virtual 15.1)
 [RBI TV]
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.2)
-[TV Câmara João Pessoa, TV Câmara]
+# Physical channel 39 (virtual 6.3)
+[TV Câmara João Pessoa, TV Câmara, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 40.3)
-[TV Senado, TV Assembleia PB, TV Câmara]
+# Physical channel 41 (virtual 8.4)
+[TV Senado, TV Assembleia PB, Paraíba Educa, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 48.1)
-[Rede Vida]
+# Physical channel 47 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-pb-CachoeiraDosIndios b/isdb-t/br-pb-CachoeiraDosindios
index 01550444..54e78af4 100644
--- a/isdb-t/br-pb-CachoeiraDosIndios
+++ b/isdb-t/br-pb-CachoeiraDosindios
@@ -1,5 +1,5 @@
-# Channel table for Cachoeira Dos Índios - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2820
+# Channel table for Cachoeira Dos �ndios - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2820
 
 # Physical channel 19 (virtual 12.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-CacimbaDeAreia b/isdb-t/br-pb-CacimbaDeAreia
index 4f9f9315..1c70a29a 100644
--- a/isdb-t/br-pb-CacimbaDeAreia
+++ b/isdb-t/br-pb-CacimbaDeAreia
@@ -1,5 +1,5 @@
 # Channel table for Cacimba De Areia - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1856
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1856
 
 # Physical channel 21 (virtual 29.1)
 [TV Paraíba]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 32.1)
 [TV Arapuan]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pb-CacimbaDeDentro b/isdb-t/br-pb-CacimbaDeDentro
index aa36367e..478411d3 100644
--- a/isdb-t/br-pb-CacimbaDeDentro
+++ b/isdb-t/br-pb-CacimbaDeDentro
@@ -1,5 +1,5 @@
 # Channel table for Cacimba De Dentro - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2687
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2687
 
 # Physical channel 22 (virtual 7.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Cacimbas b/isdb-t/br-pb-Cacimbas
new file mode 100644
index 00000000..4621a4b0
--- /dev/null
+++ b/isdb-t/br-pb-Cacimbas
@@ -0,0 +1,90 @@
+# Channel table for Cacimbas - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4136
+
+# Physical channel 21 (virtual 29.1)
+[TV Paraíba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Arapuan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Cajazeiras b/isdb-t/br-pb-Cajazeiras
index 88ca555f..62cab4ce 100644
--- a/isdb-t/br-pb-Cajazeiras
+++ b/isdb-t/br-pb-Cajazeiras
@@ -1,5 +1,5 @@
 # Channel table for Cajazeiras - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/689
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=689
 
 # Physical channel 19 (virtual 12.1)
 [TV Paraíba]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 16.1)
-[Rede Vida]
+# Physical channel 24 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -88,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.4)
+[TV Câmara, TV Assembleia PB, Paraíba Educa, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Cajazeirinhas b/isdb-t/br-pb-Cajazeirinhas
new file mode 100644
index 00000000..507d2c02
--- /dev/null
+++ b/isdb-t/br-pb-Cajazeirinhas
@@ -0,0 +1,61 @@
+# Channel table for Cajazeirinhas - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4262
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 43.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-CampinaGrande b/isdb-t/br-pb-CampinaGrande
index f9b198d6..d23b0e0c 100644
--- a/isdb-t/br-pb-CampinaGrande
+++ b/isdb-t/br-pb-CampinaGrande
@@ -1,5 +1,34 @@
 # Channel table for Campina Grande - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/116
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=116
+
+# Physical channel 15 (virtual 8.4)
+[TV Senado, TV Assembleia PB, TV Câmara, Paraíba Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 7.1)
 [TV Manaíra]
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 23.1)
-[Rede Vida]
+# Physical channel 24 (virtual 23.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-pb-Capim b/isdb-t/br-pb-Capim
index afda4ab5..71e15e69 100644
--- a/isdb-t/br-pb-Capim
+++ b/isdb-t/br-pb-Capim
@@ -1,5 +1,5 @@
 # Channel table for Capim - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2639
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2639
 
 # Physical channel 19 (virtual 7.1)
 [TV Cabo Branco]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Catingueira b/isdb-t/br-pb-Catingueira
index b77c19af..f12f8178 100644
--- a/isdb-t/br-pb-Catingueira
+++ b/isdb-t/br-pb-Catingueira
@@ -1,5 +1,5 @@
 # Channel table for Catingueira - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2832
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2832
 
 # Physical channel 21 (virtual 29.1)
 [TV Paraíba]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 32.1)
 [TV Arapuan]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pb-CatoleDoRocha b/isdb-t/br-pb-CatoleDoRocha
index 81319651..7829efb8 100644
--- a/isdb-t/br-pb-CatoleDoRocha
+++ b/isdb-t/br-pb-CatoleDoRocha
@@ -1,5 +1,5 @@
-# Channel table for Catolé Do Rocha - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/907
+# Channel table for Catol� Do Rocha - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=907
 
 # Physical channel 20 (virtual 3.1)
 [TV Paraíba]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 36.4)
+[TV Câmara, TV Assembleia PB, Paraíba Educa, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Condado b/isdb-t/br-pb-Condado
index 9b7b41bb..add34e7e 100644
--- a/isdb-t/br-pb-Condado
+++ b/isdb-t/br-pb-Condado
@@ -1,5 +1,5 @@
 # Channel table for Condado - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2458
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2458
 
 # Physical channel 19 (virtual 9.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-Conde b/isdb-t/br-pb-Conde
index cbf8961d..3876bc17 100644
--- a/isdb-t/br-pb-Conde
+++ b/isdb-t/br-pb-Conde
@@ -1,5 +1,5 @@
 # Channel table for Conde - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3803
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3803
 
 # Physical channel 16 (virtual 10.1)
 [TV Manaíra]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 20.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-pb-Coremas b/isdb-t/br-pb-Coremas
new file mode 100644
index 00000000..efbac0c0
--- /dev/null
+++ b/isdb-t/br-pb-Coremas
@@ -0,0 +1,32 @@
+# Channel table for Coremas - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2837
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-CruzDoEspiritoSanto b/isdb-t/br-pb-CruzDoEspiritoSanto
index 9732625d..63fb4899 100644
--- a/isdb-t/br-pb-CruzDoEspiritoSanto
+++ b/isdb-t/br-pb-CruzDoEspiritoSanto
@@ -1,5 +1,5 @@
-# Channel table for Cruz Do Espírito Santo - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3804
+# Channel table for Cruz Do Esp�rito Santo - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3804
 
 # Physical channel 16 (virtual 10.1)
 [TV Manaíra]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
diff --git a/isdb-t/br-pb-CuiteDeMamanguape b/isdb-t/br-pb-CuiteDeMamanguape
index 3608ee5f..bf749cd1 100644
--- a/isdb-t/br-pb-CuiteDeMamanguape
+++ b/isdb-t/br-pb-CuiteDeMamanguape
@@ -1,5 +1,5 @@
-# Channel table for Cuité De Mamanguape - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2646
+# Channel table for Cuit� De Mamanguape - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2646
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Cuitegi b/isdb-t/br-pb-Cuitegi
index b7e7c77c..39677fe6 100644
--- a/isdb-t/br-pb-Cuitegi
+++ b/isdb-t/br-pb-Cuitegi
@@ -1,5 +1,5 @@
 # Channel table for Cuitegi - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3115
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3115
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 23.1)
+[TV Arapuan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-CurralDeCima b/isdb-t/br-pb-CurralDeCima
index fdc602c9..8fd24e69 100644
--- a/isdb-t/br-pb-CurralDeCima
+++ b/isdb-t/br-pb-CurralDeCima
@@ -1,5 +1,5 @@
 # Channel table for Curral De Cima - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2640
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2640
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Desterro b/isdb-t/br-pb-Desterro
index bbb2e9ae..4a9ea8bd 100644
--- a/isdb-t/br-pb-Desterro
+++ b/isdb-t/br-pb-Desterro
@@ -1,5 +1,5 @@
 # Channel table for Desterro - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2814
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2814
 
 # Physical channel 21 (virtual 29.1)
 [TV Paraíba]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 32.1)
 [TV Arapuan]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rs-RioGrande(cassino) b/isdb-t/br-pb-Emas
index dbd60bd2..4a8c88cb 100644
--- a/isdb-t/br-rs-RioGrande(cassino)
+++ b/isdb-t/br-pb-Emas
@@ -1,11 +1,11 @@
-# Channel table for Rio Grande (cassino) - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1896
+# Channel table for Emas - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4138
 
-# Physical channel 23 (virtual 7.1)
-[RBS Rio Grande]
+# Physical channel 21 (virtual 29.1)
+[TV Paraíba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 25.1)
-[SBT RS]
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 575142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 5.1)
-[Band RS]
+# Physical channel 32 (virtual 32.1)
+[TV Arapuan]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-pb-MaeD'Agua b/isdb-t/br-pb-Esperanca
index 52d62a78..7b321579 100644
--- a/isdb-t/br-pb-MaeD'Agua
+++ b/isdb-t/br-pb-Esperanca
@@ -1,7 +1,7 @@
-# Channel table for Mãe D´ Água - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2840
+# Channel table for Esperan�a - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4036
 
-# Physical channel 21 (virtual 29.1)
+# Physical channel 21 (virtual 3.1)
 [TV Paraíba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[TV Arapuan]
+# Physical channel 35 (virtual 11.1)
+[TV Maior]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pb-Fagundes b/isdb-t/br-pb-Fagundes
index 5378e356..c4f8564d 100644
--- a/isdb-t/br-pb-Fagundes
+++ b/isdb-t/br-pb-Fagundes
@@ -1,5 +1,5 @@
 # Channel table for Fagundes - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1455
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1455
 
 # Physical channel 21 (virtual 3.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-Guarabira b/isdb-t/br-pb-Guarabira
index 07064527..6a99db40 100644
--- a/isdb-t/br-pb-Guarabira
+++ b/isdb-t/br-pb-Guarabira
@@ -1,5 +1,5 @@
 # Channel table for Guarabira - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/691
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=691
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Imaculada b/isdb-t/br-pb-Imaculada
index 5c21564b..4f76ea30 100644
--- a/isdb-t/br-pb-Imaculada
+++ b/isdb-t/br-pb-Imaculada
@@ -1,5 +1,5 @@
 # Channel table for Imaculada - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2460
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2460
 
 # Physical channel 21 (virtual 29.1)
 [TV Paraíba]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Itaporanga b/isdb-t/br-pb-Itaporanga
index 812458e2..ba34fbc3 100644
--- a/isdb-t/br-pb-Itaporanga
+++ b/isdb-t/br-pb-Itaporanga
@@ -1,5 +1,5 @@
 # Channel table for Itaporanga - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2542
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2542
 
 # Physical channel 23 (virtual 23.1)
 [TV Arapuan]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Itapororoca b/isdb-t/br-pb-Itapororoca
index a101a2a1..6d45d232 100644
--- a/isdb-t/br-pb-Itapororoca
+++ b/isdb-t/br-pb-Itapororoca
@@ -1,5 +1,5 @@
 # Channel table for Itapororoca - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3239
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3239
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Jacarau b/isdb-t/br-pb-Jacarau
index 405acd6e..a7d84f53 100644
--- a/isdb-t/br-pb-Jacarau
+++ b/isdb-t/br-pb-Jacarau
@@ -1,5 +1,5 @@
-# Channel table for Jacaraú - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2540
+# Channel table for Jacara� - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2540
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Jerico b/isdb-t/br-pb-Jerico
index bc7cf72a..5eed408f 100644
--- a/isdb-t/br-pb-Jerico
+++ b/isdb-t/br-pb-Jerico
@@ -1,5 +1,5 @@
-# Channel table for Jericó - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2991
+# Channel table for Jeric� - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2991
 
 # Physical channel 20 (virtual 20.1)
 [TV Arapuan]
diff --git a/isdb-t/br-pb-JoaoPessoa b/isdb-t/br-pb-JoaoPessoa
index 941858b0..e5d2340a 100644
--- a/isdb-t/br-pb-JoaoPessoa
+++ b/isdb-t/br-pb-JoaoPessoa
@@ -1,5 +1,5 @@
-# Channel table for João Pessoa - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/151
+# Channel table for Jo�o Pessoa - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=151
 
 # Physical channel 15 (virtual 15.1)
 [RBI TV]
@@ -117,35 +117,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 20.1)
-[Rede Brasil]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 23 (virtual 14.1)
 [TV Arapuan]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.4)
+# Physical channel 27 (virtual 27.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -321,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -350,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 35.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -407,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.2)
-[TV Câmara João Pessoa, TV Câmara]
+# Physical channel 39 (virtual 6.3)
+[TV Câmara, TV Câmara João Pessoa, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -436,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 40.3)
-[TV Senado, TV Assembleia PB, TV Câmara]
+# Physical channel 41 (virtual 8.4)
+[TV Senado, TV Assembleia PB, Paraíba Educa, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -523,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 48.1)
-[Rede Vida]
+# Physical channel 47 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-pb-JuarezTavora b/isdb-t/br-pb-JuarezTavora
new file mode 100644
index 00000000..010941d0
--- /dev/null
+++ b/isdb-t/br-pb-JuarezTavora
@@ -0,0 +1,61 @@
+# Channel table for Juarez T�vora - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2732
+
+# Physical channel 19 (virtual 7.1)
+[TV Cabo Branco]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 5.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Juripiranga b/isdb-t/br-pb-Juripiranga
index 1f4e0ea0..ea2c79fe 100644
--- a/isdb-t/br-pb-Juripiranga
+++ b/isdb-t/br-pb-Juripiranga
@@ -1,5 +1,5 @@
 # Channel table for Juripiranga - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2641
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2641
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Lagoa b/isdb-t/br-pb-Lagoa
new file mode 100644
index 00000000..2b76d99b
--- /dev/null
+++ b/isdb-t/br-pb-Lagoa
@@ -0,0 +1,32 @@
+# Channel table for Lagoa - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3279
+
+# Physical channel 43 (virtual 43.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-LagoaDeDentro b/isdb-t/br-pb-LagoaDeDentro
index 64823cd6..bb4fea77 100644
--- a/isdb-t/br-pb-LagoaDeDentro
+++ b/isdb-t/br-pb-LagoaDeDentro
@@ -1,5 +1,5 @@
 # Channel table for Lagoa De Dentro - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3073
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3073
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-LagoaSeca b/isdb-t/br-pb-LagoaSeca
index e667b771..ea4ed06c 100644
--- a/isdb-t/br-pb-LagoaSeca
+++ b/isdb-t/br-pb-LagoaSeca
@@ -1,5 +1,5 @@
 # Channel table for Lagoa Seca - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3022
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3022
 
 # Physical channel 16 (virtual 7.1)
 [TV Manaíra]
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-pb-Livramento b/isdb-t/br-pb-Livramento
new file mode 100644
index 00000000..04596e10
--- /dev/null
+++ b/isdb-t/br-pb-Livramento
@@ -0,0 +1,32 @@
+# Channel table for Livramento - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2536
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Lucena b/isdb-t/br-pb-Lucena
index 78ab8271..3d817f97 100644
--- a/isdb-t/br-pb-Lucena
+++ b/isdb-t/br-pb-Lucena
@@ -1,5 +1,5 @@
 # Channel table for Lucena - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3027
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3027
 
 # Physical channel 16 (virtual 10.1)
 [TV Manaíra]
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 40.3)
-[TV Senado, TV Assembleia PB, TV Câmara]
+# Physical channel 41 (virtual 8.4)
+[TV Senado, TV Assembleia PB, Paraíba Educa, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-pb-MaeD'agua b/isdb-t/br-pb-MaeD'agua
new file mode 100644
index 00000000..77ca5cf6
--- /dev/null
+++ b/isdb-t/br-pb-MaeD'agua
@@ -0,0 +1,90 @@
+# Channel table for M�e D� �gua - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2840
+
+# Physical channel 21 (virtual 29.1)
+[TV Paraíba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Arapuan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Mamanguape b/isdb-t/br-pb-Mamanguape
index b2bd31b9..4b5c5b79 100644
--- a/isdb-t/br-pb-Mamanguape
+++ b/isdb-t/br-pb-Mamanguape
@@ -1,5 +1,5 @@
 # Channel table for Mamanguape - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1456
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1456
 
 # Physical channel 17 (virtual 12.1)
 [TV Correio]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pb-Marcacao b/isdb-t/br-pb-Marcacao
index ba99cf0d..12855c34 100644
--- a/isdb-t/br-pb-Marcacao
+++ b/isdb-t/br-pb-Marcacao
@@ -1,5 +1,5 @@
-# Channel table for Marcação - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2642
+# Channel table for Marca��o - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2642
 
 # Physical channel 19 (virtual 7.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Marizopolis b/isdb-t/br-pb-Marizopolis
index 2e35af34..52a8ce34 100644
--- a/isdb-t/br-pb-Marizopolis
+++ b/isdb-t/br-pb-Marizopolis
@@ -1,5 +1,5 @@
-# Channel table for Marizópolis - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3264
+# Channel table for Mariz�polis - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3264
 
 # Physical channel 21 (virtual 9.1)
 [TV Paraíba]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Itararé]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pb-Massaranduba b/isdb-t/br-pb-Massaranduba
index 0328999c..4083e3ef 100644
--- a/isdb-t/br-pb-Massaranduba
+++ b/isdb-t/br-pb-Massaranduba
@@ -1,5 +1,5 @@
 # Channel table for Massaranduba - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3023
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3023
 
 # Physical channel 16 (virtual 7.1)
 [TV Manaíra]
diff --git a/isdb-t/br-pb-Matinhas b/isdb-t/br-pb-Matinhas
index 27812370..66ef8bce 100644
--- a/isdb-t/br-pb-Matinhas
+++ b/isdb-t/br-pb-Matinhas
@@ -1,5 +1,5 @@
 # Channel table for Matinhas - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2836
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2836
 
 # Physical channel 21 (virtual 3.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-Matureia b/isdb-t/br-pb-Matureia
index 7bd4a9d5..0dd3a599 100644
--- a/isdb-t/br-pb-Matureia
+++ b/isdb-t/br-pb-Matureia
@@ -1,5 +1,5 @@
-# Channel table for Maturéia - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/946
+# Channel table for Matur�ia - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=946
 
 # Physical channel 21 (virtual 29.1)
 [TV Paraíba]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 32.1)
 [TV Arapuan]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 44.4)
+[TV Câmara, TV Assembleia PB, Paraíba Educa, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Monteiro b/isdb-t/br-pb-Monteiro
index 29240669..0aa161c3 100644
--- a/isdb-t/br-pb-Monteiro
+++ b/isdb-t/br-pb-Monteiro
@@ -1,5 +1,34 @@
 # Channel table for Monteiro - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/690
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=690
+
+# Physical channel 22 (virtual 9.1)
+[TV Paraíba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 24.1)
 [TV Arapuan]
diff --git a/isdb-t/br-pb-Mulungu b/isdb-t/br-pb-Mulungu
index b33b29a6..c5744e43 100644
--- a/isdb-t/br-pb-Mulungu
+++ b/isdb-t/br-pb-Mulungu
@@ -1,5 +1,5 @@
 # Channel table for Mulungu - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2537
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2537
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Nazarezinho b/isdb-t/br-pb-Nazarezinho
index f9fd2b4c..8852c240 100644
--- a/isdb-t/br-pb-Nazarezinho
+++ b/isdb-t/br-pb-Nazarezinho
@@ -1,5 +1,5 @@
 # Channel table for Nazarezinho - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1975
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1975
 
 # Physical channel 19 (virtual 12.1)
 [TV Paraíba]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-OlhoD'Agua b/isdb-t/br-pb-OlhoD'agua
index 6f1a3106..f0be7ae1 100644
--- a/isdb-t/br-pb-OlhoD'Agua
+++ b/isdb-t/br-pb-OlhoD'agua
@@ -1,5 +1,5 @@
-# Channel table for Olho D´ Água - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2809
+# Channel table for Olho D� �gua - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2809
 
 # Physical channel 19 (virtual 9.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-Passagem b/isdb-t/br-pb-Passagem
new file mode 100644
index 00000000..79107e4f
--- /dev/null
+++ b/isdb-t/br-pb-Passagem
@@ -0,0 +1,90 @@
+# Channel table for Passagem - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4137
+
+# Physical channel 21 (virtual 29.1)
+[TV Paraíba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Arapuan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Patos b/isdb-t/br-pb-Patos
index bfee8b66..d30781f3 100644
--- a/isdb-t/br-pb-Patos
+++ b/isdb-t/br-pb-Patos
@@ -1,8 +1,8 @@
 # Channel table for Patos - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/688
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=688
 
-# Physical channel 14 (virtual 14.3)
-[TV Senado, TV Assembleia PB, TV Câmara]
+# Physical channel 14 (virtual 8.4)
+[TV Senado, TV Assembleia PB, Paraíba Educa, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -88,8 +88,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Arapuan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 42.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
diff --git a/isdb-t/br-pb-Paulista b/isdb-t/br-pb-Paulista
new file mode 100644
index 00000000..8cb68f39
--- /dev/null
+++ b/isdb-t/br-pb-Paulista
@@ -0,0 +1,32 @@
+# Channel table for Paulista - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3189
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-PedrasDeFogo b/isdb-t/br-pb-PedrasDeFogo
index 433e00d0..c84ed12a 100644
--- a/isdb-t/br-pb-PedrasDeFogo
+++ b/isdb-t/br-pb-PedrasDeFogo
@@ -1,5 +1,5 @@
 # Channel table for Pedras De Fogo - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2839
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2839
 
 # Physical channel 19 (virtual 7.1)
 [TV Cabo Branco]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 46.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-pb-PedroRegis b/isdb-t/br-pb-PedroRegis
index fe87c49f..abc9d63d 100644
--- a/isdb-t/br-pb-PedroRegis
+++ b/isdb-t/br-pb-PedroRegis
@@ -1,5 +1,5 @@
-# Channel table for Pedro Régis - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2541
+# Channel table for Pedro R�gis - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2541
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Pianco b/isdb-t/br-pb-Pianco
new file mode 100644
index 00000000..a30a4b34
--- /dev/null
+++ b/isdb-t/br-pb-Pianco
@@ -0,0 +1,32 @@
+# Channel table for Pianc� - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2564
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Piloezinhos b/isdb-t/br-pb-Piloezinhos
index 9437259e..bdf43d5c 100644
--- a/isdb-t/br-pb-Piloezinhos
+++ b/isdb-t/br-pb-Piloezinhos
@@ -1,5 +1,5 @@
-# Channel table for Pilõezinhos - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2556
+# Channel table for Pil�ezinhos - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2556
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Pirpirituba b/isdb-t/br-pb-Pirpirituba
index de7cf5af..e54cbcce 100644
--- a/isdb-t/br-pb-Pirpirituba
+++ b/isdb-t/br-pb-Pirpirituba
@@ -1,5 +1,5 @@
 # Channel table for Pirpirituba - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2790
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2790
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Pitimbu b/isdb-t/br-pb-Pitimbu
index 144ec168..d6ef5a96 100644
--- a/isdb-t/br-pb-Pitimbu
+++ b/isdb-t/br-pb-Pitimbu
@@ -1,5 +1,5 @@
 # Channel table for Pitimbu - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1786
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1786
 
 # Physical channel 19 (virtual 7.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Pocinhos b/isdb-t/br-pb-Pocinhos
index 704a0fdf..2759de63 100644
--- a/isdb-t/br-pb-Pocinhos
+++ b/isdb-t/br-pb-Pocinhos
@@ -1,5 +1,5 @@
 # Channel table for Pocinhos - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/955
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=955
 
 # Physical channel 18 (virtual 18.1)
 [TV Itararé]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 23.1)
-[Rede Vida]
+# Physical channel 24 (virtual 23.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
diff --git a/isdb-t/br-pb-Pombal b/isdb-t/br-pb-Pombal
index d9617210..18a8b91a 100644
--- a/isdb-t/br-pb-Pombal
+++ b/isdb-t/br-pb-Pombal
@@ -1,5 +1,34 @@
 # Channel table for Pombal - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/956
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=956
+
+# Physical channel 19 (virtual 4.1)
+[TV Paraíba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 20.1)
 [TV Arapuan]
@@ -30,8 +59,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 43 (virtual 43.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-pb-Puxinana b/isdb-t/br-pb-Puxinana
index 8e685345..92beeef2 100644
--- a/isdb-t/br-pb-Puxinana
+++ b/isdb-t/br-pb-Puxinana
@@ -1,5 +1,5 @@
-# Channel table for Puxinanã - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3024
+# Channel table for Puxinan� - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3024
 
 # Physical channel 16 (virtual 7.1)
 [TV Manaíra]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 23.1)
-[Rede Vida]
+# Physical channel 24 (virtual 23.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
diff --git a/isdb-t/br-pb-Quixaba b/isdb-t/br-pb-Quixaba
new file mode 100644
index 00000000..7ffe13a8
--- /dev/null
+++ b/isdb-t/br-pb-Quixaba
@@ -0,0 +1,119 @@
+# Channel table for Quixaba - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4139
+
+# Physical channel 21 (virtual 29.1)
+[TV Paraíba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Arapuan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 42.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-RiachaoDoPoco b/isdb-t/br-pb-RiachaoDoPoco
index b97373ef..4e6207d2 100644
--- a/isdb-t/br-pb-RiachaoDoPoco
+++ b/isdb-t/br-pb-RiachaoDoPoco
@@ -1,5 +1,5 @@
-# Channel table for Riachão Do Poço - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3806
+# Channel table for Riach�o Do Po�o - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3806
 
 # Physical channel 16 (virtual 10.1)
 [TV Manaíra]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pb-RiachoDosCavalos b/isdb-t/br-pb-RiachoDosCavalos
index c5d8bb77..29c63dd8 100644
--- a/isdb-t/br-pb-RiachoDosCavalos
+++ b/isdb-t/br-pb-RiachoDosCavalos
@@ -1,5 +1,5 @@
 # Channel table for Riacho Dos Cavalos - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1790
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1790
 
 # Physical channel 20 (virtual 3.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-RioTinto b/isdb-t/br-pb-RioTinto
index b970f322..7b161d26 100644
--- a/isdb-t/br-pb-RioTinto
+++ b/isdb-t/br-pb-RioTinto
@@ -1,5 +1,5 @@
 # Channel table for Rio Tinto - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/948
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=948
 
 # Physical channel 19 (virtual 7.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-SantaHelena b/isdb-t/br-pb-SantaHelena
index 31181d5a..decfd1b9 100644
--- a/isdb-t/br-pb-SantaHelena
+++ b/isdb-t/br-pb-SantaHelena
@@ -1,5 +1,5 @@
 # Channel table for Santa Helena - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1849
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1849
 
 # Physical channel 19 (virtual 12.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-SantaLuzia b/isdb-t/br-pb-SantaLuzia
new file mode 100644
index 00000000..0438aa84
--- /dev/null
+++ b/isdb-t/br-pb-SantaLuzia
@@ -0,0 +1,119 @@
+# Channel table for Santa Luzia - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2602
+
+# Physical channel 21 (virtual 29.1)
+[TV Paraíba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 13.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Arapuan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 42.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-SantaRita b/isdb-t/br-pb-SantaRita
index ee132623..6f8ac695 100644
--- a/isdb-t/br-pb-SantaRita
+++ b/isdb-t/br-pb-SantaRita
@@ -1,5 +1,5 @@
 # Channel table for Santa Rita - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2538
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2538
 
 # Physical channel 15 (virtual 15.1)
 [RBI TV]
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 34.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 40.3)
-[TV Senado, TV Assembleia PB, TV Câmara]
+# Physical channel 41 (virtual 8.4)
+[TV Senado, TV Assembleia PB, Paraíba Educa, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-pb-SantaTeresinha b/isdb-t/br-pb-SantaTeresinha
index 3b727ead..52a69fa9 100644
--- a/isdb-t/br-pb-SantaTeresinha
+++ b/isdb-t/br-pb-SantaTeresinha
@@ -1,5 +1,5 @@
 # Channel table for Santa Teresinha - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2956
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2956
 
 # Physical channel 21 (virtual 29.1)
 [TV Paraíba]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 32.1)
 [TV Arapuan]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pb-SaoBentinho b/isdb-t/br-pb-SaoBentinho
new file mode 100644
index 00000000..d26944a6
--- /dev/null
+++ b/isdb-t/br-pb-SaoBentinho
@@ -0,0 +1,32 @@
+# Channel table for S�o Bentinho - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2603
+
+# Physical channel 43 (virtual 43.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-SaoFrancisco b/isdb-t/br-pb-SaoFrancisco
index 3abf2a6b..e28933be 100644
--- a/isdb-t/br-pb-SaoFrancisco
+++ b/isdb-t/br-pb-SaoFrancisco
@@ -1,5 +1,5 @@
-# Channel table for São Francisco - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2643
+# Channel table for S�o Francisco - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2643
 
 # Physical channel 21 (virtual 9.1)
 [TV Paraíba]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-SaoJoaoDoRioDoPeixe b/isdb-t/br-pb-SaoJoaoDoRioDoPeixe
index 32378874..68c47ed9 100644
--- a/isdb-t/br-pb-SaoJoaoDoRioDoPeixe
+++ b/isdb-t/br-pb-SaoJoaoDoRioDoPeixe
@@ -1,5 +1,5 @@
-# Channel table for São João Do Rio Do Peixe - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3368
+# Channel table for S�o Jo�o Do Rio Do Peixe - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3368
 
 # Physical channel 19 (virtual 12.1)
 [TV Paraíba]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Itararé]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pb-SaoJoseDaLagoaTapada b/isdb-t/br-pb-SaoJoseDaLagoaTapada
new file mode 100644
index 00000000..7ff558bf
--- /dev/null
+++ b/isdb-t/br-pb-SaoJoseDaLagoaTapada
@@ -0,0 +1,32 @@
+# Channel table for S�o Jos� Da Lagoa Tapada - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3237
+
+# Physical channel 41 (virtual 41.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-SaoJoseDePiranhas b/isdb-t/br-pb-SaoJoseDePiranhas
index 059428a4..c2135085 100644
--- a/isdb-t/br-pb-SaoJoseDePiranhas
+++ b/isdb-t/br-pb-SaoJoseDePiranhas
@@ -1,5 +1,5 @@
-# Channel table for São José De Piranhas - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2792
+# Channel table for S�o Jos� De Piranhas - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2792
 
 # Physical channel 19 (virtual 12.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-SaoJoseDoBonfim b/isdb-t/br-pb-SaoJoseDoBonfim
index 47895171..b2ff1ae7 100644
--- a/isdb-t/br-pb-SaoJoseDoBonfim
+++ b/isdb-t/br-pb-SaoJoseDoBonfim
@@ -1,5 +1,5 @@
-# Channel table for São José Do Bonfim - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1986
+# Channel table for S�o Jos� Do Bonfim - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1986
 
 # Physical channel 21 (virtual 29.1)
 [TV Paraíba]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 32.1)
 [TV Arapuan]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 42.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-SaoJoseDoSabugi b/isdb-t/br-pb-SaoJoseDoSabugi
new file mode 100644
index 00000000..4e5213a5
--- /dev/null
+++ b/isdb-t/br-pb-SaoJoseDoSabugi
@@ -0,0 +1,90 @@
+# Channel table for S�o Jos� Do Sabugi - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2788
+
+# Physical channel 21 (virtual 29.1)
+[TV Paraíba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Arapuan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-SaoMamede b/isdb-t/br-pb-SaoMamede
index 8be694a6..3c293976 100644
--- a/isdb-t/br-pb-SaoMamede
+++ b/isdb-t/br-pb-SaoMamede
@@ -1,5 +1,5 @@
-# Channel table for São Mamede - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2910
+# Channel table for S�o Mamede - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2910
 
 # Physical channel 19 (virtual 9.1)
 [TV Paraíba]
@@ -30,3 +30,90 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Arapuan]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 42.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-SaoSebastiaoDeLagoaDeRoca b/isdb-t/br-pb-SaoSebastiaoDeLagoaDeRoca
index a9191ce8..11f06692 100644
--- a/isdb-t/br-pb-SaoSebastiaoDeLagoaDeRoca
+++ b/isdb-t/br-pb-SaoSebastiaoDeLagoaDeRoca
@@ -1,11 +1,127 @@
-# Channel table for São Sebastião De Lagoa De Roça - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2688
+# Channel table for S�o Sebasti�o De Lagoa De Ro�a - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2688
 
-# Physical channel 30 (virtual 9.1)
-[TV Borborema]
+# Physical channel 18 (virtual 18.1)
+[TV Itararé]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 3.1)
+[TV Paraíba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 23.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 11.1)
+[TV Maior]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 5.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pb-Sape b/isdb-t/br-pb-Sape
index 93610c84..a11aac1c 100644
--- a/isdb-t/br-pb-Sape
+++ b/isdb-t/br-pb-Sape
@@ -1,5 +1,5 @@
-# Channel table for Sapé - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1427
+# Channel table for Sap� - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1427
 
 # Physical channel 16 (virtual 10.1)
 [TV Manaíra]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 48.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-pb-SerraRedonda b/isdb-t/br-pb-SerraRedonda
index e637d774..d9a38fbc 100644
--- a/isdb-t/br-pb-SerraRedonda
+++ b/isdb-t/br-pb-SerraRedonda
@@ -1,5 +1,5 @@
 # Channel table for Serra Redonda - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1837
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1837
 
 # Physical channel 16 (virtual 10.1)
 [TV Manaíra]
@@ -320,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 40.3)
+# Physical channel 41 (virtual 8.4)
 [TV Senado, TV Assembleia PB, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pb-Sertaozinho b/isdb-t/br-pb-Sertaozinho
index bc1592ab..1ccdfcd3 100644
--- a/isdb-t/br-pb-Sertaozinho
+++ b/isdb-t/br-pb-Sertaozinho
@@ -1,5 +1,5 @@
-# Channel table for Sertãozinho - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2644
+# Channel table for Sert�ozinho - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2644
 
 # Physical channel 20 (virtual 10.1)
 [TV Cabo Branco]
diff --git a/isdb-t/br-pb-Sobrado b/isdb-t/br-pb-Sobrado
index 37eabccf..104d1e83 100644
--- a/isdb-t/br-pb-Sobrado
+++ b/isdb-t/br-pb-Sobrado
@@ -1,5 +1,5 @@
 # Channel table for Sobrado - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3807
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3807
 
 # Physical channel 16 (virtual 10.1)
 [TV Manaíra]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 48.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-pb-Solanea b/isdb-t/br-pb-Solanea
index dd2fa227..e21b21a4 100644
--- a/isdb-t/br-pb-Solanea
+++ b/isdb-t/br-pb-Solanea
@@ -1,5 +1,5 @@
-# Channel table for Solânea - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1458
+# Channel table for Sol�nea - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1458
 
 # Physical channel 17 (virtual 12.1)
 [TV Correio]
diff --git a/isdb-t/br-pb-Sousa b/isdb-t/br-pb-Sousa
index 35a52074..39fea707 100644
--- a/isdb-t/br-pb-Sousa
+++ b/isdb-t/br-pb-Sousa
@@ -1,5 +1,5 @@
 # Channel table for Sousa - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1767
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1767
 
 # Physical channel 21 (virtual 9.1)
 [TV Paraíba]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-pb-Taperoa b/isdb-t/br-pb-Taperoa
new file mode 100644
index 00000000..e92e95a9
--- /dev/null
+++ b/isdb-t/br-pb-Taperoa
@@ -0,0 +1,32 @@
+# Channel table for Tapero� - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2464
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Teixeira b/isdb-t/br-pb-Teixeira
index 09654b72..4710d2a5 100644
--- a/isdb-t/br-pb-Teixeira
+++ b/isdb-t/br-pb-Teixeira
@@ -1,5 +1,5 @@
 # Channel table for Teixeira - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2465
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2465
 
 # Physical channel 21 (virtual 29.1)
 [TV Paraíba]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 35.1)
+# Physical channel 31 (virtual 31.1)
 [TV Tambaú]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pb-Triunfo b/isdb-t/br-pb-Triunfo
index 99e6c7e1..15ac96fb 100644
--- a/isdb-t/br-pb-Triunfo
+++ b/isdb-t/br-pb-Triunfo
@@ -1,5 +1,5 @@
 # Channel table for Triunfo - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2597
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2597
 
 # Physical channel 19 (virtual 12.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-Vieiropolis b/isdb-t/br-pb-Vieiropolis
index 7eeaf735..fbea91c3 100644
--- a/isdb-t/br-pb-Vieiropolis
+++ b/isdb-t/br-pb-Vieiropolis
@@ -1,5 +1,5 @@
-# Channel table for Vieirópolis - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3470
+# Channel table for Vieir�polis - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3470
 
 # Physical channel 21 (virtual 9.1)
 [TV Paraíba]
diff --git a/isdb-t/br-pb-VistaSerrana b/isdb-t/br-pb-VistaSerrana
new file mode 100644
index 00000000..0c10b940
--- /dev/null
+++ b/isdb-t/br-pb-VistaSerrana
@@ -0,0 +1,61 @@
+# Channel table for Vista Serrana - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2957
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 43.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pb-Zabele b/isdb-t/br-pb-Zabele
index 1b00132d..5812a78c 100644
--- a/isdb-t/br-pb-Zabele
+++ b/isdb-t/br-pb-Zabele
@@ -1,5 +1,5 @@
-# Channel table for Zabelê - PB - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3226
+# Channel table for Zabel� - PB - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3226
 
 # Physical channel 24 (virtual 24.1)
 [TV Arapuan]
diff --git a/isdb-t/br-pe-AbreuELima b/isdb-t/br-pe-AbreuELima
index 81d16e13..9dd41c1a 100644
--- a/isdb-t/br-pe-AbreuELima
+++ b/isdb-t/br-pe-AbreuELima
@@ -1,8 +1,8 @@
 # Channel table for Abreu E Lima - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3559
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3559
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 21 (virtual 22.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 7.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -407,6 +407,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 38.1)
+[Rede Gênesis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 9.1)
 [TV Clube]
 	DELIVERY_SYSTEM = ISDBT
@@ -465,8 +494,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 51.1)
-[Rede Vida]
+# Physical channel 42 (virtual 43.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 51.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -524,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-AfogadosDaIngazeira b/isdb-t/br-pe-AfogadosDaIngazeira
index d95211d3..7ff576cb 100644
--- a/isdb-t/br-pe-AfogadosDaIngazeira
+++ b/isdb-t/br-pe-AfogadosDaIngazeira
@@ -1,5 +1,5 @@
 # Channel table for Afogados Da Ingazeira - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2382
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2382
 
 # Physical channel 16 (virtual 17.1)
 [Rede Vida]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 30.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pe-Agrestina b/isdb-t/br-pe-Agrestina
index 67765327..859ccda3 100644
--- a/isdb-t/br-pe-Agrestina
+++ b/isdb-t/br-pe-Agrestina
@@ -1,5 +1,5 @@
 # Channel table for Agrestina - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2384
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2384
 
 # Physical channel 17 (virtual 8.1)
 [TV Asa Branca]
diff --git a/isdb-t/br-pe-Alagoinha b/isdb-t/br-pe-Alagoinha
index 094391a4..651a2b2d 100644
--- a/isdb-t/br-pe-Alagoinha
+++ b/isdb-t/br-pe-Alagoinha
@@ -1,5 +1,5 @@
 # Channel table for Alagoinha - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2386
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2386
 
 # Physical channel 15 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-pe-Altinho b/isdb-t/br-pe-Altinho
index dd602e49..99aede19 100644
--- a/isdb-t/br-pe-Altinho
+++ b/isdb-t/br-pe-Altinho
@@ -1,5 +1,5 @@
 # Channel table for Altinho - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2387
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2387
 
 # Physical channel 17 (virtual 8.1)
 [TV Asa Branca]
diff --git a/isdb-t/br-pe-Aracoiaba b/isdb-t/br-pe-Aracoiaba
index b6b79f6b..13eae5cd 100644
--- a/isdb-t/br-pe-Aracoiaba
+++ b/isdb-t/br-pe-Aracoiaba
@@ -1,8 +1,8 @@
-# Channel table for Araçoiaba - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3562
+# Channel table for Ara�oiaba - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3562
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 21 (virtual 22.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 51.1)
-[Rede Vida]
+# Physical channel 44 (virtual 51.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-pe-Arcoverde b/isdb-t/br-pe-Arcoverde
index f75bc07f..e32d9ee5 100644
--- a/isdb-t/br-pe-Arcoverde
+++ b/isdb-t/br-pe-Arcoverde
@@ -1,5 +1,5 @@
 # Channel table for Arcoverde - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/682
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=682
 
 # Physical channel 19 (virtual 19.1)
 [TV Asa Branca]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 22.4)
+[TV Nova, TV Nova Educação, Univesp, TV Massangana]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 26 (virtual 26.1)
 [TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pe-Bezerros b/isdb-t/br-pe-Bezerros
index fc5d2ae3..0b878814 100644
--- a/isdb-t/br-pe-Bezerros
+++ b/isdb-t/br-pe-Bezerros
@@ -1,5 +1,5 @@
 # Channel table for Bezerros - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2401
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2401
 
 # Physical channel 17 (virtual 8.1)
 [TV Asa Branca]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 9.1)
+[TV Clube]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 4.1)
 [TV Jornal Interior]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 12.3)
+[TV Pernambuco, TV Escola, Canal Saúde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pe-BomJardim b/isdb-t/br-pe-BomJardim
index 3551926f..b381092e 100644
--- a/isdb-t/br-pe-BomJardim
+++ b/isdb-t/br-pe-BomJardim
@@ -1,8 +1,8 @@
 # Channel table for Bom Jardim - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2394
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2394
 
 # Physical channel 36 (virtual 36.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-pe-Brejinho b/isdb-t/br-pe-Brejinho
new file mode 100644
index 00000000..b6469b0e
--- /dev/null
+++ b/isdb-t/br-pe-Brejinho
@@ -0,0 +1,32 @@
+# Channel table for Brejinho - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2396
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pe-BuenosAires b/isdb-t/br-pe-BuenosAires
index e83c5d6f..dc392d6e 100644
--- a/isdb-t/br-pe-BuenosAires
+++ b/isdb-t/br-pe-BuenosAires
@@ -1,5 +1,5 @@
 # Channel table for Buenos Aires - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3306
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3306
 
 # Physical channel 20 (virtual 4.1)
 [TV Tribuna]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-Buique b/isdb-t/br-pe-Buique
index afd4915b..26092c6e 100644
--- a/isdb-t/br-pe-Buique
+++ b/isdb-t/br-pe-Buique
@@ -1,5 +1,5 @@
-# Channel table for Buíque - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2389
+# Channel table for Bu�que - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2389
 
 # Physical channel 19 (virtual 18.1)
 [TV Asa Branca]
diff --git a/isdb-t/br-pe-CaboDeSantoAgostinho b/isdb-t/br-pe-CaboDeSantoAgostinho
index ea36d659..0e0ce653 100644
--- a/isdb-t/br-pe-CaboDeSantoAgostinho
+++ b/isdb-t/br-pe-CaboDeSantoAgostinho
@@ -1,8 +1,8 @@
 # Channel table for Cabo De Santo Agostinho - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3557
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3557
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 7.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-Camaragibe b/isdb-t/br-pe-Camaragibe
index 713e2d29..2b459fa2 100644
--- a/isdb-t/br-pe-Camaragibe
+++ b/isdb-t/br-pe-Camaragibe
@@ -1,8 +1,8 @@
 # Channel table for Camaragibe - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2834
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2834
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 21 (virtual 22.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 7.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -552,8 +552,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 51.1)
-[Rede Vida]
+# Physical channel 44 (virtual 51.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -640,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-Carpina b/isdb-t/br-pe-Carpina
index b7df8a0a..0de2fd12 100644
--- a/isdb-t/br-pe-Carpina
+++ b/isdb-t/br-pe-Carpina
@@ -1,8 +1,8 @@
 # Channel table for Carpina - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3643
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3643
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
diff --git a/isdb-t/br-pe-Caruaru b/isdb-t/br-pe-Caruaru
index 66077e45..f46ced36 100644
--- a/isdb-t/br-pe-Caruaru
+++ b/isdb-t/br-pe-Caruaru
@@ -1,8 +1,8 @@
 # Channel table for Caruaru - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/169
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=169
 
-# Physical channel 15 (virtual 48.1)
-[Rede Vida]
+# Physical channel 15 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,8 +59,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 31.1)
-[TV Nova]
+# Physical channel 22 (virtual 22.5)
+[TV Câmara, TV Câmara Municipal, TV ALEPE, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 31.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 12.1)
-[TV Pernambuco]
+# Physical channel 45 (virtual 12.3)
+[TV Pernambuco, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 51.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-pe-ChaGrande b/isdb-t/br-pe-ChaGrande
index 1b5ec67c..00257c0d 100644
--- a/isdb-t/br-pe-ChaGrande
+++ b/isdb-t/br-pe-ChaGrande
@@ -1,8 +1,8 @@
-# Channel table for Chã Grande - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2493
+# Channel table for Ch� Grande - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2493
 
 # Physical channel 36 (virtual 36.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-pe-Condado b/isdb-t/br-pe-Condado
index 2d5d9908..51c0cbb4 100644
--- a/isdb-t/br-pe-Condado
+++ b/isdb-t/br-pe-Condado
@@ -1,5 +1,5 @@
 # Channel table for Condado - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3552
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3552
 
 # Physical channel 16 (virtual 10.1)
 [TV Manaíra]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pe-Cumaru b/isdb-t/br-pe-Cumaru
index 7d392a49..11f0d1eb 100644
--- a/isdb-t/br-pe-Cumaru
+++ b/isdb-t/br-pe-Cumaru
@@ -1,5 +1,5 @@
 # Channel table for Cumaru - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1392
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1392
 
 # Physical channel 15 (virtual 48.1)
 [Rede Vida]
diff --git a/isdb-t/br-pe-Escada b/isdb-t/br-pe-Escada
index 6a70719d..e45b0612 100644
--- a/isdb-t/br-pe-Escada
+++ b/isdb-t/br-pe-Escada
@@ -1,8 +1,8 @@
 # Channel table for Escada - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3397
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3397
 
 # Physical channel 23 (virtual 23.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-pe-FeiraNova b/isdb-t/br-pe-FeiraNova
index 75525dd5..4c94677c 100644
--- a/isdb-t/br-pe-FeiraNova
+++ b/isdb-t/br-pe-FeiraNova
@@ -1,8 +1,8 @@
 # Channel table for Feira Nova - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3892
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3892
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pe-FernandoDeNoronha b/isdb-t/br-pe-FernandoDeNoronha
index 82e11531..71532774 100644
--- a/isdb-t/br-pe-FernandoDeNoronha
+++ b/isdb-t/br-pe-FernandoDeNoronha
@@ -1,8 +1,8 @@
 # Channel table for Fernando De Noronha - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/180
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=180
 
 # Physical channel 36 (virtual 2.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-pe-Floresta b/isdb-t/br-pe-Floresta
index 26b13c8e..8bb8a0d3 100644
--- a/isdb-t/br-pe-Floresta
+++ b/isdb-t/br-pe-Floresta
@@ -1,5 +1,5 @@
 # Channel table for Floresta - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/683
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=683
 
 # Physical channel 15 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-pe-Garanhuns b/isdb-t/br-pe-Garanhuns
index 628c0d01..d4bb8464 100644
--- a/isdb-t/br-pe-Garanhuns
+++ b/isdb-t/br-pe-Garanhuns
@@ -1,7 +1,36 @@
 # Channel table for Garanhuns - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/965
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=965
 
-# Physical channel 15 (virtual 14)
+# Physical channel 11
+[TV Jornal Interior]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 201142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 15 (virtual 14.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 25.1)
-[TV Nova]
+# Physical channel 26 (virtual 25.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
diff --git a/isdb-t/br-pe-GloriaDoGoita b/isdb-t/br-pe-GloriaDoGoita
index 19fc5954..4485c44f 100644
--- a/isdb-t/br-pe-GloriaDoGoita
+++ b/isdb-t/br-pe-GloriaDoGoita
@@ -1,5 +1,5 @@
-# Channel table for Glória Do Goitá - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3876
+# Channel table for Gl�ria Do Goit� - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3876
 
 # Physical channel 17 (virtual 17.1)
 [Record News]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-pe-Goiana b/isdb-t/br-pe-Goiana
index f5a3bde5..cba8ee6f 100644
--- a/isdb-t/br-pe-Goiana
+++ b/isdb-t/br-pe-Goiana
@@ -1,8 +1,8 @@
 # Channel table for Goiana - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3512
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3512
 
 # Physical channel 23 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-pe-Gravata b/isdb-t/br-pe-Gravata
new file mode 100644
index 00000000..c062628f
--- /dev/null
+++ b/isdb-t/br-pe-Gravata
@@ -0,0 +1,148 @@
+# Channel table for Gravat� - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=243
+
+# Physical channel 15 (virtual 48.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 8.1)
+[TV Asa Branca]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 31.4)
+[TV Nova, TV Nova Educação, Univesp, TV Massangana]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 4.1)
+[TV Jornal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 12.3)
+[TV Pernambuco, TV Escola, Canal Saúde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pe-Igarassu b/isdb-t/br-pe-Igarassu
index e99b8dd7..bbd24405 100644
--- a/isdb-t/br-pe-Igarassu
+++ b/isdb-t/br-pe-Igarassu
@@ -1,8 +1,8 @@
 # Channel table for Igarassu - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3560
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3560
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 21 (virtual 22.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,8 +117,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 24 (virtual 7.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -175,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -320,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 51.1)
-[Rede Vida]
+# Physical channel 44 (virtual 51.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-pe-IlhaDeItamaraca b/isdb-t/br-pe-IlhaDeItamaraca
index d1494a17..bee71b62 100644
--- a/isdb-t/br-pe-IlhaDeItamaraca
+++ b/isdb-t/br-pe-IlhaDeItamaraca
@@ -1,8 +1,8 @@
-# Channel table for Ilha De Itamaracá - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3558
+# Channel table for Ilha De Itamarac� - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3558
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 21 (virtual 22.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 51.1)
-[Rede Vida]
+# Physical channel 44 (virtual 51.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-Ipojuca b/isdb-t/br-pe-Ipojuca
index c25a0ab0..1c603535 100644
--- a/isdb-t/br-pe-Ipojuca
+++ b/isdb-t/br-pe-Ipojuca
@@ -1,8 +1,8 @@
 # Channel table for Ipojuca - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3554
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3554
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 41.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -262,3 +262,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 44.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pe-Itambe b/isdb-t/br-pe-Itambe
index 766a803e..cabf3d86 100644
--- a/isdb-t/br-pe-Itambe
+++ b/isdb-t/br-pe-Itambe
@@ -1,8 +1,8 @@
-# Channel table for Itambé - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3376
+# Channel table for Itamb� - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3376
 
 # Physical channel 36 (virtual 46.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-pe-Itapissuma b/isdb-t/br-pe-Itapissuma
index e486110d..03b7e49e 100644
--- a/isdb-t/br-pe-Itapissuma
+++ b/isdb-t/br-pe-Itapissuma
@@ -1,8 +1,8 @@
 # Channel table for Itapissuma - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3561
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3561
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 21 (virtual 22.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,8 +117,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 24 (virtual 7.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -175,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -320,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 51.1)
-[Rede Vida]
+# Physical channel 44 (virtual 51.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-pe-JaboataoDosGuararapes b/isdb-t/br-pe-JaboataoDosGuararapes
index 4f0190e4..af27cfcb 100644
--- a/isdb-t/br-pe-JaboataoDosGuararapes
+++ b/isdb-t/br-pe-JaboataoDosGuararapes
@@ -1,8 +1,8 @@
-# Channel table for Jaboatão Dos Guararapes - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3556
+# Channel table for Jaboat�o Dos Guararapes - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3556
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 7.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -582,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-Jupi b/isdb-t/br-pe-Jupi
index 25e095a5..5e59297e 100644
--- a/isdb-t/br-pe-Jupi
+++ b/isdb-t/br-pe-Jupi
@@ -1,5 +1,5 @@
 # Channel table for Jupi - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1420
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1420
 
 # Physical channel 19 (virtual 2.1)
 [TV Asa Branca]
diff --git a/isdb-t/br-pe-Lajedo b/isdb-t/br-pe-Lajedo
index 8bad7df9..7e8960ee 100644
--- a/isdb-t/br-pe-Lajedo
+++ b/isdb-t/br-pe-Lajedo
@@ -1,5 +1,5 @@
 # Channel table for Lajedo - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3713
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3713
 
 # Physical channel 19 (virtual 2.1)
 [TV Asa Branca]
diff --git a/isdb-t/br-pe-Limoeiro b/isdb-t/br-pe-Limoeiro
index b18e743d..821b5e10 100644
--- a/isdb-t/br-pe-Limoeiro
+++ b/isdb-t/br-pe-Limoeiro
@@ -1,8 +1,8 @@
 # Channel table for Limoeiro - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/708
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=708
 
 # Physical channel 36 (virtual 42.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-pe-Macaparana b/isdb-t/br-pe-Macaparana
index f9053c49..7f50ecd3 100644
--- a/isdb-t/br-pe-Macaparana
+++ b/isdb-t/br-pe-Macaparana
@@ -1,8 +1,8 @@
 # Channel table for Macaparana - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2367
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2367
 
 # Physical channel 12 (virtual 12.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 207142857
diff --git a/isdb-t/br-pe-Moreno b/isdb-t/br-pe-Moreno
index d3671633..24483adc 100644
--- a/isdb-t/br-pe-Moreno
+++ b/isdb-t/br-pe-Moreno
@@ -1,8 +1,8 @@
 # Channel table for Moreno - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3107
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3107
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 7.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[Rede TV! Recife]
+[Universo EADTV, Rede TV! Recife]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -436,35 +436,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 51.1)
-[Rede Vida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 45 (virtual 46.1)
 [TV Pernambuco]
 	DELIVERY_SYSTEM = ISDBT
@@ -524,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-NazareDaMata b/isdb-t/br-pe-NazareDaMata
index 08308b37..01c51f5a 100644
--- a/isdb-t/br-pe-NazareDaMata
+++ b/isdb-t/br-pe-NazareDaMata
@@ -1,8 +1,8 @@
-# Channel table for Nazaré Da Mata - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3648
+# Channel table for Nazar� Da Mata - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3648
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pe-Olinda b/isdb-t/br-pe-Olinda
index cc750dac..eca5e868 100644
--- a/isdb-t/br-pe-Olinda
+++ b/isdb-t/br-pe-Olinda
@@ -1,8 +1,8 @@
 # Channel table for Olinda - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3555
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3555
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 21 (virtual 22.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 22 (virtual 22.4)
+[TV Nova Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 23 (virtual 23.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
@@ -147,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 7.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -233,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.5)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -436,6 +465,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 38.1)
+[Rede Gênesis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 9.1)
 [TV Clube]
 	DELIVERY_SYSTEM = ISDBT
@@ -495,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -581,8 +639,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[TV Pernambuco]
+# Physical channel 45 (virtual 46.3)
+[TV Pernambuco, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -640,7 +698,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-Orobo b/isdb-t/br-pe-Orobo
index 2d1649c0..edb3b847 100644
--- a/isdb-t/br-pe-Orobo
+++ b/isdb-t/br-pe-Orobo
@@ -1,8 +1,8 @@
-# Channel table for Orobó - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3307
+# Channel table for Orob� - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3307
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-pe-Paulista b/isdb-t/br-pe-Paulista
index 758f419f..28b772be 100644
--- a/isdb-t/br-pe-Paulista
+++ b/isdb-t/br-pe-Paulista
@@ -1,8 +1,8 @@
 # Channel table for Paulista - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3629
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3629
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 21 (virtual 22.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 7.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -407,6 +407,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 38.1)
+[Rede Gênesis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 9.1)
 [TV Clube]
 	DELIVERY_SYSTEM = ISDBT
@@ -465,8 +494,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 51.1)
-[Rede Vida]
+# Physical channel 42 (virtual 43.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 51.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -524,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-Pedra b/isdb-t/br-pe-Pedra
index f6d133b7..e9be79c5 100644
--- a/isdb-t/br-pe-Pedra
+++ b/isdb-t/br-pe-Pedra
@@ -1,5 +1,5 @@
 # Channel table for Pedra - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3379
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3379
 
 # Physical channel 20 (virtual 20.1)
 [TV Asa Branca]
diff --git a/isdb-t/br-pe-Pesqueira b/isdb-t/br-pe-Pesqueira
index 78413ad9..7f41afdc 100644
--- a/isdb-t/br-pe-Pesqueira
+++ b/isdb-t/br-pe-Pesqueira
@@ -1,5 +1,5 @@
 # Channel table for Pesqueira - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/963
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=963
 
 # Physical channel 15 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-pe-Petrolina b/isdb-t/br-pe-Petrolina
index 78ff872c..034d8922 100644
--- a/isdb-t/br-pe-Petrolina
+++ b/isdb-t/br-pe-Petrolina
@@ -1,8 +1,8 @@
 # Channel table for Petrolina - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/170
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=170
 
-# Physical channel 15 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 8.2)
+[TVE Bahia, Educa Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 26 (virtual 9.1)
 [TV Clube]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 38.2)
+# Physical channel 38 (virtual 38.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -262,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 34.1)
+# Physical channel 44 (virtual 30.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -349,3 +378,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 50.1)
+[TV Sul Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pe-Pombos b/isdb-t/br-pe-Pombos
index 4d718e9e..893afd3b 100644
--- a/isdb-t/br-pe-Pombos
+++ b/isdb-t/br-pe-Pombos
@@ -1,8 +1,8 @@
 # Channel table for Pombos - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3700
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3700
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 4.1)
-[TV Tribuna]
+# Physical channel 18 (virtual 18.3)
+[TV Nova, TV Nova Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 497142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 20 (virtual 4.1)
+[TV Tribuna]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-Recife b/isdb-t/br-pe-Recife
index 8f896b08..18f12f92 100644
--- a/isdb-t/br-pe-Recife
+++ b/isdb-t/br-pe-Recife
@@ -1,8 +1,8 @@
 # Channel table for Recife - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/42
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=42
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 21 (virtual 22.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 7.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.5)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -436,6 +436,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 38.1)
+[Rede Gênesis]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 9.1)
 [TV Clube]
 	DELIVERY_SYSTEM = ISDBT
@@ -495,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -552,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 51.1)
-[Rede Vida]
+# Physical channel 44 (virtual 51.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -581,8 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[TV Pernambuco]
+# Physical channel 45 (virtual 46.3)
+[TV Pernambuco, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -640,7 +669,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-RiachoDasAlmas b/isdb-t/br-pe-RiachoDasAlmas
index e3cfb7d0..5772554d 100644
--- a/isdb-t/br-pe-RiachoDasAlmas
+++ b/isdb-t/br-pe-RiachoDasAlmas
@@ -1,5 +1,5 @@
 # Channel table for Riacho Das Almas - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3778
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3778
 
 # Physical channel 15 (virtual 48.1)
 [Rede Vida]
diff --git a/isdb-t/br-pe-Salgadinho b/isdb-t/br-pe-Salgadinho
index 717a5094..bb397c9b 100644
--- a/isdb-t/br-pe-Salgadinho
+++ b/isdb-t/br-pe-Salgadinho
@@ -1,8 +1,8 @@
 # Channel table for Salgadinho - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3839
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3839
 
 # Physical channel 12 (virtual 12.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 207142857
diff --git a/isdb-t/br-pe-SantaCruzDoCapibaribe b/isdb-t/br-pe-SantaCruzDoCapibaribe
index f6d33e9d..72d11429 100644
--- a/isdb-t/br-pe-SantaCruzDoCapibaribe
+++ b/isdb-t/br-pe-SantaCruzDoCapibaribe
@@ -1,5 +1,5 @@
 # Channel table for Santa Cruz Do Capibaribe - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1078
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1078
 
 # Physical channel 19 (virtual 18.1)
 [TV Asa Branca]
diff --git a/isdb-t/br-pe-SantaTerezinha b/isdb-t/br-pe-SantaTerezinha
new file mode 100644
index 00000000..54a0a8aa
--- /dev/null
+++ b/isdb-t/br-pe-SantaTerezinha
@@ -0,0 +1,32 @@
+# Channel table for Santa Terezinha - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2374
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pe-SaoBentoDoUna b/isdb-t/br-pe-SaoBentoDoUna
index 4d0d811e..64868a9a 100644
--- a/isdb-t/br-pe-SaoBentoDoUna
+++ b/isdb-t/br-pe-SaoBentoDoUna
@@ -1,5 +1,5 @@
-# Channel table for São Bento Do Una - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3714
+# Channel table for S�o Bento Do Una - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3714
 
 # Physical channel 20 (virtual 20.1)
 [TV Asa Branca]
diff --git a/isdb-t/br-pe-SaoCaitano b/isdb-t/br-pe-SaoCaitano
index 6b1d0647..9b9f922f 100644
--- a/isdb-t/br-pe-SaoCaitano
+++ b/isdb-t/br-pe-SaoCaitano
@@ -1,5 +1,5 @@
-# Channel table for São Caitano - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3815
+# Channel table for S�o Caitano - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3815
 
 # Physical channel 15 (virtual 48.1)
 [Rede Vida]
@@ -59,8 +59,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 31.1)
-[TV Nova]
+# Physical channel 22 (virtual 22.4)
+[TV Câmara, TV Câmara Municipal, TV ALEPE, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 31.4)
+[TV Nova, TV Nova Educação, Univesp, TV Massangana]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -88,6 +117,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 29.1)
+[Rede Brasil]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 9.1)
+[TV Clube]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 4.1)
 [TV Jornal Interior]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,8 +233,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 12.1)
-[TV Pernambuco]
+# Physical channel 43 (virtual 43.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 12.3)
+[TV Pernambuco, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -175,3 +291,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 2.1)
+[TV Tribuna]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 51.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pe-SaoLourencoDaMata b/isdb-t/br-pe-SaoLourencoDaMata
index 5efc3775..1dc92968 100644
--- a/isdb-t/br-pe-SaoLourencoDaMata
+++ b/isdb-t/br-pe-SaoLourencoDaMata
@@ -1,8 +1,8 @@
-# Channel table for São Lourenço Da Mata - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2880
+# Channel table for S�o Louren�o Da Mata - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2880
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 21 (virtual 22.5)
+[TV Nova, TV Nova Educação, Rádio Nova FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 7.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 6.1)
-[Rede TV! Recife]
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado, TV Câmara Municipal Recife]
+[TV Câmara, TV ALEPE, TV Senado, TV Câmara Recife]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -553,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pe-SaoVicenteFerrer b/isdb-t/br-pe-SaoVicenteFerrer
index 57a2f6e6..7bdca2b2 100644
--- a/isdb-t/br-pe-SaoVicenteFerrer
+++ b/isdb-t/br-pe-SaoVicenteFerrer
@@ -1,8 +1,8 @@
-# Channel table for São Vicente Ferrer - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3517
+# Channel table for S�o Vicente Ferrer - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3517
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pe-SerraTalhada b/isdb-t/br-pe-SerraTalhada
index 2ec11c87..9b407b44 100644
--- a/isdb-t/br-pe-SerraTalhada
+++ b/isdb-t/br-pe-SerraTalhada
@@ -1,5 +1,5 @@
 # Channel table for Serra Talhada - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1464
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1464
 
 # Physical channel 31 (virtual 31.1)
 [TV Serra]
diff --git a/isdb-t/br-pe-Sirinhaem b/isdb-t/br-pe-Sirinhaem
index 1d05c9b8..eee9f2b1 100644
--- a/isdb-t/br-pe-Sirinhaem
+++ b/isdb-t/br-pe-Sirinhaem
@@ -1,8 +1,8 @@
-# Channel table for Sirinhaém - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3820
+# Channel table for Sirinha�m - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3820
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pe-Tamandare b/isdb-t/br-pe-Tamandare
index ba954418..09450bf3 100644
--- a/isdb-t/br-pe-Tamandare
+++ b/isdb-t/br-pe-Tamandare
@@ -1,8 +1,8 @@
-# Channel table for Tamandaré - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3791
+# Channel table for Tamandar� - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3791
 
 # Physical channel 23 (virtual 42.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-pe-TaquaritingaDoNorte b/isdb-t/br-pe-TaquaritingaDoNorte
index cbbe49f0..6cf8ae75 100644
--- a/isdb-t/br-pe-TaquaritingaDoNorte
+++ b/isdb-t/br-pe-TaquaritingaDoNorte
@@ -1,5 +1,5 @@
 # Channel table for Taquaritinga Do Norte - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2377
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2377
 
 # Physical channel 18 (virtual 18.1)
 [TV Asa Branca]
diff --git a/isdb-t/br-pe-Timbauba b/isdb-t/br-pe-Timbauba
index f14c2009..6ad0a465 100644
--- a/isdb-t/br-pe-Timbauba
+++ b/isdb-t/br-pe-Timbauba
@@ -1,8 +1,8 @@
-# Channel table for Timbaúba - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2378
+# Channel table for Timba�ba - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2378
 
 # Physical channel 23 (virtual 23.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-pe-Toritama b/isdb-t/br-pe-Toritama
new file mode 100644
index 00000000..fd6ad2e2
--- /dev/null
+++ b/isdb-t/br-pe-Toritama
@@ -0,0 +1,32 @@
+# Channel table for Toritama - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=37
+
+# Physical channel 35 (virtual 4.1)
+[TV Jornal Interior]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pe-Venturosa b/isdb-t/br-pe-Venturosa
index 9a08f251..4ec17c80 100644
--- a/isdb-t/br-pe-Venturosa
+++ b/isdb-t/br-pe-Venturosa
@@ -1,5 +1,5 @@
 # Channel table for Venturosa - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3380
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3380
 
 # Physical channel 20 (virtual 20.1)
 [TV Asa Branca]
diff --git a/isdb-t/br-pe-Vicencia b/isdb-t/br-pe-Vicencia
index 337e8372..010b16b3 100644
--- a/isdb-t/br-pe-Vicencia
+++ b/isdb-t/br-pe-Vicencia
@@ -1,8 +1,8 @@
-# Channel table for Vicência - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2380
+# Channel table for Vic�ncia - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2380
 
 # Physical channel 34 (virtual 34.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pe-VitoriaDeSantoAntao b/isdb-t/br-pe-VitoriaDeSantoAntao
index c64060fd..7209840d 100644
--- a/isdb-t/br-pe-VitoriaDeSantoAntao
+++ b/isdb-t/br-pe-VitoriaDeSantoAntao
@@ -1,8 +1,8 @@
-# Channel table for Vitória De Santo Antão - PE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/230
+# Channel table for Vit�ria De Santo Ant�o - PE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=230
 
 # Physical channel 15 (virtual 14.1)
-[Rede Estação]
+[Rede Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 18 (virtual 18.3)
+[TV Nova, TV Nova Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 20 (virtual 4.1)
 [TV Tribuna]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[TV Nova]
+# Physical channel 23 (virtual 23.1)
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[Globo Nordeste]
+# Physical channel 25 (virtual 6.2)
+[Rede TV! Recife, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV ALEPE, TV Senado]
+# Physical channel 28 (virtual 10.4)
+[TV Câmara, TV ALEPE, TV Câmara Recife, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -233,6 +262,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 32.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 33 (virtual 33.1)
 [TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
@@ -292,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[Globo Nordeste]
+[TV Globo Nordeste]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -408,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 44.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -436,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[TV Pernambuco]
+# Physical channel 45 (virtual 46.3)
+[TV Pernambuco, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -495,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pi-Altos b/isdb-t/br-pi-Altos
new file mode 100644
index 00000000..e710dd80
--- /dev/null
+++ b/isdb-t/br-pi-Altos
@@ -0,0 +1,206 @@
+# Channel table for Altos - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=371
+
+# Physical channel 20 (virtual 20.2)
+[TV Jornal, TV Vinte.2]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 7.1)
+[TV Meio Norte]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.1)
+[O Dia TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 2.1)
+[TV Antares]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 4.1)
+[TV Clube]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 32.1)
+[Rede Família]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 8.2)
+[TV Antena 10, Antena 10 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pi-BomJesus b/isdb-t/br-pi-BomJesus
index e1c89349..8d6d1826 100644
--- a/isdb-t/br-pi-BomJesus
+++ b/isdb-t/br-pi-BomJesus
@@ -1,5 +1,5 @@
 # Channel table for Bom Jesus - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1029
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1029
 
 # Physical channel 39 (virtual 12.1)
 [Rede Vida]
diff --git a/isdb-t/br-pi-CampoMaior b/isdb-t/br-pi-CampoMaior
index 791be13a..aa5f6852 100644
--- a/isdb-t/br-pi-CampoMaior
+++ b/isdb-t/br-pi-CampoMaior
@@ -1,5 +1,5 @@
 # Channel table for Campo Maior - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/717
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=717
 
 # Physical channel 39 (virtual 17.1)
 [Rede Vida]
diff --git a/isdb-t/br-pi-DemervalLobao b/isdb-t/br-pi-DemervalLobao
index 6a07e4a0..2b321b30 100644
--- a/isdb-t/br-pi-DemervalLobao
+++ b/isdb-t/br-pi-DemervalLobao
@@ -1,8 +1,8 @@
-# Channel table for Demerval Lobão - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1062
+# Channel table for Demerval Lob�o - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1062
 
-# Physical channel 20 (virtual 20.1)
-[TV Jornal Meio Norte]
+# Physical channel 20 (virtual 20.2)
+[TV Jornal, TV Vinte.2]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 45.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-pi-Floriano b/isdb-t/br-pi-Floriano
index c609872a..7fad74bb 100644
--- a/isdb-t/br-pi-Floriano
+++ b/isdb-t/br-pi-Floriano
@@ -1,5 +1,34 @@
 # Channel table for Floriano - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/468
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=468
+
+# Physical channel 12
+[TV Difusora]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 207142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 7.1)
 [TV Meio Norte]
@@ -59,3 +88,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 12.1)
+[TV Difusora]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 18.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pi-Geminiano b/isdb-t/br-pi-Geminiano
new file mode 100644
index 00000000..b9bd2758
--- /dev/null
+++ b/isdb-t/br-pi-Geminiano
@@ -0,0 +1,119 @@
+# Channel table for Geminiano - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2634
+
+# Physical channel 15 (virtual 15.1)
+[TV Pai Eterno MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 16.4)
+[TV Cidade Verde, Cidade Verde FM]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 6.1)
+[TV Meio Norte]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 39.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pi-IlhaGrande b/isdb-t/br-pi-IlhaGrande
index ee1aafc4..8d820178 100644
--- a/isdb-t/br-pi-IlhaGrande
+++ b/isdb-t/br-pi-IlhaGrande
@@ -1,5 +1,5 @@
 # Channel table for Ilha Grande - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2412
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2412
 
 # Physical channel 21 (virtual 9.1)
 [TV Meio Norte]
diff --git a/isdb-t/br-pi-JoseDeFreitas b/isdb-t/br-pi-JoseDeFreitas
index cb1fcf0a..4983af3f 100644
--- a/isdb-t/br-pi-JoseDeFreitas
+++ b/isdb-t/br-pi-JoseDeFreitas
@@ -1,5 +1,5 @@
-# Channel table for José De Freitas - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1058
+# Channel table for Jos� De Freitas - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1058
 
 # Physical channel 17 (virtual 16.1)
 [TV Assembleia PI]
diff --git a/isdb-t/br-pi-LagoaDoPiaui b/isdb-t/br-pi-LagoaDoPiaui
index 48d60985..76e6e4db 100644
--- a/isdb-t/br-pi-LagoaDoPiaui
+++ b/isdb-t/br-pi-LagoaDoPiaui
@@ -1,8 +1,8 @@
-# Channel table for Lagoa Do Piauí - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3229
+# Channel table for Lagoa Do Piau� - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3229
 
-# Physical channel 20 (virtual 20.1)
-[TV Jornal Meio Norte]
+# Physical channel 20 (virtual 20.2)
+[TV Jornal, TV Vinte.2]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 26 (virtual 4.1)
+[TV Clube]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 5.1)
 [TV Cidade Verde]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,3 +146,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 10.1)
+[TV Antena 10]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pi-LuisCorreia b/isdb-t/br-pi-LuisCorreia
index 11c9eb1c..aadbdcfc 100644
--- a/isdb-t/br-pi-LuisCorreia
+++ b/isdb-t/br-pi-LuisCorreia
@@ -1,5 +1,5 @@
-# Channel table for Luís Correia - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/975
+# Channel table for Lu�s Correia - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=975
 
 # Physical channel 21 (virtual 9.1)
 [TV Meio Norte]
diff --git a/isdb-t/br-pi-Nazaria b/isdb-t/br-pi-Nazaria
index 4f2dca56..1f998dc2 100644
--- a/isdb-t/br-pi-Nazaria
+++ b/isdb-t/br-pi-Nazaria
@@ -1,8 +1,8 @@
-# Channel table for Nazária - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1772
+# Channel table for Naz�ria - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1772
 
-# Physical channel 20 (virtual 20.1)
-[TV Jornal Meio Norte]
+# Physical channel 20 (virtual 20.2)
+[TV Jornal, TV Vinte.2]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-to-Duere b/isdb-t/br-pi-Oeiras
index ef34079d..82da15b0 100644
--- a/isdb-t/br-to-Duere
+++ b/isdb-t/br-pi-Oeiras
@@ -1,8 +1,8 @@
-# Channel table for Duerê - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/620
+# Channel table for Oeiras - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=542
 
-# Physical channel 23 (virtual 11.1)
-[TV Anhanguera Gurupi]
+# Physical channel 23 (virtual 5.1)
+[TV Meio Norte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-pi-Parnaiba b/isdb-t/br-pi-Parnaiba
index 35a08be5..babd1094 100644
--- a/isdb-t/br-pi-Parnaiba
+++ b/isdb-t/br-pi-Parnaiba
@@ -1,5 +1,5 @@
-# Channel table for Parnaíba - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/101
+# Channel table for Parna�ba - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=101
 
 # Physical channel 21 (virtual 9.1)
 [TV Meio Norte]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 7.1)
-[TV Antena 10]
+# Physical channel 34 (virtual 7.2)
+[TV Antena 10, Antena 10 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 16.1)
-[Rede Vida]
+# Physical channel 39 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pi-PedroIi b/isdb-t/br-pi-PedroIi
new file mode 100644
index 00000000..f67e188e
--- /dev/null
+++ b/isdb-t/br-pi-PedroIi
@@ -0,0 +1,32 @@
+# Channel table for Pedro Ii - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=194
+
+# Physical channel 29 (virtual 29.2)
+[TV Cidade Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pi-Picos b/isdb-t/br-pi-Picos
index ef4cada0..53df4fca 100644
--- a/isdb-t/br-pi-Picos
+++ b/isdb-t/br-pi-Picos
@@ -1,8 +1,8 @@
 # Channel table for Picos - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/153
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=153
 
 # Physical channel 15 (virtual 15.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 16.4)
+[TV Cidade Verde, Cidade Verde FM]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 6.1)
 [TV Meio Norte]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 20.1)
-[Rede Vida]
+# Physical channel 39 (virtual 39.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pi-Piripiri b/isdb-t/br-pi-Piripiri
index 013bcce7..f2658754 100644
--- a/isdb-t/br-pi-Piripiri
+++ b/isdb-t/br-pi-Piripiri
@@ -1,5 +1,5 @@
 # Channel table for Piripiri - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/191
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=191
 
 # Physical channel 18 (virtual 18.1)
 [TV Cidade Verde]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 12.1)
+[TV Antena 10, Antena 10 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pi-SaoRaimundoNonato b/isdb-t/br-pi-SaoRaimundoNonato
index 4fc7bf56..21d20845 100644
--- a/isdb-t/br-pi-SaoRaimundoNonato
+++ b/isdb-t/br-pi-SaoRaimundoNonato
@@ -1,5 +1,5 @@
-# Channel table for São Raimundo Nonato - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/942
+# Channel table for S�o Raimundo Nonato - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=942
 
 # Physical channel 39 (virtual 12.1)
 [Rede Vida]
diff --git a/isdb-t/br-pi-Sussuapara b/isdb-t/br-pi-Sussuapara
new file mode 100644
index 00000000..c825ae41
--- /dev/null
+++ b/isdb-t/br-pi-Sussuapara
@@ -0,0 +1,119 @@
+# Channel table for Sussuapara - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4123
+
+# Physical channel 15 (virtual 15.1)
+[TV Pai Eterno MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 16.4)
+[TV Cidade Verde, Cidade Verde FM]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 6.1)
+[TV Meio Norte]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 39.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pi-Teresina b/isdb-t/br-pi-Teresina
index b79fd003..c1d7842f 100644
--- a/isdb-t/br-pi-Teresina
+++ b/isdb-t/br-pi-Teresina
@@ -1,5 +1,5 @@
 # Channel table for Teresina - PI - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/5
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=5
 
 # Physical channel 17 (virtual 16.1)
 [TV Assembleia PI]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 20.1)
-[TV Jornal Meio Norte]
+# Physical channel 20 (virtual 20.2)
+[TV Jornal, TV Vinte.2]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Clube]
+# Physical channel 26 (virtual 4.2)
+[TV Clube, Aulas SEMEC]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[TV Cidade Verde]
+# Physical channel 28 (virtual 5.2)
+[TV Cidade Verde, Cidade Verde FM]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 10.1)
-[TV Antena 10]
+# Physical channel 34 (virtual 10.2)
+[TV Antena 10, Antena 10 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 40.1)
-[Rede Vida]
+# Physical channel 39 (virtual 40.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 45.1)
-[RCI]
+# Physical channel 44 (virtual 44.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -494,64 +494,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[Boa Vontade TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 49 (virtual 49.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 51 (virtual 50.1)
 [Rede Século 21]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pi-Uniao b/isdb-t/br-pi-Uniao
new file mode 100644
index 00000000..ca022b92
--- /dev/null
+++ b/isdb-t/br-pi-Uniao
@@ -0,0 +1,32 @@
+# Channel table for Uni�o - PI - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1024
+
+# Physical channel 33 (virtual 13.2)
+[TV Antena 10, Antena 10 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Abatia b/isdb-t/br-pr-Abatia
new file mode 100644
index 00000000..5b85acdb
--- /dev/null
+++ b/isdb-t/br-pr-Abatia
@@ -0,0 +1,32 @@
+# Channel table for Abati� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4122
+
+# Physical channel 48 (virtual 14.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Adrianopolis b/isdb-t/br-pr-Adrianopolis
index 6dcde69f..6299daed 100644
--- a/isdb-t/br-pr-Adrianopolis
+++ b/isdb-t/br-pr-Adrianopolis
@@ -1,5 +1,5 @@
-# Channel table for Adrianópolis - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1677
+# Channel table for Adrian�polis - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1677
 
 # Physical channel 41 (virtual 12.1)
 [RPC TV]
diff --git a/isdb-t/br-pr-AlmiranteTamandare b/isdb-t/br-pr-AlmiranteTamandare
index 66310957..987b7625 100644
--- a/isdb-t/br-pr-AlmiranteTamandare
+++ b/isdb-t/br-pr-AlmiranteTamandare
@@ -1,8 +1,8 @@
-# Channel table for Almirante Tamandaré - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3730
+# Channel table for Almirante Tamandar� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3730
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 10.4)
+[TV Senado, TV Assembleia PR, Canal em teste, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -262,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 55.1)
+# Physical channel 31 (virtual 31.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[RIT]
+[RIT Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -582,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 57.1)
-[Top TV]
+[Top TV Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-pr-AltoParana b/isdb-t/br-pr-AltoParana
index 85e7d993..741f122c 100644
--- a/isdb-t/br-pr-AltoParana
+++ b/isdb-t/br-pr-AltoParana
@@ -1,7 +1,7 @@
-# Channel table for Alto Paraná - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1678
+# Channel table for Alto Paran� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1678
 
-# Physical channel 18 (virtual 20.1)
+# Physical channel 18 (virtual 18.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[RCI]
+# Physical channel 49 (virtual 49.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pr-AltoPiquiri b/isdb-t/br-pr-AltoPiquiri
index 4dd5cda3..ae9cf1a6 100644
--- a/isdb-t/br-pr-AltoPiquiri
+++ b/isdb-t/br-pr-AltoPiquiri
@@ -1,7 +1,36 @@
 # Channel table for Alto Piquiri - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1679
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1679
 
-# Physical channel 19 (virtual 20.1)
+# Physical channel 14 (virtual 26.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 19 (virtual 19.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-Amapora b/isdb-t/br-pr-Amapora
index af164c5c..7a6cd1aa 100644
--- a/isdb-t/br-pr-Amapora
+++ b/isdb-t/br-pr-Amapora
@@ -1,5 +1,5 @@
-# Channel table for Amaporã - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3529
+# Channel table for Amapor� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3529
 
 # Physical channel 34 (virtual 13.1)
 [RICTV Maringá]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 10.1)
-[Rede Massa Tibagi]
+# Physical channel 39 (virtual 10.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pr-Antonina b/isdb-t/br-pr-Antonina
index a176ea39..9823bcbd 100644
--- a/isdb-t/br-pr-Antonina
+++ b/isdb-t/br-pr-Antonina
@@ -1,8 +1,8 @@
 # Channel table for Antonina - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3247
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3247
 
 # Physical channel 15 (virtual 7.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 27.1)
+# Physical channel 19 (virtual 19.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 45.1)
-[Rede Massa Iguaçu]
+# Physical channel 34 (virtual 38.3)
+[Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 45.2)
+[Rede Massa Iguaçu, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pr-Apucarana b/isdb-t/br-pr-Apucarana
index 80547075..2c91382b 100644
--- a/isdb-t/br-pr-Apucarana
+++ b/isdb-t/br-pr-Apucarana
@@ -1,8 +1,8 @@
 # Channel table for Apucarana - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/319
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=319
 
-# Physical channel 19 (virtual 20.1)
-[Rede Vida]
+# Physical channel 19 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 20.1)
+[Rede Século 21]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 31 (virtual 16.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[Rede Massa Tibagi, RCI]
+[Rede Massa Tibagi, TV Escola Curitiba, Aulas Apucarana, TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -175,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 9.1)
-[RICTV Londrina]
+# Physical channel 49 (virtual 9.4)
+[RICTV Londrina, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pr-Arapongas b/isdb-t/br-pr-Arapongas
index f410ed05..6b8586a3 100644
--- a/isdb-t/br-pr-Arapongas
+++ b/isdb-t/br-pr-Arapongas
@@ -1,5 +1,5 @@
 # Channel table for Arapongas - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/317
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=317
 
 # Physical channel 15 (virtual 21.1)
 [Canal 21]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 24.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 44.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -407,6 +407,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 34.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 46.1)
 [TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
@@ -437,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 2.1)
-[Tenda TV]
+[Rede TV! PR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-pr-Arapoti b/isdb-t/br-pr-Arapoti
new file mode 100644
index 00000000..cd3bafce
--- /dev/null
+++ b/isdb-t/br-pr-Arapoti
@@ -0,0 +1,32 @@
+# Channel table for Arapoti - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1444
+
+# Physical channel 22 (virtual 22.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Araruna b/isdb-t/br-pr-Araruna
index b8276602..74480b46 100644
--- a/isdb-t/br-pr-Araruna
+++ b/isdb-t/br-pr-Araruna
@@ -1,5 +1,5 @@
 # Channel table for Araruna - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1765
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1765
 
 # Physical channel 21 (virtual 11.1)
 [Rede Massa Tibagi]
diff --git a/isdb-t/br-pr-Araucaria b/isdb-t/br-pr-Araucaria
index dafd8ad5..92e85121 100644
--- a/isdb-t/br-pr-Araucaria
+++ b/isdb-t/br-pr-Araucaria
@@ -1,8 +1,8 @@
-# Channel table for Araucária - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3731
+# Channel table for Arauc�ria - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3731
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 10.4)
+[TV Senado, TV Assembleia PR, Canal em teste, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 24.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -262,8 +291,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[Rede Super]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 32.1)
-[RIT]
+[RIT Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -552,6 +610,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 57.1)
+[Top TV Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 46.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
@@ -581,7 +668,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 23.1)
+# Physical channel 49 (virtual 15.1)
 [TV Araucária]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -610,8 +697,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 50.1)
-[TV Mundial]
+# Physical channel 50 (virtual 31.1)
+[TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-pr-AssisChateaubriand b/isdb-t/br-pr-AssisChateaubriand
index c7e8ef78..fa592cff 100644
--- a/isdb-t/br-pr-AssisChateaubriand
+++ b/isdb-t/br-pr-AssisChateaubriand
@@ -1,5 +1,5 @@
 # Channel table for Assis Chateaubriand - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/183
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=183
 
 # Physical channel 17 (virtual 17.1)
 [TV Novo Tempo]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 27.1)
-[Rede Massa Naipi]
+# Physical channel 23 (virtual 27.2)
+[Rede Massa Naipi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 56.1)
-[RICTV Oeste]
+# Physical channel 34 (virtual 56.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pr-BalsaNova b/isdb-t/br-pr-BalsaNova
index 215c9d61..4caf8ffd 100644
--- a/isdb-t/br-pr-BalsaNova
+++ b/isdb-t/br-pr-BalsaNova
@@ -1,5 +1,34 @@
 # Channel table for Balsa Nova - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4029
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4029
+
+# Physical channel 15 (virtual 14.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 23.1)
 [RIT]
@@ -30,3 +59,148 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 24.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 7.1)
+[RICTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 2.1)
+[Band Curitiba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 4.1)
+[Rede Massa Iguaçu]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 6.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Bandeirantes b/isdb-t/br-pr-Bandeirantes
index ccfe40b1..9a545471 100644
--- a/isdb-t/br-pr-Bandeirantes
+++ b/isdb-t/br-pr-Bandeirantes
@@ -1,5 +1,5 @@
 # Channel table for Bandeirantes - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1702
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1702
 
 # Physical channel 29 (virtual 10.1)
 [RPC Londrina]
diff --git a/isdb-t/br-pr-BarbosaFerraz b/isdb-t/br-pr-BarbosaFerraz
index 82fa174c..2205857f 100644
--- a/isdb-t/br-pr-BarbosaFerraz
+++ b/isdb-t/br-pr-BarbosaFerraz
@@ -1,5 +1,5 @@
 # Channel table for Barbosa Ferraz - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/538
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=538
 
 # Physical channel 29 (virtual 29.1)
 [RPC Maringá]
diff --git a/isdb-t/br-pr-BelaVistaDoParaiso b/isdb-t/br-pr-BelaVistaDoParaiso
index 0262a778..9abd9df7 100644
--- a/isdb-t/br-pr-BelaVistaDoParaiso
+++ b/isdb-t/br-pr-BelaVistaDoParaiso
@@ -1,5 +1,5 @@
-# Channel table for Bela Vista Do Paraíso - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3850
+# Channel table for Bela Vista Do Para�so - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3850
 
 # Physical channel 15 (virtual 21.1)
 [Canal 21]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 24.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 44.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -262,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.1)
+# Physical channel 28 (virtual 36.1)
 [RTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -465,6 +465,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 2.1)
+[Rede TV! PR]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 7.1)
 [CNT Tropical]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-Bituruna b/isdb-t/br-pr-Bituruna
index 417f14d1..23dc9920 100644
--- a/isdb-t/br-pr-Bituruna
+++ b/isdb-t/br-pr-Bituruna
@@ -1,5 +1,5 @@
 # Channel table for Bituruna - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2977
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2977
 
 # Physical channel 43 (virtual 29.1)
 [CNT]
diff --git a/isdb-t/br-pr-BocaiuvaDoSul b/isdb-t/br-pr-BocaiuvaDoSul
index 5056166e..282fbb67 100644
--- a/isdb-t/br-pr-BocaiuvaDoSul
+++ b/isdb-t/br-pr-BocaiuvaDoSul
@@ -1,5 +1,5 @@
-# Channel table for Bocaiúva Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3894
+# Channel table for Bocai�va Do Sul - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3894
 
 # Physical channel 42 (virtual 42.1)
 [RPC TV]
diff --git a/isdb-t/br-pr-Borrazopolis b/isdb-t/br-pr-Borrazopolis
index b37a8e37..3d1fde61 100644
--- a/isdb-t/br-pr-Borrazopolis
+++ b/isdb-t/br-pr-Borrazopolis
@@ -1,5 +1,5 @@
-# Channel table for Borrazópolis - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4031
+# Channel table for Borraz�polis - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4031
 
 # Physical channel 36 (virtual 36.1)
 [TV Cachoeira]
diff --git a/isdb-t/br-pr-Cafelandia b/isdb-t/br-pr-Cafelandia
index 3cd34505..3310695b 100644
--- a/isdb-t/br-pr-Cafelandia
+++ b/isdb-t/br-pr-Cafelandia
@@ -1,7 +1,7 @@
-# Channel table for Cafelândia - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/736
+# Channel table for Cafel�ndia - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=736
 
-# Physical channel 16 (virtual 14.1)
+# Physical channel 16 (virtual 16.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-Cambe b/isdb-t/br-pr-Cambe
index 16f1ea58..d042f3f3 100644
--- a/isdb-t/br-pr-Cambe
+++ b/isdb-t/br-pr-Cambe
@@ -1,5 +1,34 @@
-# Channel table for Cambé - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/292
+# Channel table for Camb� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=292
+
+# Physical channel 17 (virtual 17.1)
+[Tenda TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.1)
 [Rede Vida]
@@ -30,7 +59,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.2)
+# Physical channel 20 (virtual 20.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 22.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 5.1)
-[Rede Massa Cidade]
+# Physical channel 23 (virtual 5.3)
+[Rede Massa Cidade, TV Escola Curitiba, Aula Londrina]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -89,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 24.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -147,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 44.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -320,6 +378,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 38.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 11.1)
 [Rede Massa Tibagi]
 	DELIVERY_SYSTEM = ISDBT
@@ -407,11 +494,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 7.1)
-[CNT Tropical]
+# Physical channel 46 (virtual 2.1)
+[Rede TV! PR]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 665142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -436,11 +523,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 9.1)
-[RICTV Londrina]
+# Physical channel 47 (virtual 7.1)
+[CNT Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -465,11 +552,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 50.1)
-[Boa Vontade TV]
+# Physical channel 49 (virtual 9.4)
+[RICTV Londrina, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 689142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pr-CampinaGrandeDoSul b/isdb-t/br-pr-CampinaGrandeDoSul
index efcd4f8d..94d9cd07 100644
--- a/isdb-t/br-pr-CampinaGrandeDoSul
+++ b/isdb-t/br-pr-CampinaGrandeDoSul
@@ -1,8 +1,8 @@
 # Channel table for Campina Grande Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3734
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3734
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 55.1)
+# Physical channel 31 (virtual 31.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[RIT]
+[RIT Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 57.1)
-[Top TV]
+[Top TV Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-pr-CampoLargo b/isdb-t/br-pr-CampoLargo
index 082e7055..76877eb9 100644
--- a/isdb-t/br-pr-CampoLargo
+++ b/isdb-t/br-pr-CampoLargo
@@ -1,8 +1,8 @@
 # Channel table for Campo Largo - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3015
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3015
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 10.4)
+[TV Senado, TV Assembleia PR, Canal em teste, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
@@ -147,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 24.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -291,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 55.1)
+# Physical channel 31 (virtual 31.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -321,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[RIT]
+[RIT Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -611,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 57.1)
-[Top TV]
+[Top TV Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -668,7 +697,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 23.1)
+# Physical channel 49 (virtual 15.1)
 [TV Araucária]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-CampoMourao b/isdb-t/br-pr-CampoMourao
index 9d6cde07..245f19e5 100644
--- a/isdb-t/br-pr-CampoMourao
+++ b/isdb-t/br-pr-CampoMourao
@@ -1,8 +1,8 @@
-# Channel table for Campo Mourão - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/120
+# Channel table for Campo Mour�o - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=120
 
-# Physical channel 18 (virtual 19.1)
-[Rede Vida]
+# Physical channel 18 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -30,6 +30,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 25.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 30.1)
+[TV Araucária]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 32.1)
 [TV Verdade]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 13.1)
-[RICTV Maringá]
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -88,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 15.1)
-[RCI]
+# Physical channel 36 (virtual 36.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -146,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 24.1)
-[Rede Massa Tibagi]
+# Physical channel 39 (virtual 11.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -175,6 +233,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 20.1)
+[Rede Século 21]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 43 (virtual 9.1)
 [RPC Maringá]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 12.1)
+# Physical channel 46 (virtual 15.1)
 [CNT Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-Carambei b/isdb-t/br-pr-Carambei
index 2e68512b..35c4004f 100644
--- a/isdb-t/br-pr-Carambei
+++ b/isdb-t/br-pr-Carambei
@@ -1,5 +1,5 @@
-# Channel table for Carambeí - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1617
+# Channel table for Carambe� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1617
 
 # Physical channel 14 (virtual 58.1)
 [TVE Ponta Grossa]
diff --git a/isdb-t/br-pr-Cascavel b/isdb-t/br-pr-Cascavel
index 59313485..820d76fc 100644
--- a/isdb-t/br-pr-Cascavel
+++ b/isdb-t/br-pr-Cascavel
@@ -1,8 +1,8 @@
 # Channel table for Cascavel - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/66
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=66
 
-# Physical channel 16 (virtual 14.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 20.1)
-[CATVE]
+# Physical channel 17 (virtual 24.1)
+[Rede TV! PR]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 20.2)
+[CATVE, CATVE Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 8.1)
-[Rede Massa Naipi]
+# Physical channel 23 (virtual 8.2)
+[Rede Massa Naipi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -147,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 43.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -233,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 7.1)
-[RICTV Oeste]
+# Physical channel 38 (virtual 7.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -262,8 +291,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 57.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 41.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -291,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 34.1)
-[TV Aparecida]
+# Physical channel 43 (virtual 12.1)
+[Boa Vontade TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 13.1)
-[CNT Tropical]
+# Physical channel 44 (virtual 34.1)
+[TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 50.1)
-[TV Evangelizar]
+# Physical channel 45 (virtual 52.1)
+[TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 689142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -378,11 +436,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Gazeta]
+# Physical channel 46 (virtual 13.1)
+[CNT Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 665142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -407,11 +465,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 57 (virtual 57.1)
-[RIT]
+# Physical channel 50 (virtual 50.1)
+[TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 731142857
+	FREQUENCY = 689142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pr-Castro b/isdb-t/br-pr-Castro
index 421749b4..9e2e48cb 100644
--- a/isdb-t/br-pr-Castro
+++ b/isdb-t/br-pr-Castro
@@ -1,8 +1,8 @@
 # Channel table for Castro - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/737
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=737
 
 # Physical channel 15 (virtual 15.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
-[Rede Massa Guará]
+# Physical channel 21 (virtual 21.2)
+[Rede Massa Guará, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -59,11 +59,69 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 10.1)
+# Physical channel 22 (virtual 22.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 13.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 10.1)
 [RPC Ponta Grossa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pr-CentenarioDoSul b/isdb-t/br-pr-CentenarioDoSul
index 1019c230..e1341da1 100644
--- a/isdb-t/br-pr-CentenarioDoSul
+++ b/isdb-t/br-pr-CentenarioDoSul
@@ -1,5 +1,5 @@
-# Channel table for Centenário Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1682
+# Channel table for Centen�rio Do Sul - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1682
 
 # Physical channel 22 (virtual 22.2)
 [Rede Mundial]
diff --git a/isdb-t/br-pr-CeuAzul b/isdb-t/br-pr-CeuAzul
index defb357f..9a2b34b6 100644
--- a/isdb-t/br-pr-CeuAzul
+++ b/isdb-t/br-pr-CeuAzul
@@ -1,5 +1,5 @@
-# Channel table for Céu Azul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/265
+# Channel table for C�u Azul - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=265
 
 # Physical channel 32 (virtual 10.1)
 [RPC Cascavel]
diff --git a/isdb-t/br-pr-Cianorte b/isdb-t/br-pr-Cianorte
index 2d02e487..15fa6365 100644
--- a/isdb-t/br-pr-Cianorte
+++ b/isdb-t/br-pr-Cianorte
@@ -1,8 +1,37 @@
 # Channel table for Cianorte - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/189
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=189
+
+# Physical channel 14 (virtual 17.1)
+[TV Cinturão Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -59,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 11.1)
-[Rede Massa Tibagi]
+# Physical channel 23 (virtual 11.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -117,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 6.1)
+[TV Maringá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 28.1)
 [TV UP]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 6.1)
-[TV Tarobá Cascavel]
+# Physical channel 40 (virtual 40.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 52.1)
-[RICTV Maringá]
+# Physical channel 49 (virtual 52.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pr-CidadeGaucha b/isdb-t/br-pr-CidadeGaucha
index 32ca0a87..5e129a7c 100644
--- a/isdb-t/br-pr-CidadeGaucha
+++ b/isdb-t/br-pr-CidadeGaucha
@@ -1,5 +1,5 @@
-# Channel table for Cidade Gaúcha - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3382
+# Channel table for Cidade Ga�cha - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3382
 
 # Physical channel 41 (virtual 43.1)
 [RPC Paranavaí]
diff --git a/isdb-t/br-pr-Clevelandia b/isdb-t/br-pr-Clevelandia
index 7610eb4e..32d3d1c9 100644
--- a/isdb-t/br-pr-Clevelandia
+++ b/isdb-t/br-pr-Clevelandia
@@ -1,8 +1,37 @@
-# Channel table for Clevelândia - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1683
+# Channel table for Clevel�ndia - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1683
 
-# Physical channel 20 (virtual 39.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.1)
+[RPC Foz do Iguaçu]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 39.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-pr-Colombo b/isdb-t/br-pr-Colombo
index 172dcde8..03f7384b 100644
--- a/isdb-t/br-pr-Colombo
+++ b/isdb-t/br-pr-Colombo
@@ -1,8 +1,8 @@
 # Channel table for Colombo - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3062
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3062
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 10.4)
+[TV Senado, TV Assembleia PR, Canal em teste, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -262,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 55.1)
+# Physical channel 31 (virtual 31.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[RIT]
+[RIT Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -582,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 57.1)
-[Top TV]
+[Top TV Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-pr-Colorado b/isdb-t/br-pr-Colorado
index 511a7fc7..324a8c3b 100644
--- a/isdb-t/br-pr-Colorado
+++ b/isdb-t/br-pr-Colorado
@@ -1,5 +1,5 @@
 # Channel table for Colorado - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1684
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1684
 
 # Physical channel 22 (virtual 22.2)
 [TV Alvorada]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Contenda b/isdb-t/br-pr-Contenda
index cfef855c..9f091586 100644
--- a/isdb-t/br-pr-Contenda
+++ b/isdb-t/br-pr-Contenda
@@ -1,8 +1,8 @@
 # Channel table for Contenda - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3736
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3736
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,8 +88,124 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 20 (virtual 10.4)
+[TV Senado, TV Assembleia PR, Canal em teste, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 21.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 24.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -117,6 +233,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 26 (virtual 51.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 29.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 49.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
@@ -175,8 +349,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 7.1)
-[RICTV]
+# Physical channel 32 (virtual 32.1)
+[RIT Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 35.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 7.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -204,6 +436,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 9.2)
+[Paraná Turismo, TV Escola Curitiba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 38 (virtual 2.1)
 [Band Curitiba]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 4.1)
-[Rede Massa Iguaçu]
+# Physical channel 39 (virtual 4.2)
+[Rede Massa Iguaçu, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -320,6 +581,93 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 59.1)
+[TV Transamérica]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 44.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 57.1)
+[Top TV Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 46.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
@@ -349,3 +697,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 15.1)
+[TV Araucária]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Corbelia b/isdb-t/br-pr-Corbelia
index 84f78926..e4fb64f5 100644
--- a/isdb-t/br-pr-Corbelia
+++ b/isdb-t/br-pr-Corbelia
@@ -1,7 +1,36 @@
-# Channel table for Corbélia - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1381
+# Channel table for Corb�lia - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1381
 
-# Physical channel 16 (virtual 14.1)
+# Physical channel 14 (virtual 36.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 16.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-CornelioProcopio b/isdb-t/br-pr-CornelioProcopio
index d65fb16a..f697c02f 100644
--- a/isdb-t/br-pr-CornelioProcopio
+++ b/isdb-t/br-pr-CornelioProcopio
@@ -1,8 +1,8 @@
-# Channel table for Cornélio Procópio - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/318
+# Channel table for Corn�lio Proc�pio - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=318
 
 # Physical channel 14 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 28.1)
-[Rede Vida]
+# Physical channel 19 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 12.1)
-[RICTV Londrina]
+# Physical channel 34 (virtual 12.4)
+[RICTV Londrina, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 5.1)
-[Rede Massa Cidade]
+# Physical channel 39 (virtual 5.2)
+[Rede Massa Cidade, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pr-CoronelVivida b/isdb-t/br-pr-CoronelVivida
index 4a5b4df9..fa157042 100644
--- a/isdb-t/br-pr-CoronelVivida
+++ b/isdb-t/br-pr-CoronelVivida
@@ -1,5 +1,5 @@
 # Channel table for Coronel Vivida - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1752
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1752
 
 # Physical channel 27 (virtual 7.1)
 [TV Sudoeste]
diff --git a/isdb-t/br-pr-CruzeiroDoOeste b/isdb-t/br-pr-CruzeiroDoOeste
index d76109c8..3d640f40 100644
--- a/isdb-t/br-pr-CruzeiroDoOeste
+++ b/isdb-t/br-pr-CruzeiroDoOeste
@@ -1,5 +1,34 @@
 # Channel table for Cruzeiro Do Oeste - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1685
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1685
+
+# Physical channel 14 (virtual 26.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 26.1)
 [TV Novo Tempo]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 18.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -88,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 32.1)
+[Rede TV! Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 38 (virtual 6.1)
 [TV Tarobá Cascavel]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 7.1)
+[RPC Paranavaí]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 49 (virtual 11.1)
 [RICTV Maringá]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-Curitiba b/isdb-t/br-pr-Curitiba
index f6cb388f..2948a3e2 100644
--- a/isdb-t/br-pr-Curitiba
+++ b/isdb-t/br-pr-Curitiba
@@ -1,8 +1,8 @@
 # Channel table for Curitiba - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/67
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=67
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Ensina Mais, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 21.1)
-[Rede Mundial]
+# Physical channel 20 (virtual 10.4)
+[TV Senado, TV Assembleia PR, Canal em teste, TV Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[RIT]
+# Physical channel 22 (virtual 21.1)
+[Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[Rede Brasil]
+# Physical channel 23 (virtual 23.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -291,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 55.1)
+# Physical channel 31 (virtual 31.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[RIT]
+[RIT Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 7.1)
-[RICTV]
+# Physical channel 34 (virtual 7.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 9.1)
-[Paraná Turismo]
+# Physical channel 36 (virtual 9.2)
+[Paraná Turismo, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 4.1)
-[Rede Massa Iguaçu]
+# Physical channel 39 (virtual 4.2)
+[Rede Massa Iguaçu, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -611,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 57.1)
-[Top TV]
+[Top TV Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -668,32 +668,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 50.1)
-[TV Mundial]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 689142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-pr-DiamanteDoNorte b/isdb-t/br-pr-DiamanteDoNorte
index 40cd7889..dfe8b4b5 100644
--- a/isdb-t/br-pr-DiamanteDoNorte
+++ b/isdb-t/br-pr-DiamanteDoNorte
@@ -1,37 +1,8 @@
 # Channel table for Diamante Do Norte - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2069
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2069
 
-# Physical channel 19 (virtual 22.2)
-[Rede Mundial]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 21 (virtual 5.1)
-[Rede Massa Tibagi]
+# Physical channel 21 (virtual 5.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-pr-DoisVizinhos b/isdb-t/br-pr-DoisVizinhos
index ac9be732..781ee201 100644
--- a/isdb-t/br-pr-DoisVizinhos
+++ b/isdb-t/br-pr-DoisVizinhos
@@ -1,5 +1,5 @@
 # Channel table for Dois Vizinhos - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/320
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=320
 
 # Physical channel 24 (virtual 29.1)
 [TV Tarobá Cascavel]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 48.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Douradina b/isdb-t/br-pr-Douradina
new file mode 100644
index 00000000..674a9dc5
--- /dev/null
+++ b/isdb-t/br-pr-Douradina
@@ -0,0 +1,351 @@
+# Channel table for Douradina - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4329
+
+# Physical channel 16 (virtual 16.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 18.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 19 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 13.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 22.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 28.1)
+[TV UP]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 31.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 32.1)
+[Rede TV! Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 6.1)
+[TV Tarobá Cascavel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 7.1)
+[RPC Paranavaí]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 46.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 11.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Farol b/isdb-t/br-pr-Farol
index 8656da05..d32304c6 100644
--- a/isdb-t/br-pr-Farol
+++ b/isdb-t/br-pr-Farol
@@ -1,5 +1,5 @@
 # Channel table for Farol - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4008
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4008
 
 # Physical channel 41 (virtual 41.1)
 [RPC Maringá]
diff --git a/isdb-t/br-pr-FazendaRioGrande b/isdb-t/br-pr-FazendaRioGrande
index a1a03575..92c84792 100644
--- a/isdb-t/br-pr-FazendaRioGrande
+++ b/isdb-t/br-pr-FazendaRioGrande
@@ -1,8 +1,8 @@
 # Channel table for Fazenda Rio Grande - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3737
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3737
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[RIT]
+[RIT Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -552,8 +552,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 50.1)
-[TV Mundial]
+# Physical channel 50 (virtual 31.1)
+[TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-pr-FlorDaSerraDoSul b/isdb-t/br-pr-FlorDaSerraDoSul
new file mode 100644
index 00000000..2fe1fc5e
--- /dev/null
+++ b/isdb-t/br-pr-FlorDaSerraDoSul
@@ -0,0 +1,32 @@
+# Channel table for Flor Da Serra Do Sul - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1747
+
+# Physical channel 41 (virtual 11.1)
+[RPC Foz do Iguaçu]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Florestopolis b/isdb-t/br-pr-Florestopolis
index 0d1962d7..7e3c3ad4 100644
--- a/isdb-t/br-pr-Florestopolis
+++ b/isdb-t/br-pr-Florestopolis
@@ -1,5 +1,5 @@
-# Channel table for Florestópolis - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1704
+# Channel table for Florest�polis - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1704
 
 # Physical channel 19 (virtual 19.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 24.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
diff --git a/isdb-t/br-pr-FormosaDoOeste b/isdb-t/br-pr-FormosaDoOeste
index d192c462..6351ab82 100644
--- a/isdb-t/br-pr-FormosaDoOeste
+++ b/isdb-t/br-pr-FormosaDoOeste
@@ -1,5 +1,5 @@
 # Channel table for Formosa Do Oeste - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3348
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3348
 
 # Physical channel 25 (virtual 26.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-pr-FozDoIguacu b/isdb-t/br-pr-FozDoIguacu
index 3b6e23aa..d988096e 100644
--- a/isdb-t/br-pr-FozDoIguacu
+++ b/isdb-t/br-pr-FozDoIguacu
@@ -1,5 +1,5 @@
-# Channel table for Foz Do Iguaçu - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/81
+# Channel table for Foz Do Igua�u - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=81
 
 # Physical channel 15 (virtual 32.3)
 [Paraguay TV]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 21.1)
-[RICTV Oeste]
+# Physical channel 26 (virtual 21.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 15.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 52.2)
+# Physical channel 29 (virtual 29.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 12.1)
-[Rede Massa Naipi]
+# Physical channel 39 (virtual 12.2)
+[Rede Massa Naipi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 49.1)
-[Rede Vida]
+# Physical channel 50 (virtual 50.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-pr-FranciscoAlves b/isdb-t/br-pr-FranciscoAlves
index d7045a89..3e506d9d 100644
--- a/isdb-t/br-pr-FranciscoAlves
+++ b/isdb-t/br-pr-FranciscoAlves
@@ -1,5 +1,5 @@
 # Channel table for Francisco Alves - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3880
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3880
 
 # Physical channel 24 (virtual 6.1)
 [TV Tarobá Cascavel]
diff --git a/isdb-t/br-pr-FranciscoBeltrao b/isdb-t/br-pr-FranciscoBeltrao
index 17455c5b..a398f14e 100644
--- a/isdb-t/br-pr-FranciscoBeltrao
+++ b/isdb-t/br-pr-FranciscoBeltrao
@@ -1,5 +1,5 @@
-# Channel table for Francisco Beltrão - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/184
+# Channel table for Francisco Beltr�o - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=184
 
 # Physical channel 18 (virtual 18.1)
 [TV Beltrão]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 50.1)
-[Rede Vida]
+# Physical channel 19 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 2.1)
-[Rede Massa Guará]
+# Physical channel 30 (virtual 2.2)
+[Rede Massa Guará, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 24.1)
-[RICTV Oeste]
+# Physical channel 34 (virtual 4.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pr-Goioere b/isdb-t/br-pr-Goioere
new file mode 100644
index 00000000..94253258
--- /dev/null
+++ b/isdb-t/br-pr-Goioere
@@ -0,0 +1,32 @@
+# Channel table for Goioer� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=266
+
+# Physical channel 38 (virtual 28.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Guaira b/isdb-t/br-pr-Guaira
index 52be50d4..701ca97d 100644
--- a/isdb-t/br-pr-Guaira
+++ b/isdb-t/br-pr-Guaira
@@ -1,5 +1,5 @@
-# Channel table for Guaíra - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/181
+# Channel table for Gua�ra - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=181
 
 # Physical channel 25 (virtual 30.1)
 [TV Canção Nova]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 21.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 40 (virtual 6.1)
 [TV Tarobá Cascavel]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 43.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Guairaca b/isdb-t/br-pr-Guairaca
index 3467688e..04190f91 100644
--- a/isdb-t/br-pr-Guairaca
+++ b/isdb-t/br-pr-Guairaca
@@ -1,11 +1,11 @@
-# Channel table for Guairaçá - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3867
+# Channel table for Guaira�� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3867
 
-# Physical channel 19 (virtual 22.2)
-[Rede Mundial]
+# Physical channel 21 (virtual 5.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 5.1)
-[Rede Massa Tibagi]
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pr-Guaraniacu b/isdb-t/br-pr-Guaraniacu
index 333eb7c1..1c8824d7 100644
--- a/isdb-t/br-pr-Guaraniacu
+++ b/isdb-t/br-pr-Guaraniacu
@@ -1,5 +1,5 @@
-# Channel table for Guaraniaçu - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1686
+# Channel table for Guarania�u - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1686
 
 # Physical channel 36 (virtual 6.1)
 [TV Tarobá Cascavel]
diff --git a/isdb-t/br-pr-Guarapuava b/isdb-t/br-pr-Guarapuava
index aa8a189b..ae0a238b 100644
--- a/isdb-t/br-pr-Guarapuava
+++ b/isdb-t/br-pr-Guarapuava
@@ -1,5 +1,5 @@
 # Channel table for Guarapuava - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/117
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=117
 
 # Physical channel 14 (virtual 14.1)
 [TV Cidade]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 22.2)
-[Rede Mundial]
+# Physical channel 19 (virtual 19.1)
+[TV Humaitá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 503142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[Boa Vontade TV]
+# Physical channel 23 (virtual 22.2)
+[Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 46.1)
-[TV Canção Nova]
+# Physical channel 24 (virtual 24.1)
+[Boa Vontade TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 16.1)
-[Rede Vida]
+# Physical channel 26 (virtual 46.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 12.1)
-[Rede Massa Guará]
+# Physical channel 28 (virtual 28.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 2.1)
-[RPC Guarapuava]
+# Physical channel 30 (virtual 12.2)
+[Rede Massa Guará, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 21.1)
-[RICTV Oeste]
+# Physical channel 32 (virtual 2.1)
+[RPC Guarapuava]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 4.1)
-[TV Tarobá Cascavel]
+# Physical channel 34 (virtual 21.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 18.1)
-[CNT]
+# Physical channel 36 (virtual 4.1)
+[TV Tarobá Cascavel]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
-[TV Humaitá]
+# Physical channel 43 (virtual 18.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pr-Guaratuba b/isdb-t/br-pr-Guaratuba
index e2fd5165..bf3057a1 100644
--- a/isdb-t/br-pr-Guaratuba
+++ b/isdb-t/br-pr-Guaratuba
@@ -1,8 +1,8 @@
 # Channel table for Guaratuba - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/188
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=188
 
-# Physical channel 15 (virtual 52.1)
-[RCI]
+# Physical channel 15 (virtual 7.2)
+[TV Pai Eterno, Aula Paranaguá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 38.1)
-[RICTV]
+# Physical channel 34 (virtual 38.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 50.1)
-[Rede Massa Iguaçu]
+# Physical channel 39 (virtual 50.2)
+[Rede Massa Iguaçu, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pr-HonorioSerpa b/isdb-t/br-pr-HonorioSerpa
index 1f76ac65..30386a5d 100644
--- a/isdb-t/br-pr-HonorioSerpa
+++ b/isdb-t/br-pr-HonorioSerpa
@@ -1,5 +1,5 @@
-# Channel table for Honório Serpa - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1754
+# Channel table for Hon�rio Serpa - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1754
 
 # Physical channel 41 (virtual 19.1)
 [RPC Foz do Iguaçu]
diff --git a/isdb-t/br-pr-Ibaiti b/isdb-t/br-pr-Ibaiti
new file mode 100644
index 00000000..5a9b42ae
--- /dev/null
+++ b/isdb-t/br-pr-Ibaiti
@@ -0,0 +1,90 @@
+# Channel table for Ibaiti - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1705
+
+# Physical channel 21 (virtual 21.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 42.1)
+[RPC Londrina]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 12.4)
+[RICTV Londrina, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Ibema b/isdb-t/br-pr-Ibema
index 6cc3cbab..83e34013 100644
--- a/isdb-t/br-pr-Ibema
+++ b/isdb-t/br-pr-Ibema
@@ -1,7 +1,7 @@
 # Channel table for Ibema - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2347
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2347
 
-# Physical channel 16 (virtual 14.1)
+# Physical channel 16 (virtual 16.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-Ibipora b/isdb-t/br-pr-Ibipora
index 5c26f507..2b4f171d 100644
--- a/isdb-t/br-pr-Ibipora
+++ b/isdb-t/br-pr-Ibipora
@@ -1,5 +1,5 @@
-# Channel table for Ibiporã - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/338
+# Channel table for Ibipor� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=338
 
 # Physical channel 15 (virtual 21.1)
 [Canal 21]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 24.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 44.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
diff --git a/isdb-t/br-pr-Imbituva b/isdb-t/br-pr-Imbituva
index ebfc4e0c..ae958c21 100644
--- a/isdb-t/br-pr-Imbituva
+++ b/isdb-t/br-pr-Imbituva
@@ -1,5 +1,179 @@
 # Channel table for Imbituva - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1706
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1706
+
+# Physical channel 14 (virtual 58.1)
+[TVE Ponta Grossa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 16.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 22.1)
+[Band Curitiba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 26.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 28.2)
+[Rede Massa Guará, TV Escola Curitiba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 15.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 7.1)
 [RPC Ponta Grossa]
@@ -30,3 +204,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 47.1)
+[RICTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Indianopolis b/isdb-t/br-pr-Indianopolis
index 07a5e0d0..5aedb9e0 100644
--- a/isdb-t/br-pr-Indianopolis
+++ b/isdb-t/br-pr-Indianopolis
@@ -1,5 +1,5 @@
-# Channel table for Indianópolis - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3997
+# Channel table for Indian�polis - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3997
 
 # Physical channel 23 (virtual 11.1)
 [Rede Massa Tibagi]
diff --git a/isdb-t/br-pr-Ipiranga b/isdb-t/br-pr-Ipiranga
index cbbde8cd..ff48664c 100644
--- a/isdb-t/br-pr-Ipiranga
+++ b/isdb-t/br-pr-Ipiranga
@@ -1,5 +1,5 @@
 # Channel table for Ipiranga - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1707
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1707
 
 # Physical channel 27 (virtual 28.1)
 [Rede Massa Guará]
diff --git a/isdb-t/br-pr-Ipora b/isdb-t/br-pr-Ipora
index 72015ff1..68ae255b 100644
--- a/isdb-t/br-pr-Ipora
+++ b/isdb-t/br-pr-Ipora
@@ -1,8 +1,8 @@
-# Channel table for Iporã - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3917
+# Channel table for Ipor� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3917
 
-# Physical channel 32 (virtual 32.1)
-[Rede Massa Tibagi]
+# Physical channel 32 (virtual 32.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-pr-Irati b/isdb-t/br-pr-Irati
index d67ee7dd..78b0b982 100644
--- a/isdb-t/br-pr-Irati
+++ b/isdb-t/br-pr-Irati
@@ -1,8 +1,8 @@
 # Channel table for Irati - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/321
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=321
 
-# Physical channel 19 (virtual 15.1)
-[Rede Vida]
+# Physical channel 19 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 5.1)
-[Rede Massa Guará]
+# Physical channel 22 (virtual 22.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 5.2)
+[Rede Massa Guará, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -88,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 8.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Itaipulandia b/isdb-t/br-pr-Itaipulandia
index 7acd6d6d..fb87cee1 100644
--- a/isdb-t/br-pr-Itaipulandia
+++ b/isdb-t/br-pr-Itaipulandia
@@ -1,8 +1,8 @@
-# Channel table for Itaipulândia - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/267
+# Channel table for Itaipul�ndia - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=267
 
-# Physical channel 15 (virtual 12.1)
-[Rede Massa Naipi]
+# Physical channel 15 (virtual 12.2)
+[Rede Massa Naipi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
diff --git a/isdb-t/br-pr-Itaperucu b/isdb-t/br-pr-Itaperucu
index ec615edf..73c186c1 100644
--- a/isdb-t/br-pr-Itaperucu
+++ b/isdb-t/br-pr-Itaperucu
@@ -1,8 +1,8 @@
-# Channel table for Itaperuçu - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2979
+# Channel table for Itaperu�u - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2979
 
-# Physical channel 34 (virtual 7.1)
-[RICTV]
+# Physical channel 34 (virtual 7.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pr-ItaunaDoSul b/isdb-t/br-pr-ItaunaDoSul
index 5510e16d..96a87546 100644
--- a/isdb-t/br-pr-ItaunaDoSul
+++ b/isdb-t/br-pr-ItaunaDoSul
@@ -1,37 +1,8 @@
-# Channel table for Itaúna Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3805
+# Channel table for Ita�na Do Sul - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3805
 
-# Physical channel 19 (virtual 22.2)
-[Rede Mundial]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 21 (virtual 5.1)
-[Rede Massa Tibagi]
+# Physical channel 21 (virtual 5.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-pr-Ivaipora b/isdb-t/br-pr-Ivaipora
index ed8dfd7a..6ec11155 100644
--- a/isdb-t/br-pr-Ivaipora
+++ b/isdb-t/br-pr-Ivaipora
@@ -1,5 +1,5 @@
-# Channel table for Ivaiporã - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3244
+# Channel table for Ivaipor� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3244
 
 # Physical channel 14 (virtual 14.1)
 [TV Humaitá]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 20.1)
-[Rede Vida]
+# Physical channel 19 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 30.1)
-[Rede Massa Tibagi]
+# Physical channel 30 (virtual 30.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-pr-Ivate b/isdb-t/br-pr-Ivate
index d91960a7..6a5395f7 100644
--- a/isdb-t/br-pr-Ivate
+++ b/isdb-t/br-pr-Ivate
@@ -1,5 +1,5 @@
-# Channel table for Ivaté - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3993
+# Channel table for Ivat� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3993
 
 # Physical channel 21 (virtual 13.1)
 [Rede Massa Tibagi]
diff --git a/isdb-t/br-pr-Jacarezinho b/isdb-t/br-pr-Jacarezinho
index a83af585..8dd6f363 100644
--- a/isdb-t/br-pr-Jacarezinho
+++ b/isdb-t/br-pr-Jacarezinho
@@ -1,8 +1,8 @@
 # Channel table for Jacarezinho - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/559
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=559
 
-# Physical channel 20 (virtual 59.1)
-[Rede Vida]
+# Physical channel 20 (virtual 59.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 47.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-pr-Jaguariaiva b/isdb-t/br-pr-Jaguariaiva
new file mode 100644
index 00000000..3e5ca08b
--- /dev/null
+++ b/isdb-t/br-pr-Jaguariaiva
@@ -0,0 +1,32 @@
+# Channel table for Jaguaria�va - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1689
+
+# Physical channel 32 (virtual 32.1)
+[RPC Ponta Grossa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-JandaiaDoSul b/isdb-t/br-pr-JandaiaDoSul
index f2ff7fa5..4ae23fb4 100644
--- a/isdb-t/br-pr-JandaiaDoSul
+++ b/isdb-t/br-pr-JandaiaDoSul
@@ -1,7 +1,7 @@
 # Channel table for Jandaia Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3809
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3809
 
-# Physical channel 18 (virtual 19.1)
+# Physical channel 18 (virtual 18.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-Japira b/isdb-t/br-pr-Japira
index 8d04a780..0938e94a 100644
--- a/isdb-t/br-pr-Japira
+++ b/isdb-t/br-pr-Japira
@@ -1,5 +1,5 @@
 # Channel table for Japira - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2406
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2406
 
 # Physical channel 30 (virtual 13.1)
 [TV Tarobá Cascavel]
diff --git a/isdb-t/br-pr-Japura b/isdb-t/br-pr-Japura
index 98ba6476..aa4b247c 100644
--- a/isdb-t/br-pr-Japura
+++ b/isdb-t/br-pr-Japura
@@ -1,5 +1,5 @@
-# Channel table for Japurá - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3906
+# Channel table for Japur� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3906
 
 # Physical channel 23 (virtual 11.1)
 [Rede Massa Tibagi]
diff --git a/isdb-t/br-pr-Jataizinho b/isdb-t/br-pr-Jataizinho
index 37742089..cf0d9caf 100644
--- a/isdb-t/br-pr-Jataizinho
+++ b/isdb-t/br-pr-Jataizinho
@@ -1,5 +1,5 @@
 # Channel table for Jataizinho - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/742
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=742
 
 # Physical channel 30 (virtual 13.1)
 [TV Tarobá Londrina]
diff --git a/isdb-t/br-pr-Kalore b/isdb-t/br-pr-Kalore
index e406ece3..30dcb90c 100644
--- a/isdb-t/br-pr-Kalore
+++ b/isdb-t/br-pr-Kalore
@@ -1,5 +1,5 @@
-# Channel table for Kaloré - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3370
+# Channel table for Kalor� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3370
 
 # Physical channel 21 (virtual 11.1)
 [Rede Massa Tibagi]
@@ -117,35 +117,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 35.1)
-[RCI]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 41 (virtual 8.1)
 [RPC Maringá]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-Lapa b/isdb-t/br-pr-Lapa
index 64f14342..e031837e 100644
--- a/isdb-t/br-pr-Lapa
+++ b/isdb-t/br-pr-Lapa
@@ -1,5 +1,5 @@
 # Channel table for Lapa - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1695
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1695
 
 # Physical channel 34 (virtual 7.1)
 [RICTV]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 38.1)
+[Band Curitiba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 27.1)
 [Rede Massa Iguaçu]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-LaranjeirasDoSul b/isdb-t/br-pr-LaranjeirasDoSul
index 1858e822..67377f36 100644
--- a/isdb-t/br-pr-LaranjeirasDoSul
+++ b/isdb-t/br-pr-LaranjeirasDoSul
@@ -1,5 +1,5 @@
 # Channel table for Laranjeiras Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/738
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=738
 
 # Physical channel 24 (virtual 10.1)
 [TV Tarobá Cascavel]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 21.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Lidianopolis b/isdb-t/br-pr-Lidianopolis
index 28ed4722..b633f57b 100644
--- a/isdb-t/br-pr-Lidianopolis
+++ b/isdb-t/br-pr-Lidianopolis
@@ -1,5 +1,5 @@
-# Channel table for Lidianópolis - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2131
+# Channel table for Lidian�polis - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2131
 
 # Physical channel 29 (virtual 29.1)
 [RPC Maringá]
diff --git a/isdb-t/br-pr-Loanda b/isdb-t/br-pr-Loanda
index 09f275d2..1f0c03e8 100644
--- a/isdb-t/br-pr-Loanda
+++ b/isdb-t/br-pr-Loanda
@@ -1,37 +1,8 @@
 # Channel table for Loanda - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1690
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1690
 
-# Physical channel 19 (virtual 22.2)
-[Rede Mundial]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 21 (virtual 5.1)
-[Rede Massa Tibagi]
+# Physical channel 21 (virtual 5.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -59,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 13.1)
-[RICTV Maringá]
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pr-Londrina b/isdb-t/br-pr-Londrina
index 36e591e9..b31406cc 100644
--- a/isdb-t/br-pr-Londrina
+++ b/isdb-t/br-pr-Londrina
@@ -1,8 +1,8 @@
 # Channel table for Londrina - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/12
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=12
 
-# Physical channel 19 (virtual 19.1)
-[Rede Vida]
+# Physical channel 19 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.2)
+# Physical channel 22 (virtual 22.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 5.1)
-[Rede Massa Cidade]
+# Physical channel 23 (virtual 5.3)
+[Rede Massa Cidade, TV Escola Curitiba, Aula Londrina]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 24.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 44.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 3.1)
-[RPC Londrina]
+# Physical channel 38 (virtual 38.1)
+[Boa Vontade TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[TV Gazeta]
+# Physical channel 42 (virtual 3.1)
+[RPC Londrina]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 7.1)
-[CNT Tropical]
+# Physical channel 45 (virtual 46.1)
+[TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -378,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 9.1)
-[RICTV Londrina]
+# Physical channel 47 (virtual 7.1)
+[CNT Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -407,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 50.1)
-[Boa Vontade TV]
+# Physical channel 49 (virtual 9.4)
+[RICTV Londrina, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 689142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pr-Mambore b/isdb-t/br-pr-Mambore
index 6314a3ac..7a141138 100644
--- a/isdb-t/br-pr-Mambore
+++ b/isdb-t/br-pr-Mambore
@@ -1,5 +1,5 @@
-# Channel table for Mamborê - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1675
+# Channel table for Mambor� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1675
 
 # Physical channel 38 (virtual 7.1)
 [TV Tarobá Cascavel]
diff --git a/isdb-t/br-pr-Mandaguacu b/isdb-t/br-pr-Mandaguacu
index 07994d89..d7cc729a 100644
--- a/isdb-t/br-pr-Mandaguacu
+++ b/isdb-t/br-pr-Mandaguacu
@@ -1,7 +1,7 @@
-# Channel table for Mandaguaçu - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1627
+# Channel table for Mandagua�u - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1627
 
-# Physical channel 18 (virtual 19.1)
+# Physical channel 18 (virtual 18.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 49.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 27 (virtual 6.1)
 [TV Maringá]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 28 (virtual 39.1)
+[TV Novo Tempo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 31.1)
 [TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,6 +204,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 28.1)
+[TV UniCesumar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 38.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 8.1)
 [RPC Maringá]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,3 +320,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 51.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Mandaguari b/isdb-t/br-pr-Mandaguari
index 453d7b23..8946b60a 100644
--- a/isdb-t/br-pr-Mandaguari
+++ b/isdb-t/br-pr-Mandaguari
@@ -1,5 +1,5 @@
 # Channel table for Mandaguari - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4030
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4030
 
 # Physical channel 14 (virtual 14.1)
 [Boa Vontade TV]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 19.1)
+# Physical channel 18 (virtual 18.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-ManoelRibas b/isdb-t/br-pr-ManoelRibas
index 161e198e..9aebcff8 100644
--- a/isdb-t/br-pr-ManoelRibas
+++ b/isdb-t/br-pr-ManoelRibas
@@ -1,5 +1,5 @@
 # Channel table for Manoel Ribas - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1612
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1612
 
 # Physical channel 22 (virtual 22.2)
 [Rede Mundial]
diff --git a/isdb-t/br-pr-MarechalCandidoRondon b/isdb-t/br-pr-MarechalCandidoRondon
index 56d6c626..6658081c 100644
--- a/isdb-t/br-pr-MarechalCandidoRondon
+++ b/isdb-t/br-pr-MarechalCandidoRondon
@@ -1,5 +1,34 @@
-# Channel table for Marechal Cândido Rondon - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/86
+# Channel table for Marechal C�ndido Rondon - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=86
+
+# Physical channel 20
+[CATVE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
 [RPC Cascavel]
@@ -30,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 47.1)
-[RICTV Oeste]
+# Physical channel 34 (virtual 7.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pr-Marialva b/isdb-t/br-pr-Marialva
index 55fc7ab5..6996a3e7 100644
--- a/isdb-t/br-pr-Marialva
+++ b/isdb-t/br-pr-Marialva
@@ -1,5 +1,5 @@
 # Channel table for Marialva - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3793
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3793
 
 # Physical channel 14 (virtual 14.1)
 [Boa Vontade TV]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 19.1)
+# Physical channel 18 (virtual 18.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 6.1)
-[TV Maringá]
+# Physical channel 23 (virtual 49.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 31.1)
-[TV Evangelizar]
+# Physical channel 24 (virtual 57.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 46.1)
-[TV Cachoeira]
+# Physical channel 26 (virtual 25.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 575142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,69 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 13.1)
-[RICTV Maringá]
+# Physical channel 27 (virtual 6.1)
+[TV Maringá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 31.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 46.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 35.1)
-[RCI]
+# Physical channel 34 (virtual 13.1)
+[RICTV Maringá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pr-MarilandiaDoSul b/isdb-t/br-pr-MarilandiaDoSul
index f4ffb423..4936b0b9 100644
--- a/isdb-t/br-pr-MarilandiaDoSul
+++ b/isdb-t/br-pr-MarilandiaDoSul
@@ -1,5 +1,5 @@
-# Channel table for Marilândia Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3863
+# Channel table for Maril�ndia Do Sul - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3863
 
 # Physical channel 36 (virtual 36.1)
 [RPC Maringá]
diff --git a/isdb-t/br-pr-Maringa b/isdb-t/br-pr-Maringa
index 597e0c31..1bdaf006 100644
--- a/isdb-t/br-pr-Maringa
+++ b/isdb-t/br-pr-Maringa
@@ -1,5 +1,5 @@
-# Channel table for Maringá - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/121
+# Channel table for Maring� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=121
 
 # Physical channel 14 (virtual 14.1)
 [Boa Vontade TV]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 19.1)
-[Rede Vida]
+# Physical channel 18 (virtual 18.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 11.1)
-[Rede Massa Tibagi]
+# Physical channel 21 (virtual 11.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 31.1)
-[TV Evangelizar]
+# Physical channel 30 (virtual 31.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 24.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -349,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 13.1)
-[RICTV Maringá]
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -523,7 +523,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
+# Physical channel 51 (virtual 51.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-Maripa b/isdb-t/br-pr-Maripa
new file mode 100644
index 00000000..bee860ec
--- /dev/null
+++ b/isdb-t/br-pr-Maripa
@@ -0,0 +1,61 @@
+# Channel table for Marip� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4038
+
+# Physical channel 24 (virtual 6.1)
+[TV Tarobá Cascavel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 12.1)
+[RPC Cascavel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Matelandia b/isdb-t/br-pr-Matelandia
index 1d7cef7c..2259ee13 100644
--- a/isdb-t/br-pr-Matelandia
+++ b/isdb-t/br-pr-Matelandia
@@ -1,5 +1,5 @@
-# Channel table for Matelândia - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2349
+# Channel table for Matel�ndia - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2349
 
 # Physical channel 36 (virtual 6.1)
 [TV Tarobá Cascavel]
diff --git a/isdb-t/br-pr-Matinhos b/isdb-t/br-pr-Matinhos
index afab9bd4..7ec08731 100644
--- a/isdb-t/br-pr-Matinhos
+++ b/isdb-t/br-pr-Matinhos
@@ -1,8 +1,8 @@
 # Channel table for Matinhos - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/187
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=187
 
-# Physical channel 16 (virtual 26.1)
-[RCI]
+# Physical channel 16 (virtual 7.2)
+[TV Pai Eterno, Aula Paranaguá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.1)
+# Physical channel 31 (virtual 2.1)
 [Band Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 38.1)
-[RICTV]
+# Physical channel 34 (virtual 38.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 4.1)
-[Rede Massa Iguaçu]
+# Physical channel 39 (virtual 4.2)
+[Rede Massa Iguaçu, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pr-Medianeira b/isdb-t/br-pr-Medianeira
index 8b54a975..fc130616 100644
--- a/isdb-t/br-pr-Medianeira
+++ b/isdb-t/br-pr-Medianeira
@@ -1,8 +1,8 @@
 # Channel table for Medianeira - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/182
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=182
 
-# Physical channel 26 (virtual 21.1)
-[RICTV Oeste]
+# Physical channel 26 (virtual 21.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 12.1)
-[Rede Massa Naipi]
+# Physical channel 30 (virtual 12.2)
+[Rede Massa Naipi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-pr-Mirador b/isdb-t/br-pr-Mirador
index 7c5d2ad3..bb2e83ac 100644
--- a/isdb-t/br-pr-Mirador
+++ b/isdb-t/br-pr-Mirador
@@ -1,5 +1,5 @@
 # Channel table for Mirador - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4009
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4009
 
 # Physical channel 34 (virtual 13.1)
 [RICTV Maringá]
diff --git a/isdb-t/br-pr-Missal b/isdb-t/br-pr-Missal
index 00b3a695..a089e470 100644
--- a/isdb-t/br-pr-Missal
+++ b/isdb-t/br-pr-Missal
@@ -1,5 +1,5 @@
 # Channel table for Missal - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2072
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2072
 
 # Physical channel 36 (virtual 6.1)
 [TV Tarobá Cascavel]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 3.1)
-[Rede Massa Naipi]
+# Physical channel 47 (virtual 3.2)
+[Rede Massa Naipi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-pr-MoreiraSales b/isdb-t/br-pr-MoreiraSales
index af9decb7..3c5f06b1 100644
--- a/isdb-t/br-pr-MoreiraSales
+++ b/isdb-t/br-pr-MoreiraSales
@@ -1,5 +1,5 @@
 # Channel table for Moreira Sales - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2127
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2127
 
 # Physical channel 19 (virtual 20.1)
 [Rede Vida]
@@ -59,32 +59,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 59 (virtual 53.1)
-[TV UP]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 743142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-pr-Morretes b/isdb-t/br-pr-Morretes
index d6bdce1d..586011be 100644
--- a/isdb-t/br-pr-Morretes
+++ b/isdb-t/br-pr-Morretes
@@ -1,8 +1,8 @@
 # Channel table for Morretes - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1676
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1676
 
-# Physical channel 15 (virtual 7.1)
-[RCI]
+# Physical channel 15 (virtual 7.2)
+[TV Pai Eterno, Aula Paranaguá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 27.1)
-[Rede Vida]
+# Physical channel 19 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 21
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 22.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 38.1)
-[RICTV]
+# Physical channel 34 (virtual 38.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -175,6 +204,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 6.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 44.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 33.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-NovaAliancaDoIvai b/isdb-t/br-pr-NovaAliancaDoIvai
index 18f2ca99..fd0a5ca3 100644
--- a/isdb-t/br-pr-NovaAliancaDoIvai
+++ b/isdb-t/br-pr-NovaAliancaDoIvai
@@ -1,5 +1,34 @@
-# Channel table for Nova Aliança Do Ivaí - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3912
+# Channel table for Nova Alian�a Do Iva� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3912
+
+# Physical channel 24 (virtual 57.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 13.1)
 [RICTV Maringá]
@@ -59,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 10.1)
-[Rede Massa Tibagi]
+# Physical channel 39 (virtual 10.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pr-NovaAurora b/isdb-t/br-pr-NovaAurora
index 77932676..8d32e684 100644
--- a/isdb-t/br-pr-NovaAurora
+++ b/isdb-t/br-pr-NovaAurora
@@ -1,7 +1,7 @@
 # Channel table for Nova Aurora - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1382
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1382
 
-# Physical channel 16 (virtual 14.1)
+# Physical channel 16 (virtual 16.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-NovaEsperanca b/isdb-t/br-pr-NovaEsperanca
index 9cc6e4ce..68665f95 100644
--- a/isdb-t/br-pr-NovaEsperanca
+++ b/isdb-t/br-pr-NovaEsperanca
@@ -1,5 +1,5 @@
-# Channel table for Nova Esperança - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3012
+# Channel table for Nova Esperan�a - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3012
 
 # Physical channel 16 (virtual 16.1)
 [TV Cachoeira]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 20.1)
+# Physical channel 18 (virtual 18.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 11.1)
-[Rede Massa Tibagi]
+# Physical channel 19 (virtual 11.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[RCI]
+# Physical channel 49 (virtual 49.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pr-NovaLondrina b/isdb-t/br-pr-NovaLondrina
index c911861d..4728b184 100644
--- a/isdb-t/br-pr-NovaLondrina
+++ b/isdb-t/br-pr-NovaLondrina
@@ -1,37 +1,8 @@
 # Channel table for Nova Londrina - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1659
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1659
 
-# Physical channel 19 (virtual 22.2)
-[Rede Mundial]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 21 (virtual 5.1)
-[Rede Massa Tibagi]
+# Physical channel 21 (virtual 5.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -59,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 13.1)
-[RICTV Maringá]
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pr-NovaSantaRosa b/isdb-t/br-pr-NovaSantaRosa
index decabdc5..7e194001 100644
--- a/isdb-t/br-pr-NovaSantaRosa
+++ b/isdb-t/br-pr-NovaSantaRosa
@@ -1,5 +1,34 @@
 # Channel table for Nova Santa Rosa - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3788
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3788
+
+# Physical channel 20
+[CATVE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
 [RPC Cascavel]
@@ -30,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 7.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 40 (virtual 6.1)
 [TV Tarobá Cascavel]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-Palmas b/isdb-t/br-pr-Palmas
index 684dbdd8..fae28a8a 100644
--- a/isdb-t/br-pr-Palmas
+++ b/isdb-t/br-pr-Palmas
@@ -1,8 +1,8 @@
 # Channel table for Palmas - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1660
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1660
 
-# Physical channel 20 (virtual 32.1)
-[Rede Vida]
+# Physical channel 20 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 38.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Palmeira b/isdb-t/br-pr-Palmeira
index 74f320cd..4362011f 100644
--- a/isdb-t/br-pr-Palmeira
+++ b/isdb-t/br-pr-Palmeira
@@ -1,8 +1,8 @@
 # Channel table for Palmeira - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1709
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1709
 
-# Physical channel 21 (virtual 58.1)
-[Rede Massa Guará]
+# Physical channel 21 (virtual 58.2)
+[Rede Massa Guará, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 47.1)
-[RICTV]
+# Physical channel 49 (virtual 47.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pr-Palotina b/isdb-t/br-pr-Palotina
index 1b6f141a..7f50bc2f 100644
--- a/isdb-t/br-pr-Palotina
+++ b/isdb-t/br-pr-Palotina
@@ -1,7 +1,7 @@
 # Channel table for Palotina - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/167
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=167
 
-# Physical channel 24 (virtual 6.1)
+# Physical channel 24 (virtual 25.1)
 [TV Tarobá Cascavel]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-ParaisoDoNorte b/isdb-t/br-pr-ParaisoDoNorte
new file mode 100644
index 00000000..92b502c6
--- /dev/null
+++ b/isdb-t/br-pr-ParaisoDoNorte
@@ -0,0 +1,32 @@
+# Channel table for Para�so Do Norte - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4042
+
+# Physical channel 41 (virtual 41.1)
+[RPC Paranavaí]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Paranagua b/isdb-t/br-pr-Paranagua
index a677a18c..37b2d578 100644
--- a/isdb-t/br-pr-Paranagua
+++ b/isdb-t/br-pr-Paranagua
@@ -1,8 +1,8 @@
-# Channel table for Paranaguá - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/186
+# Channel table for Paranagu� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=186
 
-# Physical channel 15 (virtual 7.1)
-[RCI]
+# Physical channel 15 (virtual 7.2)
+[TV Pai Eterno, Aula Paranaguá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 27.1)
-[Rede Vida]
+# Physical channel 19 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 38.1)
-[RICTV]
+# Physical channel 34 (virtual 38.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 45.1)
-[Rede Massa Iguaçu]
+# Physical channel 39 (virtual 45.2)
+[Rede Massa Iguaçu, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,6 +204,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 6.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 44.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 33.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-Paranavai b/isdb-t/br-pr-Paranavai
index 971f5075..247e28a2 100644
--- a/isdb-t/br-pr-Paranavai
+++ b/isdb-t/br-pr-Paranavai
@@ -1,8 +1,37 @@
-# Channel table for Paranavaí - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/118
+# Channel table for Paranava� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=118
 
-# Physical channel 18 (virtual 20.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 18.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -30,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 13.1)
-[RICTV Maringá]
+# Physical channel 23 (virtual 23.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[TV Cachoeira]
+# Physical channel 24 (virtual 57.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 6.1)
-[TV Tarobá Cascavel]
+# Physical channel 33 (virtual 33.1)
+[Rede TV! Sul]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 10.1)
-[Rede Massa Tibagi]
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 29.1)
-[RPC Paranavaí]
+# Physical channel 36 (virtual 36.1)
+[TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +204,69 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 44.1)
-[Rede Mundial]
+# Physical channel 38 (virtual 6.1)
+[TV Tarobá Cascavel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 10.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 29.1)
+[RPC Paranavaí]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 43.1)
+# Physical channel 46 (virtual 46.1)
 [TV Verdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -233,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 12.1)
+# Physical channel 47 (virtual 15.1)
 [CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -291,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[RCI]
+# Physical channel 49 (virtual 49.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pr-PatoBragado b/isdb-t/br-pr-PatoBragado
index e4892740..b31c3476 100644
--- a/isdb-t/br-pr-PatoBragado
+++ b/isdb-t/br-pr-PatoBragado
@@ -1,5 +1,5 @@
 # Channel table for Pato Bragado - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3875
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3875
 
 # Physical channel 32 (virtual 8.1)
 [RPC Cascavel]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 7.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 40 (virtual 6.1)
 [TV Tarobá Cascavel]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-PatoBranco b/isdb-t/br-pr-PatoBranco
index c2439a76..5ad8eff7 100644
--- a/isdb-t/br-pr-PatoBranco
+++ b/isdb-t/br-pr-PatoBranco
@@ -1,5 +1,5 @@
 # Channel table for Pato Branco - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/119
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=119
 
 # Physical channel 15 (virtual 9.1)
 [TV Nova Conexão]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 31.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 4.1)
-[RICTV Oeste]
+# Physical channel 34 (virtual 4.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -204,8 +204,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 12.1)
-[Rede Massa Guará]
+# Physical channel 44 (virtual 44.1)
+[TV Humaitá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 12.2)
+[Rede Massa Guará, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -233,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 33.1)
+# Physical channel 49 (virtual 49.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-Perobal b/isdb-t/br-pr-Perobal
index f8515286..2f4439c5 100644
--- a/isdb-t/br-pr-Perobal
+++ b/isdb-t/br-pr-Perobal
@@ -1,5 +1,5 @@
 # Channel table for Perobal - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3988
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3988
 
 # Physical channel 21 (virtual 13.1)
 [Rede Massa Tibagi]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 32.1)
+[Rede TV! Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 38 (virtual 6.1)
 [TV Tarobá Cascavel]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-Perola b/isdb-t/br-pr-Perola
index b82cf4a3..45f99bae 100644
--- a/isdb-t/br-pr-Perola
+++ b/isdb-t/br-pr-Perola
@@ -1,8 +1,8 @@
-# Channel table for Pérola - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2781
+# Channel table for P�rola - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2781
 
-# Physical channel 23 (virtual 21.1)
-[Rede Massa Tibagi]
+# Physical channel 23 (virtual 21.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-pr-Pinhais b/isdb-t/br-pr-Pinhais
index 386f2101..df766b6e 100644
--- a/isdb-t/br-pr-Pinhais
+++ b/isdb-t/br-pr-Pinhais
@@ -1,8 +1,8 @@
 # Channel table for Pinhais - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3739
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3739
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 10.4)
+[TV Senado, TV Assembleia PR, Canal em teste, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -262,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 55.1)
+# Physical channel 31 (virtual 31.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[RIT]
+[RIT Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -582,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 57.1)
-[Top TV]
+[Top TV Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -639,32 +668,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 50.1)
-[TV Mundial]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 689142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-pr-Piraquara b/isdb-t/br-pr-Piraquara
index 72da2e53..fd28e05a 100644
--- a/isdb-t/br-pr-Piraquara
+++ b/isdb-t/br-pr-Piraquara
@@ -1,8 +1,8 @@
 # Channel table for Piraquara - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3740
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3740
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 10.4)
+[TV Senado, TV Assembleia PR, Canal em teste, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -262,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 55.1)
+# Physical channel 31 (virtual 31.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[RIT]
+[RIT Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -582,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 57.1)
-[Top TV]
+[Top TV Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-pr-Pitanga b/isdb-t/br-pr-Pitanga
new file mode 100644
index 00000000..1bb6cb37
--- /dev/null
+++ b/isdb-t/br-pr-Pitanga
@@ -0,0 +1,32 @@
+# Channel table for Pitanga - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1613
+
+# Physical channel 34 (virtual 7.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-PlanaltinaDoParana b/isdb-t/br-pr-PlanaltinaDoParana
index 6368a239..c7e32d0d 100644
--- a/isdb-t/br-pr-PlanaltinaDoParana
+++ b/isdb-t/br-pr-PlanaltinaDoParana
@@ -1,5 +1,5 @@
-# Channel table for Planaltina Do Paraná - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3528
+# Channel table for Planaltina Do Paran� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3528
 
 # Physical channel 21 (virtual 5.1)
 [Rede Massa Tibagi]
diff --git a/isdb-t/br-pr-PontaGrossa b/isdb-t/br-pr-PontaGrossa
index eab3fd23..b7508cfa 100644
--- a/isdb-t/br-pr-PontaGrossa
+++ b/isdb-t/br-pr-PontaGrossa
@@ -1,5 +1,5 @@
 # Channel table for Ponta Grossa - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/92
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=92
 
 # Physical channel 14 (virtual 58.1)
 [TVE Ponta Grossa]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 14.1)
-[Rede Vida]
+# Physical channel 19 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 28.1)
-[Rede Massa Guará]
+# Physical channel 27 (virtual 28.2)
+[Rede Massa Guará, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 35.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 46.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 47.1)
-[RICTV]
+# Physical channel 49 (virtual 47.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pr-PontaGrossa(guaraji) b/isdb-t/br-pr-PontaGrossa(guaraji)
index 2fc1fb90..f87b2738 100644
--- a/isdb-t/br-pr-PontaGrossa(guaraji)
+++ b/isdb-t/br-pr-PontaGrossa(guaraji)
@@ -1,7 +1,7 @@
 # Channel table for Ponta Grossa (guaraji) - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3272
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3272
 
-# Physical channel 41 (virtual 51.1)
+# Physical channel 41 (virtual 41.1)
 [RPC Ponta Grossa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-PontalDoParana b/isdb-t/br-pr-PontalDoParana
index c09a739f..934d1e93 100644
--- a/isdb-t/br-pr-PontalDoParana
+++ b/isdb-t/br-pr-PontalDoParana
@@ -1,5 +1,5 @@
-# Channel table for Pontal Do Paraná - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/857
+# Channel table for Pontal Do Paran� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=857
 
 # Physical channel 30 (virtual 32.2)
 [Rede Mundial]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 23.1)
-[Rede Massa Iguaçu]
+# Physical channel 39 (virtual 23.2)
+[Rede Massa Iguaçu, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
-[RCI]
+# Physical channel 49 (virtual 7.2)
+[TV Pai Eterno, Aula Paranaguá]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pr-Porecatu b/isdb-t/br-pr-Porecatu
index d95d412a..98a34ca4 100644
--- a/isdb-t/br-pr-Porecatu
+++ b/isdb-t/br-pr-Porecatu
@@ -1,5 +1,5 @@
 # Channel table for Porecatu - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1664
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1664
 
 # Physical channel 22 (virtual 22.2)
 [Rede Mundial]
diff --git a/isdb-t/br-pr-PortoRico b/isdb-t/br-pr-PortoRico
index 83d7f60a..a423faf0 100644
--- a/isdb-t/br-pr-PortoRico
+++ b/isdb-t/br-pr-PortoRico
@@ -1,8 +1,8 @@
 # Channel table for Porto Rico - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3478
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3478
 
-# Physical channel 23 (virtual 3.1)
-[Rede Massa Tibagi]
+# Physical channel 23 (virtual 3.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -30,3 +30,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 42.1)
+[RPC Paranavaí]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-PresidenteCasteloBranco b/isdb-t/br-pr-PresidenteCasteloBranco
index 3a6f7483..e488e087 100644
--- a/isdb-t/br-pr-PresidenteCasteloBranco
+++ b/isdb-t/br-pr-PresidenteCasteloBranco
@@ -1,5 +1,5 @@
 # Channel table for Presidente Castelo Branco - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3843
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3843
 
 # Physical channel 16 (virtual 16.1)
 [TV Cachoeira]
diff --git a/isdb-t/br-pr-PrimeiroDeMaio b/isdb-t/br-pr-PrimeiroDeMaio
index 9c1696e0..a71894dd 100644
--- a/isdb-t/br-pr-PrimeiroDeMaio
+++ b/isdb-t/br-pr-PrimeiroDeMaio
@@ -1,5 +1,5 @@
 # Channel table for Primeiro De Maio - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1696
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1696
 
 # Physical channel 30 (virtual 13.1)
 [TV Tarobá Londrina]
diff --git a/isdb-t/br-pr-Prudentopolis b/isdb-t/br-pr-Prudentopolis
index f74851b3..c4bdf52a 100644
--- a/isdb-t/br-pr-Prudentopolis
+++ b/isdb-t/br-pr-Prudentopolis
@@ -1,5 +1,5 @@
-# Channel table for Prudentópolis - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1666
+# Channel table for Prudent�polis - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1666
 
 # Physical channel 20 (virtual 20.2)
 [Rede Mundial]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 14.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-QuatroBarras b/isdb-t/br-pr-QuatroBarras
index 15b05bdc..cdda3db4 100644
--- a/isdb-t/br-pr-QuatroBarras
+++ b/isdb-t/br-pr-QuatroBarras
@@ -1,8 +1,8 @@
 # Channel table for Quatro Barras - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3741
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3741
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 55.1)
+# Physical channel 31 (virtual 31.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -262,6 +262,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 32.1)
+[RIT Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 33 (virtual 35.1)
 [TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
@@ -524,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 57.1)
-[Top TV]
+[Top TV Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-pr-QuatroPontes b/isdb-t/br-pr-QuatroPontes
index 4be30ec1..f144f115 100644
--- a/isdb-t/br-pr-QuatroPontes
+++ b/isdb-t/br-pr-QuatroPontes
@@ -1,5 +1,34 @@
 # Channel table for Quatro Pontes - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3330
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3330
+
+# Physical channel 20
+[CATVE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 8.1)
 [RPC Cascavel]
@@ -30,11 +59,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 7.1)
-[RICTV Oeste]
+# Physical channel 34 (virtual 7.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 6.1)
+[TV Tarobá Cascavel]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pr-Quitandinha b/isdb-t/br-pr-Quitandinha
index b6c0f737..c4b07248 100644
--- a/isdb-t/br-pr-Quitandinha
+++ b/isdb-t/br-pr-Quitandinha
@@ -1,5 +1,5 @@
 # Channel table for Quitandinha - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3879
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3879
 
 # Physical channel 23 (virtual 4.1)
 [Rede Massa Iguaçu]
diff --git a/isdb-t/br-pr-Renascenca b/isdb-t/br-pr-Renascenca
index 3a9f2d9e..2b2ee454 100644
--- a/isdb-t/br-pr-Renascenca
+++ b/isdb-t/br-pr-Renascenca
@@ -1,5 +1,5 @@
-# Channel table for Renascença - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1762
+# Channel table for Renascen�a - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1762
 
 # Physical channel 32 (virtual 39.1)
 [RPC Foz do Iguaçu]
diff --git a/isdb-t/br-pr-Reserva b/isdb-t/br-pr-Reserva
index 47920bc2..4f992a6f 100644
--- a/isdb-t/br-pr-Reserva
+++ b/isdb-t/br-pr-Reserva
@@ -1,5 +1,5 @@
 # Channel table for Reserva - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3275
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3275
 
 # Physical channel 20 (virtual 20.2)
 [Rede Mundial]
diff --git a/isdb-t/br-pr-RibeiraoClaro b/isdb-t/br-pr-RibeiraoClaro
new file mode 100644
index 00000000..349f23fd
--- /dev/null
+++ b/isdb-t/br-pr-RibeiraoClaro
@@ -0,0 +1,32 @@
+# Channel table for Ribeir�o Claro - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3227
+
+# Physical channel 14 (virtual 14.1)
+[RPC Londrina]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-RioBom b/isdb-t/br-pr-RioBom
index d4b1bbd2..3860a095 100644
--- a/isdb-t/br-pr-RioBom
+++ b/isdb-t/br-pr-RioBom
@@ -1,5 +1,5 @@
 # Channel table for Rio Bom - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2455
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2455
 
 # Physical channel 29 (virtual 29.1)
 [RPC Maringá]
diff --git a/isdb-t/br-pr-RioBrancoDoSul b/isdb-t/br-pr-RioBrancoDoSul
index 06b1c6ca..dd4fdfbf 100644
--- a/isdb-t/br-pr-RioBrancoDoSul
+++ b/isdb-t/br-pr-RioBrancoDoSul
@@ -1,8 +1,8 @@
 # Channel table for Rio Branco Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1697
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1697
 
-# Physical channel 34 (virtual 7.1)
-[RICTV]
+# Physical channel 34 (virtual 7.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pr-RioNegro b/isdb-t/br-pr-RioNegro
index 565cfbb9..8a5f3b0e 100644
--- a/isdb-t/br-pr-RioNegro
+++ b/isdb-t/br-pr-RioNegro
@@ -1,5 +1,5 @@
 # Channel table for Rio Negro - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/33
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=33
 
 # Physical channel 24 (virtual 57.1)
 [NSC Joinville]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 55.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-pr-Rolandia b/isdb-t/br-pr-Rolandia
index f428789b..b51b9f9d 100644
--- a/isdb-t/br-pr-Rolandia
+++ b/isdb-t/br-pr-Rolandia
@@ -1,5 +1,5 @@
-# Channel table for Rolândia - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/395
+# Channel table for Rol�ndia - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=395
 
 # Physical channel 17 (virtual 17.1)
 [Tenda TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 44.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -175,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.1)
+# Physical channel 28 (virtual 36.1)
 [RTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -291,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 34.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 7.1)
 [CNT Tropical]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-SantaCruzDeMonteCastelo b/isdb-t/br-pr-SantaCruzDeMonteCastelo
index 843dfbd4..a1bde89a 100644
--- a/isdb-t/br-pr-SantaCruzDeMonteCastelo
+++ b/isdb-t/br-pr-SantaCruzDeMonteCastelo
@@ -1,5 +1,34 @@
 # Channel table for Santa Cruz De Monte Castelo - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4012
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4012
+
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 9.1)
 [CNT]
diff --git a/isdb-t/br-pr-SantaHelena b/isdb-t/br-pr-SantaHelena
index 474f11a9..c882fc42 100644
--- a/isdb-t/br-pr-SantaHelena
+++ b/isdb-t/br-pr-SantaHelena
@@ -1,5 +1,5 @@
 # Channel table for Santa Helena - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/268
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=268
 
 # Physical channel 25 (virtual 6.1)
 [TV Tarobá Cascavel]
diff --git a/isdb-t/br-pr-SantaIsabelDoIvai b/isdb-t/br-pr-SantaIsabelDoIvai
index 6d1c7f03..1855fe65 100644
--- a/isdb-t/br-pr-SantaIsabelDoIvai
+++ b/isdb-t/br-pr-SantaIsabelDoIvai
@@ -1,5 +1,34 @@
-# Channel table for Santa Isabel Do Ivaí - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3527
+# Channel table for Santa Isabel Do Iva� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3527
+
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 9.1)
 [CNT]
diff --git a/isdb-t/br-pr-SantaMariana b/isdb-t/br-pr-SantaMariana
index cfcaf86e..378f7fd8 100644
--- a/isdb-t/br-pr-SantaMariana
+++ b/isdb-t/br-pr-SantaMariana
@@ -1,8 +1,8 @@
 # Channel table for Santa Mariana - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3539
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3539
 
 # Physical channel 14 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
diff --git a/isdb-t/br-pr-SantaMonica b/isdb-t/br-pr-SantaMonica
new file mode 100644
index 00000000..957dba78
--- /dev/null
+++ b/isdb-t/br-pr-SantaMonica
@@ -0,0 +1,32 @@
+# Channel table for Santa M�nica - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4245
+
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-SantaTerezinhaDeItaipu b/isdb-t/br-pr-SantaTerezinhaDeItaipu
index 40aa3f3e..c8035950 100644
--- a/isdb-t/br-pr-SantaTerezinhaDeItaipu
+++ b/isdb-t/br-pr-SantaTerezinhaDeItaipu
@@ -1,5 +1,5 @@
 # Channel table for Santa Terezinha De Itaipu - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3716
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3716
 
 # Physical channel 17 (virtual 17.1)
 [Boa Vontade TV]
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 38.1)
-[TV Novo Tempo]
+# Physical channel 30 (virtual 30.1)
+[Boa Vontade TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 12.1)
-[Rede Massa Naipi]
+# Physical channel 35 (virtual 5.1)
+[RPC Foz do Iguaçu]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 5.1)
-[RPC Foz do Iguaçu]
+# Physical channel 38 (virtual 38.1)
+[TV Novo Tempo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 12.1)
+[Rede Massa Naipi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 49.1)
-[Rede Vida]
+# Physical channel 50 (virtual 49.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-pr-SantoAntonioDaPlatina b/isdb-t/br-pr-SantoAntonioDaPlatina
index b64e05dd..d883095d 100644
--- a/isdb-t/br-pr-SantoAntonioDaPlatina
+++ b/isdb-t/br-pr-SantoAntonioDaPlatina
@@ -1,7 +1,7 @@
-# Channel table for Santo Antônio Da Platina - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/433
+# Channel table for Santo Ant�nio Da Platina - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=433
 
-# Physical channel 21 (virtual 21.2)
+# Physical channel 21 (virtual 21.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 36.1)
-[RICTV Londrina]
+# Physical channel 34 (virtual 12.4)
+[RICTV Londrina, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pr-SaoJoaoDoCaiua b/isdb-t/br-pr-SaoJoaoDoCaiua
index f977ae63..88fd336f 100644
--- a/isdb-t/br-pr-SaoJoaoDoCaiua
+++ b/isdb-t/br-pr-SaoJoaoDoCaiua
@@ -1,5 +1,5 @@
-# Channel table for São João Do Caiuá - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1670
+# Channel table for S�o Jo�o Do Caiu� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1670
 
 # Physical channel 34 (virtual 13.1)
 [RICTV Maringá]
diff --git a/isdb-t/br-pr-SaoJoaoDoIvai b/isdb-t/br-pr-SaoJoaoDoIvai
index 7bd8b6ae..20500473 100644
--- a/isdb-t/br-pr-SaoJoaoDoIvai
+++ b/isdb-t/br-pr-SaoJoaoDoIvai
@@ -1,5 +1,5 @@
-# Channel table for São João Do Ivaí - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2842
+# Channel table for S�o Jo�o Do Iva� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2842
 
 # Physical channel 32 (virtual 29.1)
 [RPC Maringá]
diff --git a/isdb-t/br-pr-SaoJoseDasPalmeiras b/isdb-t/br-pr-SaoJoseDasPalmeiras
index 83ce7888..86545b3e 100644
--- a/isdb-t/br-pr-SaoJoseDasPalmeiras
+++ b/isdb-t/br-pr-SaoJoseDasPalmeiras
@@ -1,8 +1,8 @@
-# Channel table for São José Das Palmeiras - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3913
+# Channel table for S�o Jos� Das Palmeiras - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3913
 
-# Physical channel 27 (virtual 39.1)
-[Rede Massa Naipi]
+# Physical channel 27 (virtual 39.2)
+[Rede Massa Naipi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -30,3 +30,90 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 8.1)
+[RPC Cascavel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 7.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 6.1)
+[TV Tarobá Cascavel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-SaoJoseDosPinhais b/isdb-t/br-pr-SaoJoseDosPinhais
index c7f5d24a..5e64d1af 100644
--- a/isdb-t/br-pr-SaoJoseDosPinhais
+++ b/isdb-t/br-pr-SaoJoseDosPinhais
@@ -1,8 +1,8 @@
-# Channel table for São José Dos Pinhais - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3742
+# Channel table for S�o Jos� Dos Pinhais - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3742
 
 # Physical channel 15 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[TV Evangelizar]
+# Physical channel 17 (virtual 16.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 10.4)
+[TV Senado, TV Assembleia PR, Canal em teste, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -262,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 55.1)
+# Physical channel 31 (virtual 31.1)
 [Rede Super]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[RIT]
+[RIT Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -582,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 57.1)
-[Top TV]
+[Top TV Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -639,8 +668,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 50.1)
-[TV Mundial]
+# Physical channel 50 (virtual 31.1)
+[TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-pr-SaoMateusDoSul b/isdb-t/br-pr-SaoMateusDoSul
index ced60559..2f735fe5 100644
--- a/isdb-t/br-pr-SaoMateusDoSul
+++ b/isdb-t/br-pr-SaoMateusDoSul
@@ -1,5 +1,5 @@
-# Channel table for São Mateus Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/322
+# Channel table for S�o Mateus Do Sul - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=322
 
 # Physical channel 29 (virtual 29.1)
 [RPC Ponta Grossa]
diff --git a/isdb-t/br-pr-SaoMiguelDoIguacu b/isdb-t/br-pr-SaoMiguelDoIguacu
index 70b7f78a..ff8c8d6d 100644
--- a/isdb-t/br-pr-SaoMiguelDoIguacu
+++ b/isdb-t/br-pr-SaoMiguelDoIguacu
@@ -1,5 +1,5 @@
-# Channel table for São Miguel Do Iguaçu - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/269
+# Channel table for S�o Miguel Do Igua�u - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=269
 
 # Physical channel 26 (virtual 29.1)
 [RICTV Oeste]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 12.1)
-[Rede Massa Naipi]
+# Physical channel 39 (virtual 12.2)
+[Rede Massa Naipi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pr-SaoPedroDoParana b/isdb-t/br-pr-SaoPedroDoParana
index 27a0c2d0..d1a2a2c0 100644
--- a/isdb-t/br-pr-SaoPedroDoParana
+++ b/isdb-t/br-pr-SaoPedroDoParana
@@ -1,5 +1,63 @@
-# Channel table for São Pedro Do Paraná - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3835
+# Channel table for S�o Pedro Do Paran� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3835
+
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 42.1)
+[RPC Paranavaí]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 9.1)
 [CNT]
diff --git a/isdb-t/br-pr-SaoTome b/isdb-t/br-pr-SaoTome
index cc335200..fff3ac3d 100644
--- a/isdb-t/br-pr-SaoTome
+++ b/isdb-t/br-pr-SaoTome
@@ -1,5 +1,5 @@
-# Channel table for São Tomé - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3914
+# Channel table for S�o Tom� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3914
 
 # Physical channel 23 (virtual 11.1)
 [Rede Massa Tibagi]
diff --git a/isdb-t/br-pr-Sarandi b/isdb-t/br-pr-Sarandi
index d5fa0334..6f5b89b3 100644
--- a/isdb-t/br-pr-Sarandi
+++ b/isdb-t/br-pr-Sarandi
@@ -1,5 +1,5 @@
 # Channel table for Sarandi - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/339
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=339
 
 # Physical channel 14 (virtual 14.1)
 [Boa Vontade TV]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 19.1)
+# Physical channel 18 (virtual 18.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 11.1)
-[Rede Massa Tibagi]
+# Physical channel 21 (virtual 11.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 31.1)
-[TV Evangelizar]
+# Physical channel 30 (virtual 31.2)
+[TV Evangelizar, TV Lumen]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 24.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -523,7 +523,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
+# Physical channel 51 (virtual 51.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-pr-Sertanopolis b/isdb-t/br-pr-Sertanopolis
index b7dcfa0a..c62c00b3 100644
--- a/isdb-t/br-pr-Sertanopolis
+++ b/isdb-t/br-pr-Sertanopolis
@@ -1,5 +1,5 @@
-# Channel table for Sertanópolis - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1673
+# Channel table for Sertan�polis - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1673
 
 # Physical channel 23 (virtual 5.1)
 [Rede Massa Cidade]
diff --git a/isdb-t/br-pr-SiqueiraCampos b/isdb-t/br-pr-SiqueiraCampos
index 95b8f527..175a4377 100644
--- a/isdb-t/br-pr-SiqueiraCampos
+++ b/isdb-t/br-pr-SiqueiraCampos
@@ -1,5 +1,63 @@
 # Channel table for Siqueira Campos - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1699
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1699
+
+# Physical channel 16 (virtual 21.2)
+[Rede Massa Cidade, TV Escola Curitiba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 40.1)
+[TV Pai Eterno MG]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 46.1)
 [Band Curitiba]
diff --git a/isdb-t/br-pr-Tamboara b/isdb-t/br-pr-Tamboara
index ba80adbe..d9183340 100644
--- a/isdb-t/br-pr-Tamboara
+++ b/isdb-t/br-pr-Tamboara
@@ -1,5 +1,5 @@
 # Channel table for Tamboara - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3916
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3916
 
 # Physical channel 34 (virtual 13.1)
 [RICTV Maringá]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 10.1)
-[Rede Massa Tibagi]
+# Physical channel 39 (virtual 10.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-pr-Tapejara b/isdb-t/br-pr-Tapejara
index 643c1155..7a5f965f 100644
--- a/isdb-t/br-pr-Tapejara
+++ b/isdb-t/br-pr-Tapejara
@@ -1,8 +1,8 @@
 # Channel table for Tapejara - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4006
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4006
 
-# Physical channel 23 (virtual 11.1)
-[Rede Massa Tibagi]
+# Physical channel 23 (virtual 11.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-pr-TeixeiraSoares b/isdb-t/br-pr-TeixeiraSoares
index abbac5ac..7cf03800 100644
--- a/isdb-t/br-pr-TeixeiraSoares
+++ b/isdb-t/br-pr-TeixeiraSoares
@@ -1,5 +1,5 @@
 # Channel table for Teixeira Soares - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3029
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3029
 
 # Physical channel 19 (virtual 14.1)
 [Rede Vida]
diff --git a/isdb-t/br-pr-TelemacoBorba b/isdb-t/br-pr-TelemacoBorba
index 1350f511..b0fdd780 100644
--- a/isdb-t/br-pr-TelemacoBorba
+++ b/isdb-t/br-pr-TelemacoBorba
@@ -1,7 +1,7 @@
-# Channel table for Telêmaco Borba - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/483
+# Channel table for Tel�maco Borba - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=483
 
-# Physical channel 19 (virtual 41.1)
+# Physical channel 19 (virtual 29.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -30,7 +30,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 26.2)
+# Physical channel 21 (virtual 21.2)
+[Rede Massa Guará, TV Escola Curitiba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 26.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 45.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 11.1)
 [RPC Ponta Grossa]
 	DELIVERY_SYSTEM = ISDBT
@@ -89,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-pr-TerraBoa b/isdb-t/br-pr-TerraBoa
index a64300a3..0856fe12 100644
--- a/isdb-t/br-pr-TerraBoa
+++ b/isdb-t/br-pr-TerraBoa
@@ -1,8 +1,66 @@
 # Channel table for Terra Boa - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3277
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3277
 
-# Physical channel 18 (virtual 19.1)
-[Rede Vida]
+# Physical channel 14 (virtual 17.1)
+[TV Cinturão Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 16.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 18.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -30,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 11.1)
-[Rede Massa Tibagi]
+# Physical channel 21 (virtual 11.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -59,6 +117,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 22 (virtual 22.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 24.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 25 (virtual 33.1)
 [TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 26 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 27 (virtual 6.1)
 [TV Maringá]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 31.1)
-[TV Evangelizar]
+# Physical channel 30 (virtual 31.4)
+[TV Evangelizar, TV Lumen, TV Evangelizar, TV Escola]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 13.1)
-[RICTV Maringá]
+# Physical channel 33 (virtual 10.1)
+[RTV Canal 10]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +349,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 56 (virtual 56.1)
-[TV Canção Nova]
+# Physical channel 49 (virtual 52.1)
+[RICTV Maringá]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 51.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 725142857
+	FREQUENCY = 695142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pr-TerraRica b/isdb-t/br-pr-TerraRica
index 5cd4cd4b..82b3b247 100644
--- a/isdb-t/br-pr-TerraRica
+++ b/isdb-t/br-pr-TerraRica
@@ -1,37 +1,8 @@
 # Channel table for Terra Rica - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1671
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1671
 
-# Physical channel 19 (virtual 22.2)
-[Rede Mundial]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 21 (virtual 5.1)
-[Rede Massa Tibagi]
+# Physical channel 21 (virtual 5.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -59,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 13.1)
-[RICTV Maringá]
+# Physical channel 34 (virtual 13.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-pr-TerraRoxa b/isdb-t/br-pr-TerraRoxa
index ec259cfe..931f37ea 100644
--- a/isdb-t/br-pr-TerraRoxa
+++ b/isdb-t/br-pr-TerraRoxa
@@ -1,5 +1,34 @@
 # Channel table for Terra Roxa - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2344
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2344
+
+# Physical channel 38 (virtual 21.1)
+[RICTV Oeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
 [RPC Cascavel]
diff --git a/isdb-t/br-pr-Tibagi b/isdb-t/br-pr-Tibagi
index d7cdd30b..5eea64bb 100644
--- a/isdb-t/br-pr-Tibagi
+++ b/isdb-t/br-pr-Tibagi
@@ -1,5 +1,5 @@
 # Channel table for Tibagi - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/78
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=78
 
 # Physical channel 22 (virtual 22.2)
 [Rede Mundial]
diff --git a/isdb-t/br-pr-TijucasDoSul b/isdb-t/br-pr-TijucasDoSul
index cb40eae8..f275cc58 100644
--- a/isdb-t/br-pr-TijucasDoSul
+++ b/isdb-t/br-pr-TijucasDoSul
@@ -1,5 +1,5 @@
 # Channel table for Tijucas Do Sul - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3743
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3743
 
 # Physical channel 42 (virtual 42.1)
 [RPC TV]
diff --git a/isdb-t/br-pr-Toledo b/isdb-t/br-pr-Toledo
index 95c9d55b..c2628ee4 100644
--- a/isdb-t/br-pr-Toledo
+++ b/isdb-t/br-pr-Toledo
@@ -1,8 +1,8 @@
 # Channel table for Toledo - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/165
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=165
 
 # Physical channel 14 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 41.1)
-[Rede Massa Naipi]
+# Physical channel 21 (virtual 41.2)
+[Rede Massa Naipi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 7.1)
-[RICTV Oeste]
+# Physical channel 38 (virtual 7.4)
+[RICTV Oeste, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -291,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 48.1)
+[Rede Século 21]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 49 (virtual 49.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-TresBarrasDoParana b/isdb-t/br-pr-TresBarrasDoParana
index 1754e5fb..be7f5637 100644
--- a/isdb-t/br-pr-TresBarrasDoParana
+++ b/isdb-t/br-pr-TresBarrasDoParana
@@ -1,5 +1,5 @@
-# Channel table for Três Barras Do Paraná - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2364
+# Channel table for Tr�s Barras Do Paran� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2364
 
 # Physical channel 36 (virtual 6.1)
 [TV Tarobá Cascavel]
diff --git a/isdb-t/br-pr-TunasDoParana b/isdb-t/br-pr-TunasDoParana
index 7a94ee69..25077cc4 100644
--- a/isdb-t/br-pr-TunasDoParana
+++ b/isdb-t/br-pr-TunasDoParana
@@ -1,5 +1,5 @@
-# Channel table for Tunas Do Paraná - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3744
+# Channel table for Tunas Do Paran� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3744
 
 # Physical channel 27 (virtual 4.1)
 [Rede Massa Iguaçu]
diff --git a/isdb-t/br-pr-Tupassi b/isdb-t/br-pr-Tupassi
index 92c510e7..00461943 100644
--- a/isdb-t/br-pr-Tupassi
+++ b/isdb-t/br-pr-Tupassi
@@ -1,5 +1,5 @@
-# Channel table for Tupãssi - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/741
+# Channel table for Tup�ssi - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=741
 
 # Physical channel 19 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-pr-Ubirata b/isdb-t/br-pr-Ubirata
index 910138db..0fab786f 100644
--- a/isdb-t/br-pr-Ubirata
+++ b/isdb-t/br-pr-Ubirata
@@ -1,5 +1,5 @@
-# Channel table for Ubiratã - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1383
+# Channel table for Ubirat� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1383
 
 # Physical channel 23 (virtual 8.1)
 [Rede Massa Naipi]
diff --git a/isdb-t/br-pr-Umuarama b/isdb-t/br-pr-Umuarama
index c18ffcae..883d3499 100644
--- a/isdb-t/br-pr-Umuarama
+++ b/isdb-t/br-pr-Umuarama
@@ -1,5 +1,34 @@
 # Channel table for Umuarama - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/168
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=168
+
+# Physical channel 14 (virtual 26.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
 [TV Aparecida]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 18.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -59,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 20.1)
-[Rede Vida]
+# Physical channel 19 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 13.1)
-[Rede Massa Tibagi]
+# Physical channel 21 (virtual 13.2)
+[Rede Massa Tibagi, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 22 (virtual 22.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 25 (virtual 57.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -205,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 32.1)
-[TV Caiuá]
+[Rede TV! Sul]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -233,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 22.2)
-[Rede Mundial]
+# Physical channel 38 (virtual 6.1)
+[TV Tarobá Cascavel]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 6.1)
-[TV Tarobá Cascavel]
+# Physical channel 39 (virtual 39.1)
+[TV Verdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.1)
-[TV Verdade]
+# Physical channel 42 (virtual 7.1)
+[RPC Paranavaí]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 7.1)
-[RPC Paranavaí]
+# Physical channel 46 (virtual 46.1)
+[TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 665142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 11.1)
-[RICTV Maringá]
+# Physical channel 49 (virtual 11.4)
+[RICTV Maringá, Aula Paraná, Aula Paraná, Aula Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -378,3 +436,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 51.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-UniaoDaVitoria b/isdb-t/br-pr-UniaoDaVitoria
index d64308b4..0ddc6f7a 100644
--- a/isdb-t/br-pr-UniaoDaVitoria
+++ b/isdb-t/br-pr-UniaoDaVitoria
@@ -1,8 +1,8 @@
-# Channel table for União Da Vitória - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/316
+# Channel table for Uni�o Da Vit�ria - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=316
 
-# Physical channel 23 (virtual 15.1)
-[Rede Massa Guará]
+# Physical channel 23 (virtual 15.2)
+[Rede Massa Guará, TV Escola Curitiba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -59,6 +59,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 33.1)
+[TV Mill]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 38.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 44 (virtual 44.1)
 [Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-pr-VeraCruzDoOeste b/isdb-t/br-pr-VeraCruzDoOeste
index 6aeec6eb..411db87f 100644
--- a/isdb-t/br-pr-VeraCruzDoOeste
+++ b/isdb-t/br-pr-VeraCruzDoOeste
@@ -1,7 +1,7 @@
 # Channel table for Vera Cruz Do Oeste - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3808
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3808
 
-# Physical channel 16 (virtual 14.1)
+# Physical channel 16 (virtual 16.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
-[RCI]
+# Physical channel 40 (virtual 57.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Gazeta]
+# Physical channel 41 (virtual 41.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -378,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 57 (virtual 57.1)
-[RIT]
+# Physical channel 45 (virtual 52.1)
+[TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 731142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-pr-Vere b/isdb-t/br-pr-Vere
index 273ba055..271a8e05 100644
--- a/isdb-t/br-pr-Vere
+++ b/isdb-t/br-pr-Vere
@@ -1,5 +1,5 @@
-# Channel table for Verê - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1749
+# Channel table for Ver� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1749
 
 # Physical channel 19 (virtual 50.1)
 [Rede Vida]
diff --git a/isdb-t/br-pr-WenceslauBraz b/isdb-t/br-pr-WenceslauBraz
new file mode 100644
index 00000000..e9a5542b
--- /dev/null
+++ b/isdb-t/br-pr-WenceslauBraz
@@ -0,0 +1,32 @@
+# Channel table for Wenceslau Braz - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1447
+
+# Physical channel 42 (virtual 33.1)
+[RPC Ponta Grossa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-pr-Xambre b/isdb-t/br-pr-Xambre
index af92450a..c5c78abd 100644
--- a/isdb-t/br-pr-Xambre
+++ b/isdb-t/br-pr-Xambre
@@ -1,5 +1,5 @@
-# Channel table for Xambrê - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3994
+# Channel table for Xambr� - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3994
 
 # Physical channel 21 (virtual 13.1)
 [Rede Massa Tibagi]
diff --git a/isdb-t/br-pr-Angulo b/isdb-t/br-pr-angulo
index 0e52d6f8..f6281b7f 100644
--- a/isdb-t/br-pr-Angulo
+++ b/isdb-t/br-pr-angulo
@@ -1,5 +1,5 @@
-# Channel table for Ângulo - PR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3774
+# Channel table for �ngulo - PR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3774
 
 # Physical channel 14 (virtual 14.1)
 [Boa Vontade TV]
@@ -30,35 +30,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 17.3)
-[TV Cultura, Univesp, Multicultura]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 18 (virtual 19.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rj-AngraDosReis b/isdb-t/br-rj-AngraDosReis
index 15922b0b..4685ec0d 100644
--- a/isdb-t/br-rj-AngraDosReis
+++ b/isdb-t/br-rj-AngraDosReis
@@ -1,5 +1,5 @@
 # Channel table for Angra Dos Reis - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/416
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=416
 
 # Physical channel 15 (virtual 29.1)
 [Band Rio Interior]
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 51.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-rj-AngraDosReis(mambucaba) b/isdb-t/br-rj-AngraDosReis(mambucaba)
index df828f33..1a4d9472 100644
--- a/isdb-t/br-rj-AngraDosReis(mambucaba)
+++ b/isdb-t/br-rj-AngraDosReis(mambucaba)
@@ -1,5 +1,5 @@
 # Channel table for Angra Dos Reis (mambucaba) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/607
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=607
 
 # Physical channel 28 (virtual 27.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Aperibe b/isdb-t/br-rj-Aperibe
index b97e3c71..7612132d 100644
--- a/isdb-t/br-rj-Aperibe
+++ b/isdb-t/br-rj-Aperibe
@@ -1,5 +1,5 @@
-# Channel table for Aperibé - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3821
+# Channel table for Aperib� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3821
 
 # Physical channel 30 (virtual 30.1)
 [InterTV Serramar]
diff --git a/isdb-t/br-rj-Araruama b/isdb-t/br-rj-Araruama
index 12b23201..c49aeeb0 100644
--- a/isdb-t/br-rj-Araruama
+++ b/isdb-t/br-rj-Araruama
@@ -1,7 +1,7 @@
 # Channel table for Araruama - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/905
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=905
 
-# Physical channel 23 (virtual 23.1)
+# Physical channel 23 (virtual 5.1)
 [SBT Interior/RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 43.1)
+# Physical channel 34 (virtual 34.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 15.1)
+# Physical channel 35 (virtual 30.1)
 [Band Rio Interior]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,3 +146,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 51.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 48.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rj-Areal b/isdb-t/br-rj-Areal
index 41aef2c0..7d5e7cb6 100644
--- a/isdb-t/br-rj-Areal
+++ b/isdb-t/br-rj-Areal
@@ -1,5 +1,5 @@
 # Channel table for Areal - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3902
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3902
 
 # Physical channel 30 (virtual 30.1)
 [InterTV Serramar]
diff --git a/isdb-t/br-rj-ArmacaoDosBuzios b/isdb-t/br-rj-ArmacaoDosBuzios
index 41e39d0f..85bda937 100644
--- a/isdb-t/br-rj-ArmacaoDosBuzios
+++ b/isdb-t/br-rj-ArmacaoDosBuzios
@@ -1,5 +1,5 @@
-# Channel table for Armação Dos Búzios - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3320
+# Channel table for Arma��o Dos B�zios - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3320
 
 # Physical channel 23 (virtual 5.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-ArraialDoCabo b/isdb-t/br-rj-ArraialDoCabo
index e2c48a56..70a2564d 100644
--- a/isdb-t/br-rj-ArraialDoCabo
+++ b/isdb-t/br-rj-ArraialDoCabo
@@ -1,5 +1,5 @@
 # Channel table for Arraial Do Cabo - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2264
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2264
 
 # Physical channel 17 (virtual 59.1)
 [TV Canção Nova]
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
-[RIT]
+# Physical channel 43 (virtual 19.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 53 (virtual 19.1)
-[Record News]
+# Physical channel 48 (virtual 48.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 707142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rj-BarraDoPirai b/isdb-t/br-rj-BarraDoPirai
index 0bc5292c..c2319f42 100644
--- a/isdb-t/br-rj-BarraDoPirai
+++ b/isdb-t/br-rj-BarraDoPirai
@@ -1,5 +1,5 @@
-# Channel table for Barra Do Piraí - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/903
+# Channel table for Barra Do Pira� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=903
 
 # Physical channel 24 (virtual 7.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-BarraDoPirai(california) b/isdb-t/br-rj-BarraDoPirai(california)
index d86aba58..0c602776 100644
--- a/isdb-t/br-rj-BarraDoPirai(california)
+++ b/isdb-t/br-rj-BarraDoPirai(california)
@@ -1,5 +1,5 @@
-# Channel table for Barra Do Piraí (califórnia) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3360
+# Channel table for Barra Do Pira� (calif�rnia) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3360
 
 # Physical channel 24 (virtual 12.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-BarraDoPirai(dorandia) b/isdb-t/br-rj-BarraDoPirai(dorandia)
index eb22827f..99ad3105 100644
--- a/isdb-t/br-rj-BarraDoPirai(dorandia)
+++ b/isdb-t/br-rj-BarraDoPirai(dorandia)
@@ -1,5 +1,5 @@
-# Channel table for Barra Do Piraí (dorândia) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3427
+# Channel table for Barra Do Pira� (dor�ndia) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3427
 
 # Physical channel 31 (virtual 5.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-BarraDoPirai(ipiabas) b/isdb-t/br-rj-BarraDoPirai(ipiabas)
index 34ce2f22..5317f3ba 100644
--- a/isdb-t/br-rj-BarraDoPirai(ipiabas)
+++ b/isdb-t/br-rj-BarraDoPirai(ipiabas)
@@ -1,5 +1,5 @@
-# Channel table for Barra Do Piraí (ipiabas) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3866
+# Channel table for Barra Do Pira� (ipiabas) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3866
 
 # Physical channel 30 (virtual 30.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-BarraDoPirai(vargemAlegre) b/isdb-t/br-rj-BarraDoPirai(vargemAlegre)
index 9abfdaf4..f53fdea2 100644
--- a/isdb-t/br-rj-BarraDoPirai(vargemAlegre)
+++ b/isdb-t/br-rj-BarraDoPirai(vargemAlegre)
@@ -1,5 +1,5 @@
-# Channel table for Barra Do Piraí (vargem Alegre) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3426
+# Channel table for Barra Do Pira� (vargem Alegre) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3426
 
 # Physical channel 30 (virtual 3.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-BarraMansa b/isdb-t/br-rj-BarraMansa
index e7a3b73f..4480137f 100644
--- a/isdb-t/br-rj-BarraMansa
+++ b/isdb-t/br-rj-BarraMansa
@@ -1,5 +1,5 @@
 # Channel table for Barra Mansa - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/401
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=401
 
 # Physical channel 24 (virtual 12.1)
 [SBT Interior/RJ]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 14.1)
-[Rede Vida]
+# Physical channel 26 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -175,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 16.1)
+[TV Diversa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 44 (virtual 56.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,3 +233,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 48.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 22.1)
+[CNT Rio]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rj-BelfordRoxo b/isdb-t/br-rj-BelfordRoxo
index 2899ceeb..7028bf82 100644
--- a/isdb-t/br-rj-BelfordRoxo
+++ b/isdb-t/br-rj-BelfordRoxo
@@ -1,5 +1,34 @@
 # Channel table for Belford Roxo - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3600
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3600
+
+# Physical channel 15 (virtual 10.4)
+[TV Senado, TV ALERJ, Rio TV Câmara, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
 [RBI TV]
@@ -30,8 +59,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 18 (virtual 23.1)
+[SBT Interior/RJ]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 20 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -59,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 38.1)
+[Record TV Rio]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 27 (virtual 9.1)
 [CNT Rio]
 	DELIVERY_SYSTEM = ISDBT
@@ -176,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,6 +320,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 43.1)
+[Band Rio Interior]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 7.1)
 [Band Rio]
 	DELIVERY_SYSTEM = ISDBT
@@ -321,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 5.1)
-[Boas Novas]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -349,7 +465,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 42.1)
+# Physical channel 43 (virtual 52.1)
 [Record News RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -466,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -523,8 +639,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.1)
-[Rede Brasil]
+# Physical channel 49 (virtual 49.1)
+[TV Boaventura]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 50.1)
+[TV O Dia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 15.1)
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rj-BomJesusDoItabapoana b/isdb-t/br-rj-BomJesusDoItabapoana
index aff963bf..c9db988a 100644
--- a/isdb-t/br-rj-BomJesusDoItabapoana
+++ b/isdb-t/br-rj-BomJesusDoItabapoana
@@ -1,5 +1,5 @@
 # Channel table for Bom Jesus Do Itabapoana - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2272
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2272
 
 # Physical channel 39 (virtual 9.1)
 [Record TV Interior RJ]
diff --git a/isdb-t/br-rj-CaboFrio b/isdb-t/br-rj-CaboFrio
index ec3447e4..5d0acd9f 100644
--- a/isdb-t/br-rj-CaboFrio
+++ b/isdb-t/br-rj-CaboFrio
@@ -1,5 +1,5 @@
 # Channel table for Cabo Frio - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/309
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=309
 
 # Physical channel 17 (virtual 59.1)
 [TV Canção Nova]
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
-[RIT]
+# Physical channel 43 (virtual 19.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 53 (virtual 19.1)
-[Record News]
+# Physical channel 48 (virtual 48.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 707142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rj-CachoeirasDeMacacu b/isdb-t/br-rj-CachoeirasDeMacacu
index b0bcde37..b35053c7 100644
--- a/isdb-t/br-rj-CachoeirasDeMacacu
+++ b/isdb-t/br-rj-CachoeirasDeMacacu
@@ -1,5 +1,5 @@
 # Channel table for Cachoeiras De Macacu - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3103
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3103
 
 # Physical channel 23 (virtual 23.1)
 [SBT Rio]
diff --git a/isdb-t/br-rj-Cambuci b/isdb-t/br-rj-Cambuci
index 4e1361cc..7f73a82f 100644
--- a/isdb-t/br-rj-Cambuci
+++ b/isdb-t/br-rj-Cambuci
@@ -1,5 +1,5 @@
 # Channel table for Cambuci - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/906
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=906
 
 # Physical channel 24 (virtual 11.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-CamposDosGoytacazes b/isdb-t/br-rj-CamposDosGoytacazes
index 5ac7179b..38368b59 100644
--- a/isdb-t/br-rj-CamposDosGoytacazes
+++ b/isdb-t/br-rj-CamposDosGoytacazes
@@ -1,5 +1,5 @@
 # Channel table for Campos Dos Goytacazes - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/127
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=127
 
 # Physical channel 15 (virtual 2.1)
 [Band Rio Interior]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 19 (virtual 19.4)
-[TV Câmara, TV ALERJ, TV Câmara Municipal Campos, TV Senado]
+[TV Câmara, TV ALERJ, TV Câmara Campos, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -233,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 59.1)
+# Physical channel 44 (virtual 5.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rj-Cantagalo b/isdb-t/br-rj-Cantagalo
index 22066ff4..dd1323cb 100644
--- a/isdb-t/br-rj-Cantagalo
+++ b/isdb-t/br-rj-Cantagalo
@@ -1,5 +1,5 @@
 # Channel table for Cantagalo - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1462
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1462
 
 # Physical channel 24 (virtual 11.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Carapebus b/isdb-t/br-rj-Carapebus
index b2ca9ca4..15cee28b 100644
--- a/isdb-t/br-rj-Carapebus
+++ b/isdb-t/br-rj-Carapebus
@@ -1,5 +1,5 @@
 # Channel table for Carapebus - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3832
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3832
 
 # Physical channel 33 (virtual 33.1)
 [InterTV Alto Litoral]
diff --git a/isdb-t/br-rj-CardosoMoreira b/isdb-t/br-rj-CardosoMoreira
index 63d2bc60..82ab1b39 100644
--- a/isdb-t/br-rj-CardosoMoreira
+++ b/isdb-t/br-rj-CardosoMoreira
@@ -1,5 +1,5 @@
 # Channel table for Cardoso Moreira - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2274
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2274
 
 # Physical channel 30 (virtual 30.1)
 [InterTV Serramar]
diff --git a/isdb-t/br-rj-Carmo b/isdb-t/br-rj-Carmo
index d6b66840..6619b9f6 100644
--- a/isdb-t/br-rj-Carmo
+++ b/isdb-t/br-rj-Carmo
@@ -1,5 +1,5 @@
 # Channel table for Carmo - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2273
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2273
 
 # Physical channel 33 (virtual 33.1)
 [InterTV Serramar]
diff --git a/isdb-t/br-rj-CasimiroDeAbreu b/isdb-t/br-rj-CasimiroDeAbreu
index 8be36c41..01d71c5e 100644
--- a/isdb-t/br-rj-CasimiroDeAbreu
+++ b/isdb-t/br-rj-CasimiroDeAbreu
@@ -1,5 +1,5 @@
 # Channel table for Casimiro De Abreu - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2275
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2275
 
 # Physical channel 15 (virtual 7.1)
 [Band Rio Interior]
diff --git a/isdb-t/br-rj-ComendadorLevyGasparian b/isdb-t/br-rj-ComendadorLevyGasparian
index bdf60670..f8f134de 100644
--- a/isdb-t/br-rj-ComendadorLevyGasparian
+++ b/isdb-t/br-rj-ComendadorLevyGasparian
@@ -1,5 +1,5 @@
 # Channel table for Comendador Levy Gasparian - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2278
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2278
 
 # Physical channel 28 (virtual 13.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Cordeiro b/isdb-t/br-rj-Cordeiro
index a0647e6f..9f11af52 100644
--- a/isdb-t/br-rj-Cordeiro
+++ b/isdb-t/br-rj-Cordeiro
@@ -1,5 +1,5 @@
 # Channel table for Cordeiro - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2276
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2276
 
 # Physical channel 44 (virtual 44.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-rj-DuqueDeCaxias b/isdb-t/br-rj-DuqueDeCaxias
index c41aba7a..7c442909 100644
--- a/isdb-t/br-rj-DuqueDeCaxias
+++ b/isdb-t/br-rj-DuqueDeCaxias
@@ -1,5 +1,34 @@
 # Channel table for Duque De Caxias - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/864
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=864
+
+# Physical channel 15 (virtual 10.4)
+[TV Senado, TV ALERJ, Rio TV Câmara, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
 [RBI TV]
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -465,7 +494,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 42.1)
+# Physical channel 43 (virtual 52.1)
 [Record News RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -582,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-rj-EngenheiroPauloDeFrontin b/isdb-t/br-rj-EngenheiroPauloDeFrontin
index bd7baf0c..8e4a79b9 100644
--- a/isdb-t/br-rj-EngenheiroPauloDeFrontin
+++ b/isdb-t/br-rj-EngenheiroPauloDeFrontin
@@ -1,5 +1,5 @@
 # Channel table for Engenheiro Paulo De Frontin - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2279
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2279
 
 # Physical channel 22 (virtual 34.1)
 [Rede Vida]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-rj-Guapimirim b/isdb-t/br-rj-Guapimirim
index 7418f3ce..4a876ae0 100644
--- a/isdb-t/br-rj-Guapimirim
+++ b/isdb-t/br-rj-Guapimirim
@@ -1,5 +1,5 @@
 # Channel table for Guapimirim - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3597
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3597
 
 # Physical channel 39 (virtual 13.1)
 [Record TV Rio]
diff --git a/isdb-t/br-rj-IguabaGrande b/isdb-t/br-rj-IguabaGrande
index a59d776b..84d87657 100644
--- a/isdb-t/br-rj-IguabaGrande
+++ b/isdb-t/br-rj-IguabaGrande
@@ -1,5 +1,5 @@
 # Channel table for Iguaba Grande - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3908
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3908
 
 # Physical channel 31 (virtual 31.1)
 [InterTV Alto Litoral]
@@ -30,32 +30,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 59 (virtual 59.1)
-[TV Canção Nova]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 743142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-rj-Itaborai b/isdb-t/br-rj-Itaborai
index 4e819783..da52115d 100644
--- a/isdb-t/br-rj-Itaborai
+++ b/isdb-t/br-rj-Itaborai
@@ -1,5 +1,5 @@
-# Channel table for Itaboraí - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3598
+# Channel table for Itabora� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3598
 
 # Physical channel 16 (virtual 16.1)
 [RBI TV]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 2.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-rj-Itaguai b/isdb-t/br-rj-Itaguai
index cc63c46a..3c99d11b 100644
--- a/isdb-t/br-rj-Itaguai
+++ b/isdb-t/br-rj-Itaguai
@@ -1,5 +1,5 @@
-# Channel table for Itaguaí - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/84
+# Channel table for Itagua� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=84
 
 # Physical channel 22 (virtual 33.1)
 [Rede Vida]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-rj-Italva b/isdb-t/br-rj-Italva
index 44af1c5b..53c0c218 100644
--- a/isdb-t/br-rj-Italva
+++ b/isdb-t/br-rj-Italva
@@ -1,5 +1,5 @@
 # Channel table for Italva - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2281
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2281
 
 # Physical channel 30 (virtual 30.1)
 [InterTV Serramar]
diff --git a/isdb-t/br-rj-Itaperuna b/isdb-t/br-rj-Itaperuna
index 2ffcf84e..34126e86 100644
--- a/isdb-t/br-rj-Itaperuna
+++ b/isdb-t/br-rj-Itaperuna
@@ -1,5 +1,5 @@
 # Channel table for Itaperuna - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/128
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=128
 
 # Physical channel 22 (virtual 7.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Itatiaia b/isdb-t/br-rj-Itatiaia
index 675fff4b..30925884 100644
--- a/isdb-t/br-rj-Itatiaia
+++ b/isdb-t/br-rj-Itatiaia
@@ -1,5 +1,5 @@
 # Channel table for Itatiaia - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2265
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2265
 
 # Physical channel 23 (virtual 29.1)
 [SBT Interior/RJ]
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 45.1)
-[Rede Vida]
+# Physical channel 34 (virtual 45.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -175,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 48.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rj-Japeri b/isdb-t/br-rj-Japeri
index f218daf9..573b7494 100644
--- a/isdb-t/br-rj-Japeri
+++ b/isdb-t/br-rj-Japeri
@@ -1,8 +1,8 @@
 # Channel table for Japeri - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3393
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3393
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,6 +233,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 44.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rj-Japeri(eng.Pedreira) b/isdb-t/br-rj-Japeri(eng.Pedreira)
index 5518de81..cf9c2902 100644
--- a/isdb-t/br-rj-Japeri(eng.Pedreira)
+++ b/isdb-t/br-rj-Japeri(eng.Pedreira)
@@ -1,8 +1,8 @@
 # Channel table for Japeri (eng. Pedreira) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3394
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3394
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-rj-LajeDoMuriae b/isdb-t/br-rj-LajeDoMuriae
index d43bbf51..7fd24442 100644
--- a/isdb-t/br-rj-LajeDoMuriae
+++ b/isdb-t/br-rj-LajeDoMuriae
@@ -1,5 +1,5 @@
-# Channel table for Laje Do Muriaé - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3919
+# Channel table for Laje Do Muria� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3919
 
 # Physical channel 30 (virtual 30.1)
 [InterTV Serramar]
diff --git a/isdb-t/br-rj-Macae b/isdb-t/br-rj-Macae
index c513c4b1..470350f8 100644
--- a/isdb-t/br-rj-Macae
+++ b/isdb-t/br-rj-Macae
@@ -1,5 +1,5 @@
-# Channel table for Macaé - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/481
+# Channel table for Maca� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=481
 
 # Physical channel 15 (virtual 56.1)
 [Band Rio Interior]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 11.1)
-[Rede Vida]
+# Physical channel 25 (virtual 23.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 12.1)
+# Physical channel 38 (virtual 21.1)
 [Record TV Interior RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rj-Macuco b/isdb-t/br-rj-Macuco
index 4fea816f..b321438c 100644
--- a/isdb-t/br-rj-Macuco
+++ b/isdb-t/br-rj-Macuco
@@ -1,5 +1,5 @@
 # Channel table for Macuco - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3838
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3838
 
 # Physical channel 30 (virtual 30.1)
 [InterTV Serramar]
diff --git a/isdb-t/br-rj-Mage b/isdb-t/br-rj-Mage
index ce0286ff..ae1104b1 100644
--- a/isdb-t/br-rj-Mage
+++ b/isdb-t/br-rj-Mage
@@ -1,5 +1,5 @@
-# Channel table for Magé - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3599
+# Channel table for Mag� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3599
 
 # Physical channel 18 (virtual 23.1)
 [SBT Interior/RJ]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-rj-Mangaratiba b/isdb-t/br-rj-Mangaratiba
index aa21b204..ac76c839 100644
--- a/isdb-t/br-rj-Mangaratiba
+++ b/isdb-t/br-rj-Mangaratiba
@@ -1,5 +1,34 @@
 # Channel table for Mangaratiba - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2283
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2283
+
+# Physical channel 15 (virtual 14.1)
+[Band Rio Interior]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
 [RBI TV]
@@ -30,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -147,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -175,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 7.1)
-[Band Rio]
+# Physical channel 38 (virtual 38.1)
+[Record TV Rio]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 38.1)
-[Record TV Rio]
+# Physical channel 41 (virtual 2.4)
+[TV Brasil, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 2.4)
-[TV Brasil, TV Brasil 2, TV Escola, Canal Saúde]
+# Physical channel 44 (virtual 44.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 47.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-rj-Marica b/isdb-t/br-rj-Marica
index de5589c4..2051d3c0 100644
--- a/isdb-t/br-rj-Marica
+++ b/isdb-t/br-rj-Marica
@@ -1,5 +1,5 @@
-# Channel table for Maricá - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/139
+# Channel table for Maric� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=139
 
 # Physical channel 15 (virtual 7.1)
 [Band Rio]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,6 +233,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 40.1)
+[TV Vila Real]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 13.1)
 [Record TV Rio]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rj-Mendes b/isdb-t/br-rj-Mendes
index 40b0c446..d8144c8b 100644
--- a/isdb-t/br-rj-Mendes
+++ b/isdb-t/br-rj-Mendes
@@ -1,5 +1,5 @@
 # Channel table for Mendes - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2284
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2284
 
 # Physical channel 30 (virtual 9.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Mesquita b/isdb-t/br-rj-Mesquita
index 7c2ae998..95963385 100644
--- a/isdb-t/br-rj-Mesquita
+++ b/isdb-t/br-rj-Mesquita
@@ -1,5 +1,5 @@
 # Channel table for Mesquita - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3367
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3367
 
 # Physical channel 16 (virtual 16.1)
 [RBI TV]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-rj-MiguelPereira b/isdb-t/br-rj-MiguelPereira
index 6f1654de..13ab5cef 100644
--- a/isdb-t/br-rj-MiguelPereira
+++ b/isdb-t/br-rj-MiguelPereira
@@ -1,5 +1,5 @@
 # Channel table for Miguel Pereira - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2285
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2285
 
 # Physical channel 23 (virtual 39.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Miracema b/isdb-t/br-rj-Miracema
index d5d657b6..f024df92 100644
--- a/isdb-t/br-rj-Miracema
+++ b/isdb-t/br-rj-Miracema
@@ -1,5 +1,5 @@
 # Channel table for Miracema - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2282
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2282
 
 # Physical channel 24 (virtual 24.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Nilopolis b/isdb-t/br-rj-Nilopolis
index 15ac581c..6331db8c 100644
--- a/isdb-t/br-rj-Nilopolis
+++ b/isdb-t/br-rj-Nilopolis
@@ -1,5 +1,5 @@
-# Channel table for Nilópolis - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3366
+# Channel table for Nil�polis - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3366
 
 # Physical channel 16 (virtual 16.1)
 [RBI TV]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-rj-Niteroi b/isdb-t/br-rj-Niteroi
index 41a4315a..c598235a 100644
--- a/isdb-t/br-rj-Niteroi
+++ b/isdb-t/br-rj-Niteroi
@@ -1,5 +1,34 @@
-# Channel table for Niterói - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3595
+# Channel table for Niter�i - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3595
+
+# Physical channel 15 (virtual 10.4)
+[TV Senado, TV ALERJ, Rio TV Câmara, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
 [RBI TV]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -59,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV!]
+# Physical channel 21 (virtual 6.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -176,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,6 +262,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 40.1)
+[TV Vila Real]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 7.1)
 [Band Rio]
 	DELIVERY_SYSTEM = ISDBT
@@ -321,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 5.1)
-[Boas Novas]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -349,7 +407,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 42.1)
+# Physical channel 43 (virtual 52.1)
 [Record News RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -466,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -524,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RIT]
+[TV Boaventura]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -582,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 51.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rj-NovaFriburgo b/isdb-t/br-rj-NovaFriburgo
index d6f410ff..a766020d 100644
--- a/isdb-t/br-rj-NovaFriburgo
+++ b/isdb-t/br-rj-NovaFriburgo
@@ -1,5 +1,5 @@
 # Channel table for Nova Friburgo - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/664
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=664
 
 # Physical channel 24 (virtual 3.1)
 [SBT Interior/RJ]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 25.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-rj-NovaIguacu b/isdb-t/br-rj-NovaIguacu
index d6f0360e..712c2458 100644
--- a/isdb-t/br-rj-NovaIguacu
+++ b/isdb-t/br-rj-NovaIguacu
@@ -1,11 +1,11 @@
-# Channel table for Nova Iguaçu - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2965
+# Channel table for Nova Igua�u - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2965
 
-# Physical channel 20 (virtual 20.1)
-[RCI]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 23 (virtual 11.1)
+[SBT Rio]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 11.1)
-[SBT Rio]
+# Physical channel 29 (virtual 4.1)
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 4.1)
-[Rede Globo]
+# Physical channel 34 (virtual 7.2)
+[Band Rio, Escola Rio]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 7.1)
-[Band Rio]
+# Physical channel 39 (virtual 13.1)
+[Record TV Rio]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 13.1)
-[Record TV Rio]
+# Physical channel 41 (virtual 2.4)
+[TV Brasil, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-rj-Paracambi b/isdb-t/br-rj-Paracambi
index 3d02dc34..08bc3b28 100644
--- a/isdb-t/br-rj-Paracambi
+++ b/isdb-t/br-rj-Paracambi
@@ -1,5 +1,5 @@
 # Channel table for Paracambi - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2288
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2288
 
 # Physical channel 23 (virtual 5.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Paracambi(cascata) b/isdb-t/br-rj-Paracambi(cascata)
new file mode 100644
index 00000000..b522c59d
--- /dev/null
+++ b/isdb-t/br-rj-Paracambi(cascata)
@@ -0,0 +1,148 @@
+# Channel table for Paracambi (cascata) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3399
+
+# Physical channel 16 (virtual 16.1)
+[Band Rio Interior]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 18.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 30.1)
+[TV Rio Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 40.1)
+[SBT Interior/RJ]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[Record TV Rio]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rj-ParaibaDoSul b/isdb-t/br-rj-ParaibaDoSul
index c22ad794..e98526fd 100644
--- a/isdb-t/br-rj-ParaibaDoSul
+++ b/isdb-t/br-rj-ParaibaDoSul
@@ -1,5 +1,5 @@
-# Channel table for Paraíba Do Sul - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2287
+# Channel table for Para�ba Do Sul - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2287
 
 # Physical channel 24 (virtual 25.1)
 [SBT Interior/RJ]
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 19.1)
-[TV Canção Nova]
+# Physical channel 39 (virtual 13.1)
+[Record TV Rio]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 52 (virtual 13.1)
-[Record TV Rio]
+# Physical channel 44 (virtual 19.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 701142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rj-Paraty b/isdb-t/br-rj-Paraty
index 3721cf05..bdf6a03b 100644
--- a/isdb-t/br-rj-Paraty
+++ b/isdb-t/br-rj-Paraty
@@ -1,5 +1,34 @@
 # Channel table for Paraty - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/643
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=643
+
+# Physical channel 15 (virtual 11.1)
+[Band Rio Interior]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 14.1)
 [Rede Vida]
diff --git a/isdb-t/br-rj-PatyDoAlferes b/isdb-t/br-rj-PatyDoAlferes
index 6190b133..999df5ea 100644
--- a/isdb-t/br-rj-PatyDoAlferes
+++ b/isdb-t/br-rj-PatyDoAlferes
@@ -1,5 +1,5 @@
 # Channel table for Paty Do Alferes - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1550
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1550
 
 # Physical channel 23 (virtual 23.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-PatyDoAlferes(avelar) b/isdb-t/br-rj-PatyDoAlferes(avelar)
index 0687833d..c3acd8fe 100644
--- a/isdb-t/br-rj-PatyDoAlferes(avelar)
+++ b/isdb-t/br-rj-PatyDoAlferes(avelar)
@@ -1,5 +1,5 @@
 # Channel table for Paty Do Alferes (avelar) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3898
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3898
 
 # Physical channel 30 (virtual 7.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Petropolis b/isdb-t/br-rj-Petropolis
index 2131838d..4a0271c3 100644
--- a/isdb-t/br-rj-Petropolis
+++ b/isdb-t/br-rj-Petropolis
@@ -1,5 +1,5 @@
-# Channel table for Petrópolis - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/659
+# Channel table for Petr�polis - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=659
 
 # Physical channel 18 (virtual 23.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Pinheiral b/isdb-t/br-rj-Pinheiral
index 15e7df5e..5346d9e1 100644
--- a/isdb-t/br-rj-Pinheiral
+++ b/isdb-t/br-rj-Pinheiral
@@ -1,5 +1,5 @@
 # Channel table for Pinheiral - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3419
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3419
 
 # Physical channel 30 (virtual 9.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Pirai b/isdb-t/br-rj-Pirai
index 21c8f899..f726f287 100644
--- a/isdb-t/br-rj-Pirai
+++ b/isdb-t/br-rj-Pirai
@@ -1,5 +1,5 @@
-# Channel table for Piraí - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/904
+# Channel table for Pira� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=904
 
 # Physical channel 23 (virtual 11.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Pirai(arrozal) b/isdb-t/br-rj-Pirai(arrozal)
index 546ffe65..33d6d492 100644
--- a/isdb-t/br-rj-Pirai(arrozal)
+++ b/isdb-t/br-rj-Pirai(arrozal)
@@ -1,5 +1,5 @@
-# Channel table for Piraí (arrozal) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3854
+# Channel table for Pira� (arrozal) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3854
 
 # Physical channel 28 (virtual 5.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Pirai(santanesia) b/isdb-t/br-rj-Pirai(santanesia)
index f875eb4d..82d16f54 100644
--- a/isdb-t/br-rj-Pirai(santanesia)
+++ b/isdb-t/br-rj-Pirai(santanesia)
@@ -1,5 +1,5 @@
-# Channel table for Piraí (santanésia) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2488
+# Channel table for Pira� (santan�sia) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2488
 
 # Physical channel 28 (virtual 10.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-PortoReal b/isdb-t/br-rj-PortoReal
index c79563f0..aa2c6027 100644
--- a/isdb-t/br-rj-PortoReal
+++ b/isdb-t/br-rj-PortoReal
@@ -1,5 +1,5 @@
 # Channel table for Porto Real - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3420
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3420
 
 # Physical channel 28 (virtual 13.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Quatis b/isdb-t/br-rj-Quatis
index 63a355fc..249a8a09 100644
--- a/isdb-t/br-rj-Quatis
+++ b/isdb-t/br-rj-Quatis
@@ -1,5 +1,5 @@
 # Channel table for Quatis - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3421
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3421
 
 # Physical channel 30 (virtual 11.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Queimados b/isdb-t/br-rj-Queimados
index 82d86db0..9a7c552b 100644
--- a/isdb-t/br-rj-Queimados
+++ b/isdb-t/br-rj-Queimados
@@ -1,8 +1,8 @@
 # Channel table for Queimados - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/924
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=924
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-rj-Quissama b/isdb-t/br-rj-Quissama
index a8cb1207..df36a0d7 100644
--- a/isdb-t/br-rj-Quissama
+++ b/isdb-t/br-rj-Quissama
@@ -1,11 +1,11 @@
-# Channel table for Quissamã - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1316
+# Channel table for Quissam� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1316
 
-# Physical channel 15 (virtual 2.1)
-[Band Rio Interior]
+# Physical channel 24 (virtual 26.1)
+[SBT Interior/RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 479142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 26.1)
-[SBT Interior/RJ]
+# Physical channel 34 (virtual 25.1)
+[Band Rio]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rj-Resende b/isdb-t/br-rj-Resende
index df08a5c3..0ab37fff 100644
--- a/isdb-t/br-rj-Resende
+++ b/isdb-t/br-rj-Resende
@@ -1,5 +1,5 @@
 # Channel table for Resende - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/6
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=6
 
 # Physical channel 17 (virtual 15.1)
 [Band Rio Interior]
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 45.1)
-[Rede Vida]
+# Physical channel 34 (virtual 45.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -175,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 48.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rj-Resende(engenheiroPassos) b/isdb-t/br-rj-Resende(engenheiroPassos)
index 2ecd2c33..e6a32511 100644
--- a/isdb-t/br-rj-Resende(engenheiroPassos)
+++ b/isdb-t/br-rj-Resende(engenheiroPassos)
@@ -1,5 +1,5 @@
 # Channel table for Resende (engenheiro Passos) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3553
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3553
 
 # Physical channel 29 (virtual 9.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Resende(vargemGrande) b/isdb-t/br-rj-Resende(vargemGrande)
index 5c882568..609c9c91 100644
--- a/isdb-t/br-rj-Resende(vargemGrande)
+++ b/isdb-t/br-rj-Resende(vargemGrande)
@@ -1,5 +1,5 @@
 # Channel table for Resende (vargem Grande) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3460
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3460
 
 # Physical channel 28 (virtual 9.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Resende(viscondeDeMaua) b/isdb-t/br-rj-Resende(viscondeDeMaua)
index 2ac066fc..8bed5457 100644
--- a/isdb-t/br-rj-Resende(viscondeDeMaua)
+++ b/isdb-t/br-rj-Resende(viscondeDeMaua)
@@ -1,5 +1,5 @@
-# Channel table for Resende (visconde De Mauá) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2628
+# Channel table for Resende (visconde De Mau�) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2628
 
 # Physical channel 23 (virtual 40.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-RioBonito b/isdb-t/br-rj-RioBonito
index 696fd6c9..decc7a11 100644
--- a/isdb-t/br-rj-RioBonito
+++ b/isdb-t/br-rj-RioBonito
@@ -1,5 +1,5 @@
 # Channel table for Rio Bonito - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2290
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2290
 
 # Physical channel 24 (virtual 58.1)
 [SBT Interior/RJ]
@@ -88,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 44.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rj-RioClaro b/isdb-t/br-rj-RioClaro
index d85f4f0f..922b800b 100644
--- a/isdb-t/br-rj-RioClaro
+++ b/isdb-t/br-rj-RioClaro
@@ -1,5 +1,5 @@
 # Channel table for Rio Claro - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2289
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2289
 
 # Physical channel 28 (virtual 9.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-RioClaro(lidice) b/isdb-t/br-rj-RioClaro(lidice)
index 4a8999aa..6363042a 100644
--- a/isdb-t/br-rj-RioClaro(lidice)
+++ b/isdb-t/br-rj-RioClaro(lidice)
@@ -1,5 +1,5 @@
-# Channel table for Rio Claro (lídice) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3448
+# Channel table for Rio Claro (l�dice) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3448
 
 # Physical channel 28 (virtual 28.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-RioDasFlores b/isdb-t/br-rj-RioDasFlores
index 5764ef84..0d65b56a 100644
--- a/isdb-t/br-rj-RioDasFlores
+++ b/isdb-t/br-rj-RioDasFlores
@@ -1,5 +1,5 @@
 # Channel table for Rio Das Flores - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2487
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2487
 
 # Physical channel 29 (virtual 9.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-RioDasFlores(taboas) b/isdb-t/br-rj-RioDasFlores(taboas)
index aff2f9a5..341ac459 100644
--- a/isdb-t/br-rj-RioDasFlores(taboas)
+++ b/isdb-t/br-rj-RioDasFlores(taboas)
@@ -1,5 +1,5 @@
 # Channel table for Rio Das Flores (taboas) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3855
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3855
 
 # Physical channel 28 (virtual 9.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-RioDasOstras b/isdb-t/br-rj-RioDasOstras
index 1f6fdce6..8411d0cc 100644
--- a/isdb-t/br-rj-RioDasOstras
+++ b/isdb-t/br-rj-RioDasOstras
@@ -1,5 +1,5 @@
 # Channel table for Rio Das Ostras - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1317
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1317
 
 # Physical channel 18 (virtual 45.1)
 [InterTV Alto Litoral]
diff --git a/isdb-t/br-rj-RioDeJaneiro b/isdb-t/br-rj-RioDeJaneiro
index 615d7c12..c91e7ffd 100644
--- a/isdb-t/br-rj-RioDeJaneiro
+++ b/isdb-t/br-rj-RioDeJaneiro
@@ -1,5 +1,34 @@
 # Channel table for Rio De Janeiro - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/36
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=36
+
+# Physical channel 15 (virtual 10.4)
+[TV Senado, TV ALERJ, Rio TV Câmara, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
 [RBI TV]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -59,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -176,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,6 +262,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 40.1)
+[TV Vila Real]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 33 (virtual 33.1)
 [Top TV]
 	DELIVERY_SYSTEM = ISDBT
@@ -262,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 7.1)
-[Band Rio]
+# Physical channel 35 (virtual 7.2)
+[Band Rio, Escola Rio]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -350,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 5.1)
-[Boas Novas]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -378,7 +436,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 42.1)
+# Physical channel 43 (virtual 52.1)
 [Record News RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -495,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -523,7 +581,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 58.2)
+# Physical channel 48 (virtual 58.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -610,8 +668,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.1)
-[Rede Brasil]
+# Physical channel 51 (virtual 15.1)
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rj-SantoAntonioDePadua b/isdb-t/br-rj-SantoAntonioDePadua
index a762ce70..13f56752 100644
--- a/isdb-t/br-rj-SantoAntonioDePadua
+++ b/isdb-t/br-rj-SantoAntonioDePadua
@@ -1,5 +1,5 @@
-# Channel table for Santo Antônio De Pádua - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2267
+# Channel table for Santo Ant�nio De P�dua - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2267
 
 # Physical channel 24 (virtual 24.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-SaoFidelis b/isdb-t/br-rj-SaoFidelis
index f8ce51cc..f9f8b605 100644
--- a/isdb-t/br-rj-SaoFidelis
+++ b/isdb-t/br-rj-SaoFidelis
@@ -1,5 +1,5 @@
-# Channel table for São Fidélis - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2266
+# Channel table for S�o Fid�lis - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2266
 
 # Physical channel 23 (virtual 23.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-SaoFranciscoDeItabapoana b/isdb-t/br-rj-SaoFranciscoDeItabapoana
index c1110b20..ef0c79f1 100644
--- a/isdb-t/br-rj-SaoFranciscoDeItabapoana
+++ b/isdb-t/br-rj-SaoFranciscoDeItabapoana
@@ -1,69 +1,11 @@
-# Channel table for São Francisco De Itabapoana - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4005
+# Channel table for S�o Francisco De Itabapoana - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4005
 
-# Physical channel 15 (virtual 2.1)
-[Band Rio Interior]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 479142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 19 (virtual 19.3)
-[TV Câmara, TV ALERJ, TV Câmara Municipal Campos]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 23 (virtual 58.1)
+# Physical channel 24 (virtual 26.1)
 [SBT Interior/RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,148 +88,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.1)
-[Boa Vontade TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 42 (virtual 4.1)
-[CNT Rio]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 44 (virtual 45.1)
-[TV Mundial]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 48 (virtual 48.1)
-[RIT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 59 (virtual 59.1)
-[TV Canção Nova]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 743142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-rj-SaoGoncalo b/isdb-t/br-rj-SaoGoncalo
index 9bb1b2d5..76e0f130 100644
--- a/isdb-t/br-rj-SaoGoncalo
+++ b/isdb-t/br-rj-SaoGoncalo
@@ -1,5 +1,34 @@
-# Channel table for São Gonçalo - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2905
+# Channel table for S�o Gon�alo - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2905
+
+# Physical channel 15 (virtual 10.4)
+[TV Senado, TV ALERJ, Rio TV Câmara, TV Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
 [RBI TV]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -59,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV!]
+# Physical channel 21 (virtual 6.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -176,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -349,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 42.1)
+# Physical channel 43 (virtual 52.1)
 [Record News RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -524,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 51.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rj-SaoJoaoDaBarra b/isdb-t/br-rj-SaoJoaoDaBarra
index 4579cd8d..63676399 100644
--- a/isdb-t/br-rj-SaoJoaoDaBarra
+++ b/isdb-t/br-rj-SaoJoaoDaBarra
@@ -1,5 +1,5 @@
-# Channel table for São João Da Barra - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1460
+# Channel table for S�o Jo�o Da Barra - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1460
 
 # Physical channel 14 (virtual 2.1)
 [Band Rio Interior]
@@ -117,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 17.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rj-SaoJoaoDeMeriti b/isdb-t/br-rj-SaoJoaoDeMeriti
index a378b673..403afc87 100644
--- a/isdb-t/br-rj-SaoJoaoDeMeriti
+++ b/isdb-t/br-rj-SaoJoaoDeMeriti
@@ -1,5 +1,34 @@
-# Channel table for São João De Meriti - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2924
+# Channel table for S�o Jo�o De Meriti - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2924
+
+# Physical channel 15 (virtual 105.2)
+[TV Senado, Rio TV Câmara, TV Câmara, TV ALERJ]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 16.1)
 [RBI TV]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 14.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -59,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 34.1)
-[Rede Vida]
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -176,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -349,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 42.1)
+# Physical channel 43 (virtual 52.1)
 [Record News RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 48.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -523,6 +552,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.1)
+[TV Boaventura]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 50 (virtual 50.1)
 [TV O Dia]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rj-SaoJoseDeUba b/isdb-t/br-rj-SaoJoseDeUba
index 687046ee..e68fe7b1 100644
--- a/isdb-t/br-rj-SaoJoseDeUba
+++ b/isdb-t/br-rj-SaoJoseDeUba
@@ -1,5 +1,5 @@
-# Channel table for São José De Ubá - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4004
+# Channel table for S�o Jos� De Ub� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4004
 
 # Physical channel 30 (virtual 30.1)
 [InterTV Serramar]
diff --git a/isdb-t/br-rj-SaoJoseDoValeDoRioPreto b/isdb-t/br-rj-SaoJoseDoValeDoRioPreto
index 21453bc6..3e5b9759 100644
--- a/isdb-t/br-rj-SaoJoseDoValeDoRioPreto
+++ b/isdb-t/br-rj-SaoJoseDoValeDoRioPreto
@@ -1,5 +1,5 @@
-# Channel table for São José Do Vale Do Rio Preto - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2271
+# Channel table for S�o Jos� Do Vale Do Rio Preto - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2271
 
 # Physical channel 23 (virtual 23.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-SaoPedroDaAldeia b/isdb-t/br-rj-SaoPedroDaAldeia
index 1524e16d..83211a4f 100644
--- a/isdb-t/br-rj-SaoPedroDaAldeia
+++ b/isdb-t/br-rj-SaoPedroDaAldeia
@@ -1,5 +1,5 @@
-# Channel table for São Pedro Da Aldeia - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2365
+# Channel table for S�o Pedro Da Aldeia - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2365
 
 # Physical channel 23 (virtual 23.1)
 [SBT Interior/RJ]
@@ -88,32 +88,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 59 (virtual 59.1)
-[TV Canção Nova]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 743142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-rj-SaoSebastiaoDoAlto b/isdb-t/br-rj-SaoSebastiaoDoAlto
index ee43ce97..b53085a3 100644
--- a/isdb-t/br-rj-SaoSebastiaoDoAlto
+++ b/isdb-t/br-rj-SaoSebastiaoDoAlto
@@ -1,5 +1,5 @@
-# Channel table for São Sebastião Do Alto - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3903
+# Channel table for S�o Sebasti�o Do Alto - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3903
 
 # Physical channel 33 (virtual 4.1)
 [InterTV Serramar]
diff --git a/isdb-t/br-rj-Sapucaia b/isdb-t/br-rj-Sapucaia
index 03ea0676..dc40aa8e 100644
--- a/isdb-t/br-rj-Sapucaia
+++ b/isdb-t/br-rj-Sapucaia
@@ -1,5 +1,5 @@
 # Channel table for Sapucaia - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3417
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3417
 
 # Physical channel 29 (virtual 5.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Sapucaia(anta) b/isdb-t/br-rj-Sapucaia(anta)
index e839aad7..0e9d776e 100644
--- a/isdb-t/br-rj-Sapucaia(anta)
+++ b/isdb-t/br-rj-Sapucaia(anta)
@@ -1,5 +1,5 @@
 # Channel table for Sapucaia (anta) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3418
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3418
 
 # Physical channel 31 (virtual 11.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Saquarema b/isdb-t/br-rj-Saquarema
index 0288815e..3085ee36 100644
--- a/isdb-t/br-rj-Saquarema
+++ b/isdb-t/br-rj-Saquarema
@@ -1,8 +1,8 @@
 # Channel table for Saquarema - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2560
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2560
 
 # Physical channel 21 (virtual 6.2)
-[Rede TV! RJ]
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 39.1)
-[Record TV Rio]
+# Physical channel 25 (virtual 12.1)
+[Record TV Interior RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -88,35 +88,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 9.1)
-[CNT Rio]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 35 (virtual 7.1)
 [Band Rio]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,32 +175,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 12.1)
-[NGT Rio]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-rj-Seropedica b/isdb-t/br-rj-Seropedica
index e74e0a18..640e6b42 100644
--- a/isdb-t/br-rj-Seropedica
+++ b/isdb-t/br-rj-Seropedica
@@ -1,5 +1,63 @@
-# Channel table for Seropédica - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3596
+# Channel table for Serop�dica - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3596
+
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 11.1)
 [SBT Rio]
@@ -59,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 4.1)
-[Rede Globo]
+# Physical channel 29 (virtual 4.1)
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,3 +204,90 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 2.4)
+[TV Brasil, TV Brasil 2, TV Escola, Canal Saúde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 5.1)
+[Mais Família]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 48.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rj-SilvaJardim b/isdb-t/br-rj-SilvaJardim
index f6e57e84..931c277a 100644
--- a/isdb-t/br-rj-SilvaJardim
+++ b/isdb-t/br-rj-SilvaJardim
@@ -1,7 +1,7 @@
 # Channel table for Silva Jardim - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2269
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2269
 
-# Physical channel 23 (virtual 14.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Interior/RJ]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,32 +59,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 13.1)
-[Record TV Rio]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-rj-Tangua b/isdb-t/br-rj-Tangua
index 87d09860..c45db6d3 100644
--- a/isdb-t/br-rj-Tangua
+++ b/isdb-t/br-rj-Tangua
@@ -1,8 +1,8 @@
-# Channel table for Tanguá - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3601
+# Channel table for Tangu� - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3601
 
-# Physical channel 21 (virtual 6.1)
-[Rede TV! RJ]
+# Physical channel 21 (virtual 6.2)
+[Rede TV! RJ, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 4.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-rj-Teresopolis b/isdb-t/br-rj-Teresopolis
index a193b7e5..67634aa7 100644
--- a/isdb-t/br-rj-Teresopolis
+++ b/isdb-t/br-rj-Teresopolis
@@ -1,5 +1,5 @@
-# Channel table for Teresópolis - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/471
+# Channel table for Teres�polis - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=471
 
 # Physical channel 24 (virtual 35.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-TrajanoDeMorais b/isdb-t/br-rj-TrajanoDeMorais
index 8abba037..207fa01a 100644
--- a/isdb-t/br-rj-TrajanoDeMorais
+++ b/isdb-t/br-rj-TrajanoDeMorais
@@ -1,5 +1,5 @@
 # Channel table for Trajano De Morais - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2270
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2270
 
 # Physical channel 39 (virtual 13.1)
 [Record TV Rio]
diff --git a/isdb-t/br-rj-TresRios b/isdb-t/br-rj-TresRios
index 1f48ce14..1ef8ea56 100644
--- a/isdb-t/br-rj-TresRios
+++ b/isdb-t/br-rj-TresRios
@@ -1,5 +1,5 @@
-# Channel table for Três Rios - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/693
+# Channel table for Tr�s Rios - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=693
 
 # Physical channel 23 (virtual 50.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Valenca b/isdb-t/br-rj-Valenca
index 8ab289c2..efc6b0ec 100644
--- a/isdb-t/br-rj-Valenca
+++ b/isdb-t/br-rj-Valenca
@@ -1,5 +1,5 @@
-# Channel table for Valença - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/752
+# Channel table for Valen�a - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=752
 
 # Physical channel 23 (virtual 31.1)
 [SBT Interior/RJ]
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 56 (virtual 44.1)
+# Physical channel 44 (virtual 44.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 725142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rj-Valenca(baraoDeJuparana) b/isdb-t/br-rj-Valenca(baraoDeJuparana)
index d1671bf4..d6d822ae 100644
--- a/isdb-t/br-rj-Valenca(baraoDeJuparana)
+++ b/isdb-t/br-rj-Valenca(baraoDeJuparana)
@@ -1,5 +1,5 @@
-# Channel table for Valença (barão De Juparanã) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3396
+# Channel table for Valen�a (bar�o De Juparan�) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3396
 
 # Physical channel 23 (virtual 49.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Valenca(parapeuna) b/isdb-t/br-rj-Valenca(parapeuna)
index 6f24c98d..ecfdc69d 100644
--- a/isdb-t/br-rj-Valenca(parapeuna)
+++ b/isdb-t/br-rj-Valenca(parapeuna)
@@ -1,5 +1,5 @@
-# Channel table for Valença (parapeúna) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3439
+# Channel table for Valen�a (parape�na) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3439
 
 # Physical channel 28 (virtual 3.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Valenca(pentagna) b/isdb-t/br-rj-Valenca(pentagna)
index 3c6a60da..08aa028a 100644
--- a/isdb-t/br-rj-Valenca(pentagna)
+++ b/isdb-t/br-rj-Valenca(pentagna)
@@ -1,5 +1,5 @@
-# Channel table for Valença (pentagna) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3468
+# Channel table for Valen�a (pentagna) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3468
 
 # Physical channel 28 (virtual 9.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Varre-sai b/isdb-t/br-rj-Varre-sai
index ae6ac2ee..c7cfaa34 100644
--- a/isdb-t/br-rj-Varre-sai
+++ b/isdb-t/br-rj-Varre-sai
@@ -1,5 +1,5 @@
 # Channel table for Varre-sai - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3901
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3901
 
 # Physical channel 30 (virtual 30.1)
 [InterTV Serramar]
diff --git a/isdb-t/br-rj-Vassouras b/isdb-t/br-rj-Vassouras
index a0fef87b..5a8f2591 100644
--- a/isdb-t/br-rj-Vassouras
+++ b/isdb-t/br-rj-Vassouras
@@ -1,5 +1,5 @@
 # Channel table for Vassouras - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1419
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1419
 
 # Physical channel 23 (virtual 49.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Vassouras(andradePinto) b/isdb-t/br-rj-Vassouras(andradePinto)
index 168f71e0..fbee8407 100644
--- a/isdb-t/br-rj-Vassouras(andradePinto)
+++ b/isdb-t/br-rj-Vassouras(andradePinto)
@@ -1,5 +1,5 @@
 # Channel table for Vassouras (andrade Pinto) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3433
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3433
 
 # Physical channel 29 (virtual 7.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-Vassouras(ipiranga) b/isdb-t/br-rj-Vassouras(ipiranga)
index d3264e5d..bea8171d 100644
--- a/isdb-t/br-rj-Vassouras(ipiranga)
+++ b/isdb-t/br-rj-Vassouras(ipiranga)
@@ -1,5 +1,5 @@
 # Channel table for Vassouras (ipiranga) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3365
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3365
 
 # Physical channel 24 (virtual 7.1)
 [SBT Interior/RJ]
diff --git a/isdb-t/br-rj-Vassouras(massambara) b/isdb-t/br-rj-Vassouras(massambara)
index db77b10e..f01a45d8 100644
--- a/isdb-t/br-rj-Vassouras(massambara)
+++ b/isdb-t/br-rj-Vassouras(massambara)
@@ -1,5 +1,5 @@
-# Channel table for Vassouras (massambará) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3434
+# Channel table for Vassouras (massambar�) - RJ - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3434
 
 # Physical channel 29 (virtual 9.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rj-VoltaRedonda b/isdb-t/br-rj-VoltaRedonda
index 7b08c668..89e88885 100644
--- a/isdb-t/br-rj-VoltaRedonda
+++ b/isdb-t/br-rj-VoltaRedonda
@@ -1,5 +1,5 @@
 # Channel table for Volta Redonda - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/283
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=283
 
 # Physical channel 24 (virtual 12.1)
 [SBT Interior/RJ]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 14.1)
-[Rede Vida]
+# Physical channel 26 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 16.1)
+[TV Diversa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 44 (virtual 56.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rj-VoltaRedonda(b.Roma) b/isdb-t/br-rj-VoltaRedonda(b.Roma)
index 2892b853..99047554 100644
--- a/isdb-t/br-rj-VoltaRedonda(b.Roma)
+++ b/isdb-t/br-rj-VoltaRedonda(b.Roma)
@@ -1,5 +1,5 @@
 # Channel table for Volta Redonda (b. Roma) - RJ - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3467
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3467
 
 # Physical channel 29 (virtual 10.1)
 [TV Rio Sul]
diff --git a/isdb-t/br-rn-Acari b/isdb-t/br-rn-Acari
new file mode 100644
index 00000000..308f6da5
--- /dev/null
+++ b/isdb-t/br-rn-Acari
@@ -0,0 +1,32 @@
+# Channel table for Acari - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=984
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Acu b/isdb-t/br-rn-Acu
index 254fccf4..5ad4529c 100644
--- a/isdb-t/br-rn-Acu
+++ b/isdb-t/br-rn-Acu
@@ -1,5 +1,5 @@
-# Channel table for Açu - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/549
+# Channel table for A�u - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=549
 
 # Physical channel 18 (virtual 18.1)
 [TV Lagoa Nova]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 8.1)
+# Physical channel 19 (virtual 8.1)
 [TV Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 503142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rn-Apodi b/isdb-t/br-rn-Apodi
new file mode 100644
index 00000000..45ea3bd3
--- /dev/null
+++ b/isdb-t/br-rn-Apodi
@@ -0,0 +1,32 @@
+# Channel table for Apodi - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=985
+
+# Physical channel 20 (virtual 5.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-AreiaBranca b/isdb-t/br-rn-AreiaBranca
index 1ccc7bde..c9645f3f 100644
--- a/isdb-t/br-rn-AreiaBranca
+++ b/isdb-t/br-rn-AreiaBranca
@@ -1,8 +1,8 @@
 # Channel table for Areia Branca - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1203
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1203
 
 # Physical channel 24 (virtual 24.1)
-[Band Natal]
+[Band RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 9.1)
-[Rede Vida]
+# Physical channel 27 (virtual 9.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -59,8 +59,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 11.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 14.1)
+[Super TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 38 (virtual 3.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-rn-Ares b/isdb-t/br-rn-Ares
index a81d6429..79472de0 100644
--- a/isdb-t/br-rn-Ares
+++ b/isdb-t/br-rn-Ares
@@ -1,5 +1,92 @@
-# Channel table for Arês - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3011
+# Channel table for Ar�s - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3011
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -30,11 +117,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[TV Canção Nova]
+# Physical channel 44 (virtual 43.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,3 +436,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Barauna b/isdb-t/br-rn-Barauna
index 7adf917a..06b15d1d 100644
--- a/isdb-t/br-rn-Barauna
+++ b/isdb-t/br-rn-Barauna
@@ -1,8 +1,8 @@
-# Channel table for Baraúna - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1204
+# Channel table for Bara�na - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1204
 
 # Physical channel 24 (virtual 24.1)
-[Band Natal]
+[Band RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -30,148 +30,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 9.1)
-[Rede Vida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 35 (virtual 14.1)
-[Super TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 38 (virtual 3.1)
-[TV Ponta Negra/RN]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 41 (virtual 41.1)
-[TV Aparecida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 47 (virtual 18.1)
-[InterTV Costa Branca]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-rn-BoaSaude b/isdb-t/br-rn-BoaSaude
new file mode 100644
index 00000000..2a3c5423
--- /dev/null
+++ b/isdb-t/br-rn-BoaSaude
@@ -0,0 +1,467 @@
+# Channel table for Boa Sa�de - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3053
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.1)
+[TV Metropolitano]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.4)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-Aurora b/isdb-t/br-rn-Bodo
index b7c1d1be..87401978 100644
--- a/isdb-t/br-sc-Aurora
+++ b/isdb-t/br-rn-Bodo
@@ -1,11 +1,11 @@
-# Channel table for Aurora - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/809
+# Channel table for Bod� - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3033
 
-# Physical channel 20 (virtual 16.1)
-[Rede Vida]
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 11.1)
-[NSC Blumenau]
+[InterTV Cabugi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-rn-BomJesus b/isdb-t/br-rn-BomJesus
index a9fe087e..e15db85e 100644
--- a/isdb-t/br-rn-BomJesus
+++ b/isdb-t/br-rn-BomJesus
@@ -1,8 +1,8 @@
 # Channel table for Bom Jesus - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3014
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3014
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -117,37 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 24 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -176,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -204,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -292,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -320,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -407,35 +378,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 48 (virtual 5.1)
 [TVU Natal]
 	DELIVERY_SYSTEM = ISDBT
@@ -494,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.4)
-[TV Câmara, TV Senado, TV Assembleia RN, TV Câmara Municipal Natal]
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rn-Brejinho b/isdb-t/br-rn-Brejinho
index f8a41346..1d3d89d0 100644
--- a/isdb-t/br-rn-Brejinho
+++ b/isdb-t/br-rn-Brejinho
@@ -1,5 +1,92 @@
 # Channel table for Brejinho - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3050
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3050
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -30,11 +117,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[TV Canção Nova]
+# Physical channel 44 (virtual 43.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,3 +436,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Caico b/isdb-t/br-rn-Caico
index d3b9fbc6..99e3a38e 100644
--- a/isdb-t/br-rn-Caico
+++ b/isdb-t/br-rn-Caico
@@ -1,5 +1,5 @@
-# Channel table for Caicó - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/509
+# Channel table for Caic� - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=509
 
 # Physical channel 18 (virtual 18.1)
 [TV Lagoa Nova]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 15.1)
-[Rede Vida]
+# Physical channel 39 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-rn-Canguaretama b/isdb-t/br-rn-Canguaretama
new file mode 100644
index 00000000..ab82d822
--- /dev/null
+++ b/isdb-t/br-rn-Canguaretama
@@ -0,0 +1,409 @@
+# Channel table for Canguaretama - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1205
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Ceara-mirim b/isdb-t/br-rn-Ceara-mirim
index bb2aa4ad..75860a3e 100644
--- a/isdb-t/br-rn-Ceara-mirim
+++ b/isdb-t/br-rn-Ceara-mirim
@@ -1,5 +1,92 @@
-# Channel table for Ceará-mirim - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3010
+# Channel table for Cear�-mirim - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3010
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -59,8 +146,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,10 +407,39 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
@@ -320,3 +523,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-Laurentino b/isdb-t/br-rn-CerroCora
index d3e8b366..f304f50b 100644
--- a/isdb-t/br-sc-Laurentino
+++ b/isdb-t/br-rn-CerroCora
@@ -1,11 +1,11 @@
-# Channel table for Laurentino - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1832
+# Channel table for Cerro Cor� - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=551
 
-# Physical channel 20 (virtual 16.1)
-[Rede Vida]
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 11.1)
-[NSC Blumenau]
+[InterTV Cabugi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-rn-CurraisNovos b/isdb-t/br-rn-CurraisNovos
index c4a6b3ad..1d782471 100644
--- a/isdb-t/br-rn-CurraisNovos
+++ b/isdb-t/br-rn-CurraisNovos
@@ -1,5 +1,5 @@
 # Channel table for Currais Novos - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/550
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=550
 
 # Physical channel 18 (virtual 18.1)
 [TV Lagoa Nova]
diff --git a/isdb-t/br-rn-EspiritoSanto b/isdb-t/br-rn-EspiritoSanto
new file mode 100644
index 00000000..0bfd58ae
--- /dev/null
+++ b/isdb-t/br-rn-EspiritoSanto
@@ -0,0 +1,351 @@
+# Channel table for Esp�rito Santo - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3028
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Extremoz b/isdb-t/br-rn-Extremoz
index 2be70a53..11a1aa76 100644
--- a/isdb-t/br-rn-Extremoz
+++ b/isdb-t/br-rn-Extremoz
@@ -1,8 +1,8 @@
 # Channel table for Extremoz - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3009
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3009
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,6 +30,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 21 (virtual 21.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -89,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -117,8 +175,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 28.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -146,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -204,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 33.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 11.1)
 [InterTV Cabugi]
 	DELIVERY_SYSTEM = ISDBT
@@ -234,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -262,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -349,10 +465,39 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
@@ -436,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.4)
-[TV Câmara, TV Senado, TV Assembleia RN, TV Câmara Municipal Natal]
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rn-Florania b/isdb-t/br-rn-Florania
new file mode 100644
index 00000000..cf0ce318
--- /dev/null
+++ b/isdb-t/br-rn-Florania
@@ -0,0 +1,119 @@
+# Channel table for Flor�nia - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2530
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Goianinha b/isdb-t/br-rn-Goianinha
new file mode 100644
index 00000000..fe638b05
--- /dev/null
+++ b/isdb-t/br-rn-Goianinha
@@ -0,0 +1,119 @@
+# Channel table for Goianinha - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1207
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Grossos b/isdb-t/br-rn-Grossos
index 2493086c..5f5d6b9a 100644
--- a/isdb-t/br-rn-Grossos
+++ b/isdb-t/br-rn-Grossos
@@ -1,8 +1,8 @@
 # Channel table for Grossos - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3035
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3035
 
 # Physical channel 24 (virtual 24.1)
-[Band Natal]
+[Band RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 9.1)
-[Rede Vida]
+# Physical channel 27 (virtual 9.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -59,8 +59,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 11.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 14.1)
+[Super TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 38 (virtual 3.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-rn-IelmoMarinho b/isdb-t/br-rn-IelmoMarinho
index becfd646..a2db5e2e 100644
--- a/isdb-t/br-rn-IelmoMarinho
+++ b/isdb-t/br-rn-IelmoMarinho
@@ -1,8 +1,8 @@
 # Channel table for Ielmo Marinho - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3013
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3013
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 20 (virtual 19.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -147,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -175,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -291,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -379,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+[Boa Vontade TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -465,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.4)
-[TV Câmara, TV Senado, TV Assembleia RN, TV Câmara Municipal Natal]
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rn-Jucurutu b/isdb-t/br-rn-Jucurutu
index 1fa0065d..b95df069 100644
--- a/isdb-t/br-rn-Jucurutu
+++ b/isdb-t/br-rn-Jucurutu
@@ -1,5 +1,5 @@
 # Channel table for Jucurutu - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3036
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3036
 
 # Physical channel 18 (virtual 18.1)
 [TV Lagoa Nova]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 11.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Jundia b/isdb-t/br-rn-Jundia
new file mode 100644
index 00000000..a4720608
--- /dev/null
+++ b/isdb-t/br-rn-Jundia
@@ -0,0 +1,409 @@
+# Channel table for Jundi� - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3061
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-LagoaD'Anta b/isdb-t/br-rn-LagoaD'Anta
new file mode 100644
index 00000000..99e0e0a7
--- /dev/null
+++ b/isdb-t/br-rn-LagoaD'Anta
@@ -0,0 +1,409 @@
+# Channel table for Lagoa D� Anta - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4313
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.4)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-LagoaDePedras b/isdb-t/br-rn-LagoaDePedras
index 4a68e9e1..cf1347a6 100644
--- a/isdb-t/br-rn-LagoaDePedras
+++ b/isdb-t/br-rn-LagoaDePedras
@@ -1,5 +1,92 @@
 # Channel table for Lagoa De Pedras - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3060
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3060
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -30,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +146,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[TV Canção Nova]
+# Physical channel 44 (virtual 43.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rn-LagoaDeVelhos b/isdb-t/br-rn-LagoaDeVelhos
new file mode 100644
index 00000000..3dbf1e70
--- /dev/null
+++ b/isdb-t/br-rn-LagoaDeVelhos
@@ -0,0 +1,293 @@
+# Channel table for Lagoa De Velhos - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=989
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-LagoaNova b/isdb-t/br-rn-LagoaNova
index 5db00c3d..bfa813e6 100644
--- a/isdb-t/br-rn-LagoaNova
+++ b/isdb-t/br-rn-LagoaNova
@@ -1,5 +1,5 @@
 # Channel table for Lagoa Nova - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/362
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=362
 
 # Physical channel 14 (virtual 14.1)
 [TV Futuro]
@@ -30,354 +30,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 17.1)
-[TV Feliz]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 20 (virtual 19.1)
-[Record News]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 21 (virtual 21.1)
-[RIT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 24 (virtual 25.1)
-[Ideal TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 28 (virtual 27.1)
-[RCI]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 32 (virtual 8.1)
-[TV Tropical]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 34 (virtual 11.1)
-[InterTV Cabugi]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 44 (virtual 43.1)
-[CNT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 45 (virtual 2.1)
 [TV Lagoa Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -407,90 +59,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 48 (virtual 5.1)
-[TVU Natal]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 49 (virtual 49.1)
-[TV Verdade]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-rn-LagoaSalgada b/isdb-t/br-rn-LagoaSalgada
index 6b75094e..7c904bee 100644
--- a/isdb-t/br-rn-LagoaSalgada
+++ b/isdb-t/br-rn-LagoaSalgada
@@ -1,5 +1,92 @@
 # Channel table for Lagoa Salgada - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3519
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3519
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -30,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +146,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[TV Canção Nova]
+# Physical channel 44 (virtual 43.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rn-Macaiba b/isdb-t/br-rn-Macaiba
index 45edbe87..655fd0a3 100644
--- a/isdb-t/br-rn-Macaiba
+++ b/isdb-t/br-rn-Macaiba
@@ -1,8 +1,8 @@
-# Channel table for Macaíba - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3008
+# Channel table for Maca�ba - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3008
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 28.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -262,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 33.1)
+[TV Metropolitano]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 11.1)
 [InterTV Cabugi]
 	DELIVERY_SYSTEM = ISDBT
@@ -292,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -320,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -407,10 +465,39 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
@@ -494,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.4)
-[TV Câmara, TV Senado, TV Assembleia RN, TV Câmara Municipal Natal]
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rn-Maxaranguape b/isdb-t/br-rn-Maxaranguape
index c580bcde..a8494c89 100644
--- a/isdb-t/br-rn-Maxaranguape
+++ b/isdb-t/br-rn-Maxaranguape
@@ -1,5 +1,92 @@
 # Channel table for Maxaranguape - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3025
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3025
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -59,8 +146,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,10 +407,39 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
@@ -320,3 +523,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-MonteAlegre b/isdb-t/br-rn-MonteAlegre
index e6af66cb..7e9c71ec 100644
--- a/isdb-t/br-rn-MonteAlegre
+++ b/isdb-t/br-rn-MonteAlegre
@@ -1,5 +1,92 @@
 # Channel table for Monte Alegre - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3017
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3017
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -59,8 +146,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,10 +407,39 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
@@ -320,3 +523,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-MonteDasGameleiras b/isdb-t/br-rn-MonteDasGameleiras
index e2410947..8b3ef3cc 100644
--- a/isdb-t/br-rn-MonteDasGameleiras
+++ b/isdb-t/br-rn-MonteDasGameleiras
@@ -1,8 +1,8 @@
 # Channel table for Monte Das Gameleiras - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3856
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3856
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,8 +30,153 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -118,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -146,3 +291,148 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.4)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Mossoro b/isdb-t/br-rn-Mossoro
index f6c8a952..5afe2c15 100644
--- a/isdb-t/br-rn-Mossoro
+++ b/isdb-t/br-rn-Mossoro
@@ -1,8 +1,8 @@
-# Channel table for Mossoró - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/115
+# Channel table for Mossor� - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=115
 
 # Physical channel 24 (virtual 24.1)
-[Band]
+[Band RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 9.1)
-[Rede Vida]
+# Physical channel 27 (virtual 9.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 3.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-rn-Natal b/isdb-t/br-rn-Natal
index dabd58b6..336e3297 100644
--- a/isdb-t/br-rn-Natal
+++ b/isdb-t/br-rn-Natal
@@ -1,8 +1,8 @@
 # Channel table for Natal - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/158
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=158
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 28.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Teleaula Natal, Teleaula Parnamirim, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 33 (virtual 33.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -321,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -349,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -436,10 +465,39 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
@@ -523,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.4)
-[TV Câmara, TV Senado, TV Assembleia RN, TV Câmara Municipal Natal]
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rn-NisiaFloresta b/isdb-t/br-rn-NisiaFloresta
index 6680e93d..04f2e384 100644
--- a/isdb-t/br-rn-NisiaFloresta
+++ b/isdb-t/br-rn-NisiaFloresta
@@ -1,5 +1,92 @@
-# Channel table for Nísia Floresta - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3018
+# Channel table for N�sia Floresta - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3018
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -59,8 +146,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,10 +407,39 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
@@ -320,3 +523,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-NovaCruz b/isdb-t/br-rn-NovaCruz
index e04f0203..6a25985c 100644
--- a/isdb-t/br-rn-NovaCruz
+++ b/isdb-t/br-rn-NovaCruz
@@ -1,5 +1,5 @@
 # Channel table for Nova Cruz - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1210
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1210
 
 # Physical channel 18 (virtual 18.1)
 [TV Lagoa Nova]
diff --git a/isdb-t/br-rn-Parnamirim b/isdb-t/br-rn-Parnamirim
index 97ee6c1f..14a69c6a 100644
--- a/isdb-t/br-rn-Parnamirim
+++ b/isdb-t/br-rn-Parnamirim
@@ -1,8 +1,8 @@
 # Channel table for Parnamirim - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3291
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3291
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 28.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -262,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 33.1)
+[TV Metropolitano]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 11.1)
 [InterTV Cabugi]
 	DELIVERY_SYSTEM = ISDBT
@@ -292,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -320,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -407,10 +465,39 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
@@ -494,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.4)
-[TV Câmara, TV Senado, TV Assembleia RN, TV Câmara Municipal]
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rn-PassaEFica b/isdb-t/br-rn-PassaEFica
index ef816374..c5809194 100644
--- a/isdb-t/br-rn-PassaEFica
+++ b/isdb-t/br-rn-PassaEFica
@@ -1,8 +1,8 @@
 # Channel table for Passa E Fica - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1230
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1230
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,6 +30,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 21 (virtual 21.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -176,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -204,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -233,11 +291,98 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.4)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 695142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rn-Passagem b/isdb-t/br-rn-Passagem
new file mode 100644
index 00000000..06a5afd2
--- /dev/null
+++ b/isdb-t/br-rn-Passagem
@@ -0,0 +1,380 @@
+# Channel table for Passagem - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4305
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.4)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-PauDosFerros b/isdb-t/br-rn-PauDosFerros
index 1cde865c..e31ef6d0 100644
--- a/isdb-t/br-rn-PauDosFerros
+++ b/isdb-t/br-rn-PauDosFerros
@@ -1,8 +1,8 @@
 # Channel table for Pau Dos Ferros - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/493
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=493
 
 # Physical channel 18 (virtual 18.1)
-[TV Assembleia RN]
+[TV Lagoa Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
diff --git a/isdb-t/br-rn-PocoBranco b/isdb-t/br-rn-PocoBranco
index 624dc41b..a895669e 100644
--- a/isdb-t/br-rn-PocoBranco
+++ b/isdb-t/br-rn-PocoBranco
@@ -1,5 +1,92 @@
-# Channel table for Poço Branco - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3640
+# Channel table for Po�o Branco - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3640
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -30,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +146,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 11.1)
-[TV Ponta Negra/RN]
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,6 +320,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rn-Pureza b/isdb-t/br-rn-Pureza
new file mode 100644
index 00000000..cc027a57
--- /dev/null
+++ b/isdb-t/br-rn-Pureza
@@ -0,0 +1,380 @@
+# Channel table for Pureza - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4314
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Riachuelo b/isdb-t/br-rn-Riachuelo
index a9769e52..2a0112dd 100644
--- a/isdb-t/br-rn-Riachuelo
+++ b/isdb-t/br-rn-Riachuelo
@@ -1,8 +1,153 @@
 # Channel table for Riachuelo - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3026
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3026
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -89,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -117,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -146,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,3 +378,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-RioDoFogo b/isdb-t/br-rn-RioDoFogo
new file mode 100644
index 00000000..0819cf65
--- /dev/null
+++ b/isdb-t/br-rn-RioDoFogo
@@ -0,0 +1,438 @@
+# Channel table for Rio Do Fogo - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4315
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-SantaCruz b/isdb-t/br-rn-SantaCruz
index a193a5c7..1016c206 100644
--- a/isdb-t/br-rn-SantaCruz
+++ b/isdb-t/br-rn-SantaCruz
@@ -1,5 +1,5 @@
 # Channel table for Santa Cruz - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/987
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=987
 
 # Physical channel 18 (virtual 18.1)
 [TV Lagoa Nova]
diff --git a/isdb-t/br-rn-SantaMaria b/isdb-t/br-rn-SantaMaria
index f02642d6..4dc44c1c 100644
--- a/isdb-t/br-rn-SantaMaria
+++ b/isdb-t/br-rn-SantaMaria
@@ -1,5 +1,92 @@
 # Channel table for Santa Maria - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3021
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3021
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -30,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[TV Canção Nova]
+# Physical channel 44 (virtual 43.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,3 +407,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 10.4)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-SantoAntonio b/isdb-t/br-rn-SantoAntonio
new file mode 100644
index 00000000..a4284b46
--- /dev/null
+++ b/isdb-t/br-rn-SantoAntonio
@@ -0,0 +1,409 @@
+# Channel table for Santo Ant�nio - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1213
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-SaoGoncaloDoAmarante b/isdb-t/br-rn-SaoGoncaloDoAmarante
index 272a1a7a..e7d12b89 100644
--- a/isdb-t/br-rn-SaoGoncaloDoAmarante
+++ b/isdb-t/br-rn-SaoGoncaloDoAmarante
@@ -1,8 +1,8 @@
-# Channel table for São Gonçalo Do Amarante - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3339
+# Channel table for S�o Gon�alo Do Amarante - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3339
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 21 (virtual 21.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -146,8 +175,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 28.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -175,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -233,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 33.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 11.1)
 [InterTV Cabugi]
 	DELIVERY_SYSTEM = ISDBT
@@ -263,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -291,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -378,10 +465,39 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
@@ -465,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.4)
-[TV Câmara, TV Senado, TV Assembleia RN, TV Câmara Municipal Natal]
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rn-SaoJoaoDoSabugi b/isdb-t/br-rn-SaoJoaoDoSabugi
new file mode 100644
index 00000000..320e4a2a
--- /dev/null
+++ b/isdb-t/br-rn-SaoJoaoDoSabugi
@@ -0,0 +1,32 @@
+# Channel table for S�o Jo�o Do Sabugi - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3005
+
+# Physical channel 31 (virtual 31.1)
+[TV Tambaú]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-SaoJoseDeMipibu b/isdb-t/br-rn-SaoJoseDeMipibu
index 54da39aa..b1ccc551 100644
--- a/isdb-t/br-rn-SaoJoseDeMipibu
+++ b/isdb-t/br-rn-SaoJoseDeMipibu
@@ -1,5 +1,92 @@
-# Channel table for São José De Mipibu - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2452
+# Channel table for S�o Jos� De Mipibu - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2452
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -59,8 +146,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,10 +407,39 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 46 (virtual 46.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
@@ -320,3 +523,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-SaoMiguel b/isdb-t/br-rn-SaoMiguel
index 5ab3d3e6..8e1313fa 100644
--- a/isdb-t/br-rn-SaoMiguel
+++ b/isdb-t/br-rn-SaoMiguel
@@ -1,5 +1,5 @@
-# Channel table for São Miguel - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1214
+# Channel table for S�o Miguel - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1214
 
 # Physical channel 18 (virtual 18.1)
 [TV Lagoa Nova]
diff --git a/isdb-t/br-rn-SaoPauloDoPotengi b/isdb-t/br-rn-SaoPauloDoPotengi
index e6bf6fe0..405e9f9f 100644
--- a/isdb-t/br-rn-SaoPauloDoPotengi
+++ b/isdb-t/br-rn-SaoPauloDoPotengi
@@ -1,5 +1,63 @@
-# Channel table for São Paulo Do Potengi - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3816
+# Channel table for S�o Paulo Do Potengi - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3816
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 18.1)
 [TV Lagoa Nova]
@@ -30,3 +88,380 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-SaoPedro b/isdb-t/br-rn-SaoPedro
new file mode 100644
index 00000000..cf2587b0
--- /dev/null
+++ b/isdb-t/br-rn-SaoPedro
@@ -0,0 +1,525 @@
+# Channel table for S�o Pedro - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4306
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 18.1)
+[TV Lagoa Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 38.2)
+[Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-SenadorEloiDeSousa b/isdb-t/br-rn-SenadorEloiDeSousa
index c5ce609b..55e16bf0 100644
--- a/isdb-t/br-rn-SenadorEloiDeSousa
+++ b/isdb-t/br-rn-SenadorEloiDeSousa
@@ -1,8 +1,153 @@
-# Channel table for Senador Elói De Sousa - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3091
+# Channel table for Senador El�i De Sousa - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3091
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -89,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -117,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -146,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 45.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,8 +378,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.4)
-[TV Câmara, TV Senado, TV Assembleia RN, TV Câmara Municipal Natal]
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.4)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rn-SenadorGeorginoAvelino b/isdb-t/br-rn-SenadorGeorginoAvelino
index 28ec70fd..78379973 100644
--- a/isdb-t/br-rn-SenadorGeorginoAvelino
+++ b/isdb-t/br-rn-SenadorGeorginoAvelino
@@ -1,5 +1,92 @@
 # Channel table for Senador Georgino Avelino - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3520
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3520
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -30,11 +117,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[TV Canção Nova]
+# Physical channel 44 (virtual 43.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,3 +436,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-SerraDeSaoBento b/isdb-t/br-rn-SerraDeSaoBento
index 48716b3f..786d860a 100644
--- a/isdb-t/br-rn-SerraDeSaoBento
+++ b/isdb-t/br-rn-SerraDeSaoBento
@@ -1,8 +1,8 @@
-# Channel table for Serra De São Bento - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3813
+# Channel table for Serra De S�o Bento - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3813
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,6 +30,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 21 (virtual 21.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.2)
-[TV Metropolitano]
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -176,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -204,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -233,11 +291,69 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rn-SerraDoMel b/isdb-t/br-rn-SerraDoMel
new file mode 100644
index 00000000..af744a3c
--- /dev/null
+++ b/isdb-t/br-rn-SerraDoMel
@@ -0,0 +1,206 @@
+# Channel table for Serra Do Mel - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3034
+
+# Physical channel 24 (virtual 24.1)
+[Band RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 9.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 11.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 14.1)
+[Super TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 3.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 41.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 18.1)
+[InterTV Costa Branca]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Serrinha b/isdb-t/br-rn-Serrinha
new file mode 100644
index 00000000..fd62a53f
--- /dev/null
+++ b/isdb-t/br-rn-Serrinha
@@ -0,0 +1,409 @@
+# Channel table for Serrinha - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2765
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Taipu b/isdb-t/br-rn-Taipu
index eef6df05..347d7074 100644
--- a/isdb-t/br-rn-Taipu
+++ b/isdb-t/br-rn-Taipu
@@ -1,5 +1,92 @@
 # Channel table for Taipu - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3521
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3521
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -30,11 +117,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[TV Canção Nova]
+# Physical channel 44 (virtual 43.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,3 +407,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-TenenteLaurentinoCruz b/isdb-t/br-rn-TenenteLaurentinoCruz
new file mode 100644
index 00000000..9f725450
--- /dev/null
+++ b/isdb-t/br-rn-TenenteLaurentinoCruz
@@ -0,0 +1,119 @@
+# Channel table for Tenente Laurentino Cruz - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4324
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Tibau b/isdb-t/br-rn-Tibau
index f31b224f..e99f312c 100644
--- a/isdb-t/br-rn-Tibau
+++ b/isdb-t/br-rn-Tibau
@@ -1,11 +1,156 @@
 # Channel table for Tibau - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2983
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2983
 
-# Physical channel 49 (virtual 49.1)
-[TV Verdade]
+# Physical channel 24 (virtual 24.1)
+[Band RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 9.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 11.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 14.1)
+[Super TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 3.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 18.1)
+[InterTV Costa Branca]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rn-TibauDoSul b/isdb-t/br-rn-TibauDoSul
index 9cd80149..1fb39697 100644
--- a/isdb-t/br-rn-TibauDoSul
+++ b/isdb-t/br-rn-TibauDoSul
@@ -1,5 +1,92 @@
 # Channel table for Tibau Do Sul - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3522
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3522
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 21.1)
 [RIT]
@@ -30,11 +117,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -147,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -175,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -204,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[TV Canção Nova]
+# Physical channel 44 (virtual 43.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,3 +436,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Touros b/isdb-t/br-rn-Touros
new file mode 100644
index 00000000..6a7114bd
--- /dev/null
+++ b/isdb-t/br-rn-Touros
@@ -0,0 +1,409 @@
+# Channel table for Touros - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1216
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-Varzea b/isdb-t/br-rn-Varzea
new file mode 100644
index 00000000..03b2f91b
--- /dev/null
+++ b/isdb-t/br-rn-Varzea
@@ -0,0 +1,351 @@
+# Channel table for V�rzea - RN - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2831
+
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 8.1)
+[TV Tropical]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 11.1)
+[InterTV Cabugi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 13.1)
+[TV Ponta Negra]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rn-VeraCruz b/isdb-t/br-rn-VeraCruz
index cae50bb8..a52c78f4 100644
--- a/isdb-t/br-rn-VeraCruz
+++ b/isdb-t/br-rn-VeraCruz
@@ -1,8 +1,8 @@
 # Channel table for Vera Cruz - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3518
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3518
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+[Rede Brasil de TV, TV Metropolitano]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 25.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+[Boa Vontade TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.4)
-[TV Câmara, TV Senado, TV Assembleia RN, TV Câmara Municipal Natal]
+# Physical channel 51 (virtual 10.5)
+[TV Câmara, TV Câmara Municipal Natal, TV Assembleia RN, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-rn-VilaFlor b/isdb-t/br-rn-VilaFlor
index ab459bfd..73463038 100644
--- a/isdb-t/br-rn-VilaFlor
+++ b/isdb-t/br-rn-VilaFlor
@@ -1,8 +1,8 @@
 # Channel table for Vila Flor - RN - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3814
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3814
 
-# Physical channel 14 (virtual 14.1)
-[TV Futuro]
+# Physical channel 14 (virtual 14.3)
+[TV Futuro, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -30,6 +30,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 17.1)
+[TV Feliz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 19.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 21 (virtual 21.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,11 +117,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[TV Metropolitano]
+# Physical channel 24 (virtual 25.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 27.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.1)
-[Band Natal]
+# Physical channel 30 (virtual 3.4)
+[Band RN, Educa RN]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -176,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 13.1)
-[TV Ponta Negra/RN]
+[TV Ponta Negra]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -204,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[Rede Vida]
+# Physical channel 39 (virtual 38.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -233,11 +320,69 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[TV Aparecida]
+# Physical channel 44 (virtual 43.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.1)
+[TVU Natal]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 49.1)
+[TV Verdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ro-AltaFlorestaD'Oeste b/isdb-t/br-ro-AltaFlorestaD'Oeste
index 6de29849..c810c529 100644
--- a/isdb-t/br-ro-AltaFlorestaD'Oeste
+++ b/isdb-t/br-ro-AltaFlorestaD'Oeste
@@ -1,5 +1,5 @@
-# Channel table for Alta Floresta D´ Oeste - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2479
+# Channel table for Alta Floresta D� Oeste - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2479
 
 # Physical channel 20 (virtual 20.1)
 [TV R Gallo]
diff --git a/isdb-t/br-ro-AltoParaiso b/isdb-t/br-ro-AltoParaiso
new file mode 100644
index 00000000..4029953b
--- /dev/null
+++ b/isdb-t/br-ro-AltoParaiso
@@ -0,0 +1,61 @@
+# Channel table for Alto Para�so - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3079
+
+# Physical channel 16 (virtual 16.1)
+[Rede Amazônica Porto Velho]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 12.1)
+[SIC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-Ariquemes b/isdb-t/br-ro-Ariquemes
index 42118bb3..33d7efad 100644
--- a/isdb-t/br-ro-Ariquemes
+++ b/isdb-t/br-ro-Ariquemes
@@ -1,8 +1,8 @@
 # Channel table for Ariquemes - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/95
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=95
 
 # Physical channel 14 (virtual 7.1)
-[TV Ariquemes]
+[Rede Amazônica Ariquemes]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -204,3 +204,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 50.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-mg-EntreRiosDeMinas b/isdb-t/br-ro-Buritis
index 25847245..ab820a86 100644
--- a/isdb-t/br-mg-EntreRiosDeMinas
+++ b/isdb-t/br-ro-Buritis
@@ -1,11 +1,11 @@
-# Channel table for Entre Rios De Minas - MG - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3100
+# Channel table for Buritis - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=463
 
-# Physical channel 15 (virtual 2.1)
-[Record TV Minas]
+# Physical channel 16 (virtual 16.1)
+[Rede Amazônica Porto Velho]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 479142857
+	FREQUENCY = 485142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 6.1)
-[Globo Minas]
+# Physical channel 18 (virtual 18.1)
+[AmazonSat]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 25.1)
-[Rede Século 21]
+# Physical channel 25 (virtual 25.1)
+[Rede TV! Rondônia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 18.1)
-[Rede Vida]
+# Physical channel 34 (virtual 10.1)
+[SIC TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ro-Cacoal b/isdb-t/br-ro-Cacoal
index 3e47b2fb..58139eae 100644
--- a/isdb-t/br-ro-Cacoal
+++ b/isdb-t/br-ro-Cacoal
@@ -1,5 +1,5 @@
 # Channel table for Cacoal - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/96
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=96
 
 # Physical channel 21 (virtual 5.1)
 [Rede Amazônica Cacoal]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 6.1)
+[Rede Super]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 46.1)
 [SIC TV]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ro-CampoNovoDeRondonia b/isdb-t/br-ro-CampoNovoDeRondonia
new file mode 100644
index 00000000..8ed8384a
--- /dev/null
+++ b/isdb-t/br-ro-CampoNovoDeRondonia
@@ -0,0 +1,32 @@
+# Channel table for Campo Novo De Rond�nia - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3452
+
+# Physical channel 16 (virtual 16.1)
+[Rede Amazônica Porto Velho]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-CandeiasDoJamari b/isdb-t/br-ro-CandeiasDoJamari
index 518f0fbd..5618527a 100644
--- a/isdb-t/br-ro-CandeiasDoJamari
+++ b/isdb-t/br-ro-CandeiasDoJamari
@@ -1,5 +1,5 @@
 # Channel table for Candeias Do Jamari - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3302
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3302
 
 # Physical channel 30 (virtual 11.1)
 [SIC TV]
diff --git a/isdb-t/br-ro-Castanheiras b/isdb-t/br-ro-Castanheiras
new file mode 100644
index 00000000..224788f5
--- /dev/null
+++ b/isdb-t/br-ro-Castanheiras
@@ -0,0 +1,32 @@
+# Channel table for Castanheiras - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4261
+
+# Physical channel 30 (virtual 18.1)
+[SIC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-Cerejeiras b/isdb-t/br-ro-Cerejeiras
new file mode 100644
index 00000000..2eca07a7
--- /dev/null
+++ b/isdb-t/br-ro-Cerejeiras
@@ -0,0 +1,61 @@
+# Channel table for Cerejeiras - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=111
+
+# Physical channel 17 (virtual 3.1)
+[Rede TV! Rondônia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 8.1)
+[SIC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-Cujubim b/isdb-t/br-ro-Cujubim
index 0f255c5c..36407135 100644
--- a/isdb-t/br-ro-Cujubim
+++ b/isdb-t/br-ro-Cujubim
@@ -1,8 +1,8 @@
 # Channel table for Cujubim - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/912
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=912
 
-# Physical channel 18 (virtual 33.1)
-[SIC TV]
+# Physical channel 18 (virtual 18.1)
+[Rede TV! Rondônia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
diff --git a/isdb-t/br-ro-EspigaoDoOeste b/isdb-t/br-ro-EspigaoDoOeste
index b91f3055..4198884a 100644
--- a/isdb-t/br-ro-EspigaoDoOeste
+++ b/isdb-t/br-ro-EspigaoDoOeste
@@ -1,5 +1,5 @@
-# Channel table for Espigão Do Oeste - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/224
+# Channel table for Espig�o Do Oeste - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=224
 
 # Physical channel 21 (virtual 5.1)
 [Rede Amazônica Cacoal]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 46.1)
+[SIC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-GovernadorJorgeTeixeira b/isdb-t/br-ro-GovernadorJorgeTeixeira
index 4ee3b6ea..5127fc52 100644
--- a/isdb-t/br-ro-GovernadorJorgeTeixeira
+++ b/isdb-t/br-ro-GovernadorJorgeTeixeira
@@ -1,5 +1,5 @@
 # Channel table for Governador Jorge Teixeira - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3451
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3451
 
 # Physical channel 16 (virtual 13.1)
 [TV Cidade/RO]
diff --git a/isdb-t/br-ro-Guajara-mirim b/isdb-t/br-ro-Guajara-mirim
index 460cf663..5c390a42 100644
--- a/isdb-t/br-ro-Guajara-mirim
+++ b/isdb-t/br-ro-Guajara-mirim
@@ -1,8 +1,8 @@
-# Channel table for Guajará-mirim - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/110
+# Channel table for Guajar�-mirim - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=110
 
 # Physical channel 14 (virtual 3.1)
-[TV Guajará-Mirim]
+[Rede Amazônica Guajará-Mirim]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
diff --git a/isdb-t/br-ro-Jaru b/isdb-t/br-ro-Jaru
index 41bd5e66..49fd7b9e 100644
--- a/isdb-t/br-ro-Jaru
+++ b/isdb-t/br-ro-Jaru
@@ -1,5 +1,5 @@
 # Channel table for Jaru - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/97
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=97
 
 # Physical channel 16 (virtual 13.1)
 [TV Cidade/RO]
diff --git a/isdb-t/br-ro-Ji-parana b/isdb-t/br-ro-Ji-parana
index 03f9cbde..2e036e3f 100644
--- a/isdb-t/br-ro-Ji-parana
+++ b/isdb-t/br-ro-Ji-parana
@@ -1,8 +1,8 @@
-# Channel table for Ji-paraná - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/98
+# Channel table for Ji-paran� - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=98
 
 # Physical channel 15 (virtual 5.1)
-[TV Ji-Paraná]
+[Rede Amazônica Ji-Paraná]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,35 +30,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 17.1)
-[Rede Vida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 497142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 20 (virtual 7.1)
 [Rede TV! Rondônia]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-ro-MachadinhoD'Oeste b/isdb-t/br-ro-MachadinhoD'Oeste
new file mode 100644
index 00000000..0141771c
--- /dev/null
+++ b/isdb-t/br-ro-MachadinhoD'Oeste
@@ -0,0 +1,61 @@
+# Channel table for Machadinho D� Oeste - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1269
+
+# Physical channel 18 (virtual 18.1)
+[Rede Amazônica Porto Velho]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.1)
+[AmazonSat]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-MinistroAndreazza b/isdb-t/br-ro-MinistroAndreazza
index a632b89b..ab5ea9dd 100644
--- a/isdb-t/br-ro-MinistroAndreazza
+++ b/isdb-t/br-ro-MinistroAndreazza
@@ -1,5 +1,5 @@
 # Channel table for Ministro Andreazza - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/913
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=913
 
 # Physical channel 36 (virtual 13.1)
 [TV Allamanda]
diff --git a/isdb-t/br-ro-NovaBrasilandiaD'Oeste b/isdb-t/br-ro-NovaBrasilandiaD'Oeste
new file mode 100644
index 00000000..b9de6855
--- /dev/null
+++ b/isdb-t/br-ro-NovaBrasilandiaD'Oeste
@@ -0,0 +1,32 @@
+# Channel table for Nova Brasil�ndia D� Oeste - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=916
+
+# Physical channel 16 (virtual 16.1)
+[Rede Amazônica Porto Velho]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-NovoHorizonteDoOeste b/isdb-t/br-ro-NovoHorizonteDoOeste
new file mode 100644
index 00000000..03d40159
--- /dev/null
+++ b/isdb-t/br-ro-NovoHorizonteDoOeste
@@ -0,0 +1,32 @@
+# Channel table for Novo Horizonte Do Oeste - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3444
+
+# Physical channel 30 (virtual 18.1)
+[SIC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-OuroPretoDoOeste b/isdb-t/br-ro-OuroPretoDoOeste
index c2f272b4..d318c2eb 100644
--- a/isdb-t/br-ro-OuroPretoDoOeste
+++ b/isdb-t/br-ro-OuroPretoDoOeste
@@ -1,5 +1,5 @@
 # Channel table for Ouro Preto Do Oeste - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/922
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=922
 
 # Physical channel 26 (virtual 26.1)
 [Rede Mundial]
diff --git a/isdb-t/br-ro-Parecis b/isdb-t/br-ro-Parecis
new file mode 100644
index 00000000..b72d9246
--- /dev/null
+++ b/isdb-t/br-ro-Parecis
@@ -0,0 +1,32 @@
+# Channel table for Parecis - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4125
+
+# Physical channel 30 (virtual 18.1)
+[SIC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-PimentaBueno b/isdb-t/br-ro-PimentaBueno
index f519fab4..b1cdd9ef 100644
--- a/isdb-t/br-ro-PimentaBueno
+++ b/isdb-t/br-ro-PimentaBueno
@@ -1,5 +1,5 @@
 # Channel table for Pimenta Bueno - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/498
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=498
 
 # Physical channel 38 (virtual 12.1)
 [TV Allamanda]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 45 (virtual 45.1)
-[Kake TV]
+[Rede TV! Pimenta Bueno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-ro-PortoVelho b/isdb-t/br-ro-PortoVelho
index f5b1fc9a..080d1e9e 100644
--- a/isdb-t/br-ro-PortoVelho
+++ b/isdb-t/br-ro-PortoVelho
@@ -1,8 +1,8 @@
 # Channel table for Porto Velho - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/109
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=109
 
 # Physical channel 14 (virtual 4.1)
-[TV Rondônia]
+[Rede Amazônica Porto Velho]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 19.1)
-[Rede Vida]
+# Physical channel 20 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
+# Physical channel 21 (virtual 54.1)
 [Rede Gênesis]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -204,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 29.1)
+[TV do Povo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 11.1)
 [SIC TV]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,6 +262,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 15.1)
+[TV Meridional]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 33.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
@@ -262,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 31.1)
-[Record News RO]
+# Physical channel 33 (virtual 10.1)
+[TV Águia Dourada]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 9.1)
-[TV Meridional]
+# Physical channel 34 (virtual 31.1)
+[Record News RO]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,7 +407,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
+# Physical channel 39 (virtual 39.1)
 [TV Capital]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -436,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 5.1)
-[Boas Novas]
+# Physical channel 48 (virtual 5.2)
+[Rema TV, Boas Novas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
@@ -465,3 +523,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 7.4)
+[TV Senado, TV ALE RO, TV Câmara Porto Velho]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-PresidenteMedici b/isdb-t/br-ro-PresidenteMedici
index d80b26a6..99685194 100644
--- a/isdb-t/br-ro-PresidenteMedici
+++ b/isdb-t/br-ro-PresidenteMedici
@@ -1,5 +1,63 @@
-# Channel table for Presidente Médici - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/464
+# Channel table for Presidente M�dici - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=464
+
+# Physical channel 26 (virtual 8.1)
+[TV Regional]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 4.1)
+[SIC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 13.1)
 [TV Allamanda]
diff --git a/isdb-t/br-ro-RolimDeMoura b/isdb-t/br-ro-RolimDeMoura
index c94d1373..2a6df4a7 100644
--- a/isdb-t/br-ro-RolimDeMoura
+++ b/isdb-t/br-ro-RolimDeMoura
@@ -1,5 +1,5 @@
 # Channel table for Rolim De Moura - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/99
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=99
 
 # Physical channel 26 (virtual 6.1)
 [Rede TV! Rondônia]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 33.1)
-[Boas Novas]
+# Physical channel 30 (virtual 18.1)
+[SIC TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 3.1)
-[Band]
+# Physical channel 33 (virtual 33.1)
+[SIS Brasil]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-ro-SantaLuziaD'oeste b/isdb-t/br-ro-SantaLuziaD'oeste
new file mode 100644
index 00000000..748ccd49
--- /dev/null
+++ b/isdb-t/br-ro-SantaLuziaD'oeste
@@ -0,0 +1,32 @@
+# Channel table for Santa Luzia D�oeste - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3904
+
+# Physical channel 30 (virtual 18.1)
+[SIC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-SaoFelipeD'Oeste b/isdb-t/br-ro-SaoFelipeD'Oeste
new file mode 100644
index 00000000..aabc20e1
--- /dev/null
+++ b/isdb-t/br-ro-SaoFelipeD'Oeste
@@ -0,0 +1,32 @@
+# Channel table for S�o Felipe D� Oeste - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4126
+
+# Physical channel 30 (virtual 18.1)
+[SIC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-Theobroma b/isdb-t/br-ro-Theobroma
index c4dfd366..123b7df0 100644
--- a/isdb-t/br-ro-Theobroma
+++ b/isdb-t/br-ro-Theobroma
@@ -1,8 +1,8 @@
 # Channel table for Theobroma - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3450
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3450
 
-# Physical channel 16 (virtual 13.1)
-[TV Cidade/RO]
+# Physical channel 16 (virtual 16.1)
+[Rede Amazônica Porto Velho]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
diff --git a/isdb-t/br-ro-ValeDoAnari b/isdb-t/br-ro-ValeDoAnari
new file mode 100644
index 00000000..893790dc
--- /dev/null
+++ b/isdb-t/br-ro-ValeDoAnari
@@ -0,0 +1,32 @@
+# Channel table for Vale Do Anari - RO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3446
+
+# Physical channel 18 (virtual 18.1)
+[Rede Amazônica Porto Velho]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-ro-Vilhena b/isdb-t/br-ro-Vilhena
index dc6f6d10..fe8b2c81 100644
--- a/isdb-t/br-ro-Vilhena
+++ b/isdb-t/br-ro-Vilhena
@@ -1,8 +1,8 @@
 # Channel table for Vilhena - RO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/100
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=100
 
 # Physical channel 15 (virtual 5.1)
-[TV Vilhena]
+[Rede Amazônica Vilhena]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 23.1)
+[SIC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 11.1)
 [TV Allamanda]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rr-BoaVista b/isdb-t/br-rr-BoaVista
index 06264bfa..39340eb6 100644
--- a/isdb-t/br-rr-BoaVista
+++ b/isdb-t/br-rr-BoaVista
@@ -1,5 +1,5 @@
 # Channel table for Boa Vista - RR - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/59
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=59
 
 # Physical channel 15 (virtual 2.1)
 [TVU Roraima]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 17 (virtual 4.1)
-[TV Roraima]
+[Rede Amazônica Boa Vista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Rede Vida]
+# Physical channel 25 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 27.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -233,6 +233,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 30.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 6.1)
 [TV Imperial]
 	DELIVERY_SYSTEM = ISDBT
@@ -292,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.1)
-[TV Tropical/RR]
+[TV Tropical]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -321,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 12.1)
-[TV Boa Vista]
+[TV Norte]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
diff --git a/isdb-t/br-rr-Caracarai b/isdb-t/br-rr-Caracarai
new file mode 100644
index 00000000..dc0726b2
--- /dev/null
+++ b/isdb-t/br-rr-Caracarai
@@ -0,0 +1,32 @@
+# Channel table for Caracara� - RR - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=537
+
+# Physical channel 19 (virtual 19.1)
+[Extremo Norte TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Agudo b/isdb-t/br-rs-Agudo
new file mode 100644
index 00000000..35eb6bfd
--- /dev/null
+++ b/isdb-t/br-rs-Agudo
@@ -0,0 +1,32 @@
+# Channel table for Agudo - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=336
+
+# Physical channel 16 (virtual 16.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Ajuricaba b/isdb-t/br-rs-Ajuricaba
index 1278c8f5..3e55ac08 100644
--- a/isdb-t/br-rs-Ajuricaba
+++ b/isdb-t/br-rs-Ajuricaba
@@ -1,5 +1,5 @@
 # Channel table for Ajuricaba - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1839
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1839
 
 # Physical channel 35 (virtual 12.1)
 [RBS Cruz Alta]
diff --git a/isdb-t/br-rs-Alegrete b/isdb-t/br-rs-Alegrete
index 39e93fee..cea761c4 100644
--- a/isdb-t/br-rs-Alegrete
+++ b/isdb-t/br-rs-Alegrete
@@ -1,5 +1,34 @@
 # Channel table for Alegrete - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/898
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=898
+
+# Physical channel 16 (virtual 24.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 17 (virtual 18.1)
 [Rede Vida]
diff --git a/isdb-t/br-rs-Alvorada b/isdb-t/br-rs-Alvorada
index a240ca19..4b48d2af 100644
--- a/isdb-t/br-rs-Alvorada
+++ b/isdb-t/br-rs-Alvorada
@@ -1,8 +1,8 @@
 # Channel table for Alvorada - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3746
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3746
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -117,8 +117,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 22 (virtual 22.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -321,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -349,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 40.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rs-Arambare b/isdb-t/br-rs-Arambare
index d381cbdf..b1221239 100644
--- a/isdb-t/br-rs-Arambare
+++ b/isdb-t/br-rs-Arambare
@@ -1,5 +1,5 @@
-# Channel table for Arambaré - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3899
+# Channel table for Arambar� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3899
 
 # Physical channel 29 (virtual 29.1)
 [SBT RS]
diff --git a/isdb-t/br-rs-Ararica b/isdb-t/br-rs-Ararica
index 04ffb444..e89303af 100644
--- a/isdb-t/br-rs-Ararica
+++ b/isdb-t/br-rs-Ararica
@@ -1,5 +1,5 @@
-# Channel table for Araricá - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3837
+# Channel table for Araric� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3837
 
 # Physical channel 22 (virtual 2.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-ArroioDoMeio b/isdb-t/br-rs-ArroioDoMeio
index 2d6d3d7f..1b778d2b 100644
--- a/isdb-t/br-rs-ArroioDoMeio
+++ b/isdb-t/br-rs-ArroioDoMeio
@@ -1,5 +1,5 @@
 # Channel table for Arroio Do Meio - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3748
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3748
 
 # Physical channel 16 (virtual 16.2)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-ArroioDoSal b/isdb-t/br-rs-ArroioDoSal
index dfd4d522..e7b588b3 100644
--- a/isdb-t/br-rs-ArroioDoSal
+++ b/isdb-t/br-rs-ArroioDoSal
@@ -1,34 +1,5 @@
 # Channel table for Arroio Do Sal - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1465
-
-# Physical channel 23 (virtual 8.1)
-[RBS TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1465
 
 # Physical channel 33 (virtual 27.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-ArroioDosRatos b/isdb-t/br-rs-ArroioDosRatos
index 690310c0..dfa30df0 100644
--- a/isdb-t/br-rs-ArroioDosRatos
+++ b/isdb-t/br-rs-ArroioDosRatos
@@ -1,5 +1,5 @@
 # Channel table for Arroio Dos Ratos - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3749
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3749
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Pampa]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 4.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 12.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 40.1)
-[RBI TV]
+# Physical channel 34 (virtual 12.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 61 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 41 (virtual 40.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 755142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-ArroioGrande b/isdb-t/br-rs-ArroioGrande
index aebf922a..fde9704b 100644
--- a/isdb-t/br-rs-ArroioGrande
+++ b/isdb-t/br-rs-ArroioGrande
@@ -1,5 +1,5 @@
 # Channel table for Arroio Grande - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/107
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=107
 
 # Physical channel 35 (virtual 6.1)
 [RBS Pelotas]
diff --git a/isdb-t/br-rs-Arvorezinha b/isdb-t/br-rs-Arvorezinha
index b7e0c692..f04c21e2 100644
--- a/isdb-t/br-rs-Arvorezinha
+++ b/isdb-t/br-rs-Arvorezinha
@@ -1,5 +1,5 @@
 # Channel table for Arvorezinha - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1384
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1384
 
 # Physical channel 21 (virtual 53.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-AugustoPestana b/isdb-t/br-rs-AugustoPestana
index f0b2b2de..05874d9f 100644
--- a/isdb-t/br-rs-AugustoPestana
+++ b/isdb-t/br-rs-AugustoPestana
@@ -1,5 +1,5 @@
 # Channel table for Augusto Pestana - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3327
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3327
 
 # Physical channel 35 (virtual 12.1)
 [RBS Cruz Alta]
diff --git a/isdb-t/br-rs-Bage b/isdb-t/br-rs-Bage
index 5d7402c7..dba81f90 100644
--- a/isdb-t/br-rs-Bage
+++ b/isdb-t/br-rs-Bage
@@ -1,8 +1,37 @@
-# Channel table for Bagé - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/72
+# Channel table for Bag� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=72
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 26.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -30,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 18.4)
-[TV Câmara, ALTV, TV Câmara Municipal Bagé, TV Senado]
+# Physical channel 18 (virtual 5.5)
+[TV Câmara, TV AL RS, TV Câmara Municipal Bagé, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
diff --git a/isdb-t/br-rs-BalnearioPinhal b/isdb-t/br-rs-BalnearioPinhal
index 2fd6c28d..5c770b41 100644
--- a/isdb-t/br-rs-BalnearioPinhal
+++ b/isdb-t/br-rs-BalnearioPinhal
@@ -1,11 +1,11 @@
-# Channel table for Balneário Pinhal - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3750
+# Channel table for Balne�rio Pinhal - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3750
 
-# Physical channel 21 (virtual 13.1)
+# Physical channel 22 (virtual 13.1)
 [Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-BarraDoRibeiro b/isdb-t/br-rs-BarraDoRibeiro
index d00df3d7..1ee80418 100644
--- a/isdb-t/br-rs-BarraDoRibeiro
+++ b/isdb-t/br-rs-BarraDoRibeiro
@@ -1,8 +1,8 @@
 # Channel table for Barra Do Ribeiro - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3753
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3753
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -349,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 59.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 46.1)
 [CNT RS]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rs-BentoGoncalves b/isdb-t/br-rs-BentoGoncalves
index 8c854262..b464a4a9 100644
--- a/isdb-t/br-rs-BentoGoncalves
+++ b/isdb-t/br-rs-BentoGoncalves
@@ -1,5 +1,5 @@
-# Channel table for Bento Gonçalves - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1632
+# Channel table for Bento Gon�alves - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1632
 
 # Physical channel 22 (virtual 32.1)
 [Record TV RS]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 20.1)
+# Physical channel 29 (virtual 29.1)
 [SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 31.1)
+[CNT RS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 52 (virtual 34.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rs-BoaVistaDoCadeado b/isdb-t/br-rs-BoaVistaDoCadeado
index dcb11db8..bfe8e2cb 100644
--- a/isdb-t/br-rs-BoaVistaDoCadeado
+++ b/isdb-t/br-rs-BoaVistaDoCadeado
@@ -1,5 +1,5 @@
 # Channel table for Boa Vista Do Cadeado - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2766
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2766
 
 # Physical channel 33 (virtual 3.1)
 [RBS Cruz Alta]
diff --git a/isdb-t/br-rs-BoaVistaDoIncra b/isdb-t/br-rs-BoaVistaDoIncra
index 30342903..2f60705e 100644
--- a/isdb-t/br-rs-BoaVistaDoIncra
+++ b/isdb-t/br-rs-BoaVistaDoIncra
@@ -1,5 +1,5 @@
 # Channel table for Boa Vista Do Incra - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3325
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3325
 
 # Physical channel 33 (virtual 3.1)
 [RBS Cruz Alta]
diff --git a/isdb-t/br-rs-BomRetiroDoSul b/isdb-t/br-rs-BomRetiroDoSul
index c7e9f033..d23485e1 100644
--- a/isdb-t/br-rs-BomRetiroDoSul
+++ b/isdb-t/br-rs-BomRetiroDoSul
@@ -1,5 +1,5 @@
 # Channel table for Bom Retiro Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3755
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3755
 
 # Physical channel 25 (virtual 9.1)
 [RBS Santa Cruz]
diff --git a/isdb-t/br-rs-Bozano b/isdb-t/br-rs-Bozano
index 7d8ef1c2..4bc90eca 100644
--- a/isdb-t/br-rs-Bozano
+++ b/isdb-t/br-rs-Bozano
@@ -1,5 +1,5 @@
 # Channel table for Bozano - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3316
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3316
 
 # Physical channel 35 (virtual 12.1)
 [RBS Cruz Alta]
diff --git a/isdb-t/br-rs-Butia b/isdb-t/br-rs-Butia
index 13da321e..b74f9b8a 100644
--- a/isdb-t/br-rs-Butia
+++ b/isdb-t/br-rs-Butia
@@ -1,5 +1,5 @@
-# Channel table for Butiá - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1809
+# Channel table for Buti� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1809
 
 # Physical channel 25 (virtual 38.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-CacapavaDoSul b/isdb-t/br-rs-CacapavaDoSul
index 6a5448a1..a8e74464 100644
--- a/isdb-t/br-rs-CacapavaDoSul
+++ b/isdb-t/br-rs-CacapavaDoSul
@@ -1,5 +1,5 @@
-# Channel table for Caçapava Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2092
+# Channel table for Ca�apava Do Sul - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2092
 
 # Physical channel 42 (virtual 13.1)
 [RBS Santa Maria]
diff --git a/isdb-t/br-rs-Cacequi b/isdb-t/br-rs-Cacequi
new file mode 100644
index 00000000..ae4d83fd
--- /dev/null
+++ b/isdb-t/br-rs-Cacequi
@@ -0,0 +1,32 @@
+# Channel table for Cacequi - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2093
+
+# Physical channel 23 (virtual 7.1)
+[RBS Santa Maria]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-CachoeiraDoSul b/isdb-t/br-rs-CachoeiraDoSul
index 94c21f19..1b380047 100644
--- a/isdb-t/br-rs-CachoeiraDoSul
+++ b/isdb-t/br-rs-CachoeiraDoSul
@@ -1,11 +1,11 @@
 # Channel table for Cachoeira Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/762
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=762
 
-# Physical channel 17 (virtual 14.1)
-[Rede Vida]
+# Physical channel 16 (virtual 38.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 485142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 32.1)
-[SBT RS]
+# Physical channel 17 (virtual 14.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 20.1)
-[Band RS]
+# Physical channel 29 (virtual 32.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 3.1)
-[RBS Santa Cruz]
+# Physical channel 40 (virtual 20.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 11.1)
-[TV Cachoeira]
+# Physical channel 42 (virtual 3.1)
+[RBS Santa Cruz]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 57 (virtual 57.1)
-[TV Canção Nova]
+# Physical channel 46 (virtual 11.1)
+[TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 731142857
+	FREQUENCY = 665142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Cachoeirinha b/isdb-t/br-rs-Cachoeirinha
index 4115a1a6..b60e1bc9 100644
--- a/isdb-t/br-rs-Cachoeirinha
+++ b/isdb-t/br-rs-Cachoeirinha
@@ -1,8 +1,8 @@
 # Channel table for Cachoeirinha - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3757
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3757
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 22.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -378,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 40.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rs-Camaqua b/isdb-t/br-rs-Camaqua
index 262e5e15..cb950874 100644
--- a/isdb-t/br-rs-Camaqua
+++ b/isdb-t/br-rs-Camaqua
@@ -1,5 +1,5 @@
-# Channel table for Camaquã - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2126
+# Channel table for Camaqu� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2126
 
 # Physical channel 16 (virtual 25.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-CampoBom b/isdb-t/br-rs-CampoBom
index b586c26f..aff061dd 100644
--- a/isdb-t/br-rs-CampoBom
+++ b/isdb-t/br-rs-CampoBom
@@ -1,8 +1,37 @@
 # Channel table for Campo Bom - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2091
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2091
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 14 (virtual 52.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 22.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -88,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 54.1)
-[TV Pampa]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 54.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 7.1)
-[TVE RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 30 (virtual 7.1)
+[TVE RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 16.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Canção Nova]
+# Physical channel 35 (virtual 16.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Candelaria b/isdb-t/br-rs-Candelaria
index 40e3767e..da475540 100644
--- a/isdb-t/br-rs-Candelaria
+++ b/isdb-t/br-rs-Candelaria
@@ -1,5 +1,5 @@
-# Channel table for Candelária - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/755
+# Channel table for Candel�ria - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=755
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -30,6 +30,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 18 (virtual 18.1)
+[TV Gazeta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 13.1)
+[Record TV RS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 27 (virtual 43.1)
 [SBT RS]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 6.1)
+# Physical channel 35 (virtual 7.1)
 [RBS Santa Cruz]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Canela b/isdb-t/br-rs-Canela
index 4229a3d1..d9e71573 100644
--- a/isdb-t/br-rs-Canela
+++ b/isdb-t/br-rs-Canela
@@ -1,5 +1,5 @@
 # Channel table for Canela - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1634
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1634
 
 # Physical channel 16 (virtual 41.1)
 [TV Canção Nova]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 28.1)
-[TV Pampa]
+# Physical channel 28 (virtual 34.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 34.1)
-[SBT RS]
+# Physical channel 34 (virtual 13.1)
+[RBS Caxias do Sul]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 13.1)
-[RBS Caxias do Sul]
+# Physical channel 40 (virtual 39.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 39.1)
-[Band RS]
+# Physical channel 49 (virtual 53.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Cangucu b/isdb-t/br-rs-Cangucu
index 08819a66..8b92debd 100644
--- a/isdb-t/br-rs-Cangucu
+++ b/isdb-t/br-rs-Cangucu
@@ -1,5 +1,5 @@
-# Channel table for Canguçu - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2119
+# Channel table for Cangu�u - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2119
 
 # Physical channel 22 (virtual 8.1)
 [Record TV RS]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 10.1)
+# Physical channel 33 (virtual 33.1)
 [RBS Pelotas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rs-Canoas b/isdb-t/br-rs-Canoas
index 8265c570..a04495d8 100644
--- a/isdb-t/br-rs-Canoas
+++ b/isdb-t/br-rs-Canoas
@@ -1,8 +1,8 @@
 # Channel table for Canoas - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3322
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3322
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 22.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -378,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 40.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rs-CapaoDaCanoa b/isdb-t/br-rs-CapaoDaCanoa
index 9b8b8085..9b9df166 100644
--- a/isdb-t/br-rs-CapaoDaCanoa
+++ b/isdb-t/br-rs-CapaoDaCanoa
@@ -1,11 +1,40 @@
-# Channel table for Capão Da Canoa - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1466
+# Channel table for Cap�o Da Canoa - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1466
 
-# Physical channel 21 (virtual 2.1)
+# Physical channel 16 (virtual 41.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 13.1)
 [Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-CapaoDoLeao b/isdb-t/br-rs-CapaoDoLeao
index cf110a22..02e3f42c 100644
--- a/isdb-t/br-rs-CapaoDoLeao
+++ b/isdb-t/br-rs-CapaoDoLeao
@@ -1,5 +1,5 @@
-# Channel table for Capão Do Leão - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2130
+# Channel table for Cap�o Do Le�o - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2130
 
 # Physical channel 16 (virtual 30.1)
 [TV Canção Nova]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 14.1)
-[Rede Vida]
+# Physical channel 17 (virtual 7.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -175,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-CapelaDeSantana b/isdb-t/br-rs-CapelaDeSantana
index f6105341..f66f4b37 100644
--- a/isdb-t/br-rs-CapelaDeSantana
+++ b/isdb-t/br-rs-CapelaDeSantana
@@ -1,5 +1,5 @@
 # Channel table for Capela De Santana - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3758
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3758
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
diff --git a/isdb-t/br-rs-CapivariDoSul b/isdb-t/br-rs-CapivariDoSul
index 8e384094..cd9d05ba 100644
--- a/isdb-t/br-rs-CapivariDoSul
+++ b/isdb-t/br-rs-CapivariDoSul
@@ -1,8 +1,8 @@
 # Channel table for Capivari Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3759
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3759
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
diff --git a/isdb-t/br-rs-Carazinho b/isdb-t/br-rs-Carazinho
index 3b248033..03b95c6c 100644
--- a/isdb-t/br-rs-Carazinho
+++ b/isdb-t/br-rs-Carazinho
@@ -1,5 +1,34 @@
 # Channel table for Carazinho - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/62
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=62
+
+# Physical channel 16 (virtual 26.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 15.1)
 [Record TV RS]
@@ -30,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 26 (virtual 9.1)
+[TV Pampa Norte]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 32.1)
 [SBT RS]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rs-CarlosBarbosa b/isdb-t/br-rs-CarlosBarbosa
index 2890d585..94d7015b 100644
--- a/isdb-t/br-rs-CarlosBarbosa
+++ b/isdb-t/br-rs-CarlosBarbosa
@@ -1,5 +1,5 @@
 # Channel table for Carlos Barbosa - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1631
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1631
 
 # Physical channel 22 (virtual 2.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-Catuipe b/isdb-t/br-rs-Catuipe
index 9001c679..aa6b2a40 100644
--- a/isdb-t/br-rs-Catuipe
+++ b/isdb-t/br-rs-Catuipe
@@ -1,5 +1,5 @@
-# Channel table for Catuípe - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2115
+# Channel table for Catu�pe - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2115
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -30,35 +30,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 4.1)
-[RBS Santa Rosa]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 35 (virtual 12.1)
 [RBS Cruz Alta]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rs-CaxiasDoSul b/isdb-t/br-rs-CaxiasDoSul
index f3f389b4..7946d5eb 100644
--- a/isdb-t/br-rs-CaxiasDoSul
+++ b/isdb-t/br-rs-CaxiasDoSul
@@ -1,8 +1,8 @@
 # Channel table for Caxias Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/227
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=227
 
-# Physical channel 15 (virtual 55.1)
-[Ideal TV]
+# Physical channel 15 (virtual 25.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 16 (virtual 41.1)
-[TV Canção Nova]
+[TV Canção Nova RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 57.1)
-[Rede Vida]
+# Physical channel 17 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 19.1)
+# Physical channel 29 (virtual 29.1)
 [SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 43.1)
+# Physical channel 40 (virtual 43.1)
 [Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
+# Physical channel 44 (virtual 47.1)
+[TVE RS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 49.1)
 [TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-CerroLargo b/isdb-t/br-rs-CerroLargo
new file mode 100644
index 00000000..07257815
--- /dev/null
+++ b/isdb-t/br-rs-CerroLargo
@@ -0,0 +1,32 @@
+# Channel table for Cerro Largo - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2108
+
+# Physical channel 42 (virtual 12.1)
+[RBS Santa Rosa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Charqueadas b/isdb-t/br-rs-Charqueadas
index 0f33b8c9..34edaf53 100644
--- a/isdb-t/br-rs-Charqueadas
+++ b/isdb-t/br-rs-Charqueadas
@@ -1,5 +1,5 @@
 # Channel table for Charqueadas - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3760
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3760
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Pampa]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 4.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 12.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 40.1)
-[RBI TV]
+# Physical channel 34 (virtual 12.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 61 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 41 (virtual 40.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 755142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Chuvisca b/isdb-t/br-rs-Chuvisca
index c8870be3..33f9fc4a 100644
--- a/isdb-t/br-rs-Chuvisca
+++ b/isdb-t/br-rs-Chuvisca
@@ -1,5 +1,5 @@
 # Channel table for Chuvisca - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4033
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4033
 
 # Physical channel 29 (virtual 29.1)
 [SBT RS]
diff --git a/isdb-t/br-rs-Cidreira b/isdb-t/br-rs-Cidreira
index 5ed340e6..e5a460ba 100644
--- a/isdb-t/br-rs-Cidreira
+++ b/isdb-t/br-rs-Cidreira
@@ -1,5 +1,5 @@
 # Channel table for Cidreira - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2085
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2085
 
 # Physical channel 23 (virtual 8.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-CoronelBarros b/isdb-t/br-rs-CoronelBarros
index e4f76a04..acae7844 100644
--- a/isdb-t/br-rs-CoronelBarros
+++ b/isdb-t/br-rs-CoronelBarros
@@ -1,5 +1,5 @@
 # Channel table for Coronel Barros - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3328
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3328
 
 # Physical channel 35 (virtual 12.1)
 [RBS Cruz Alta]
diff --git a/isdb-t/br-rs-Crissiumal b/isdb-t/br-rs-Crissiumal
index a28bad9d..4ef23136 100644
--- a/isdb-t/br-rs-Crissiumal
+++ b/isdb-t/br-rs-Crissiumal
@@ -1,5 +1,5 @@
 # Channel table for Crissiumal - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2098
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2098
 
 # Physical channel 46 (virtual 10.1)
 [RBS Santa Rosa]
diff --git a/isdb-t/br-rs-CruzAlta b/isdb-t/br-rs-CruzAlta
index 8e5ebdf5..e8ab1f2d 100644
--- a/isdb-t/br-rs-CruzAlta
+++ b/isdb-t/br-rs-CruzAlta
@@ -1,5 +1,5 @@
 # Channel table for Cruz Alta - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/75
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=75
 
 # Physical channel 15 (virtual 28.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-CruzeiroDoSul b/isdb-t/br-rs-CruzeiroDoSul
index 6f15d692..51e3674f 100644
--- a/isdb-t/br-rs-CruzeiroDoSul
+++ b/isdb-t/br-rs-CruzeiroDoSul
@@ -1,5 +1,5 @@
 # Channel table for Cruzeiro Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3761
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3761
 
 # Physical channel 16 (virtual 29.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-DoisIrmaos b/isdb-t/br-rs-DoisIrmaos
index 19d05acd..2757cb18 100644
--- a/isdb-t/br-rs-DoisIrmaos
+++ b/isdb-t/br-rs-DoisIrmaos
@@ -1,11 +1,11 @@
-# Channel table for Dois Irmãos - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3762
+# Channel table for Dois Irm�os - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3762
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 14 (virtual 52.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 473142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 2.1)
-[Record TV RS]
+# Physical channel 17 (virtual 16.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Pampa]
+# Physical channel 21 (virtual 2.1)
+[Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 4.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 20.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Canção Nova]
+# Physical channel 35 (virtual 20.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-DomPedrito b/isdb-t/br-rs-DomPedrito
index e14c5ee5..1221ae57 100644
--- a/isdb-t/br-rs-DomPedrito
+++ b/isdb-t/br-rs-DomPedrito
@@ -1,5 +1,5 @@
 # Channel table for Dom Pedrito - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2094
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2094
 
 # Physical channel 17 (virtual 18.1)
 [Rede Vida]
diff --git a/isdb-t/br-rs-DomPedroDeAlcantara b/isdb-t/br-rs-DomPedroDeAlcantara
index 5f7e011a..3c9c794e 100644
--- a/isdb-t/br-rs-DomPedroDeAlcantara
+++ b/isdb-t/br-rs-DomPedroDeAlcantara
@@ -1,5 +1,5 @@
-# Channel table for Dom Pedro De Alcântara - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2095
+# Channel table for Dom Pedro De Alc�ntara - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2095
 
 # Physical channel 23 (virtual 8.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-EldoradoDoSul b/isdb-t/br-rs-EldoradoDoSul
index b7cc8369..387eb729 100644
--- a/isdb-t/br-rs-EldoradoDoSul
+++ b/isdb-t/br-rs-EldoradoDoSul
@@ -1,8 +1,8 @@
 # Channel table for Eldorado Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3763
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3763
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -320,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 40.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rs-Encantado b/isdb-t/br-rs-Encantado
new file mode 100644
index 00000000..f7bc3255
--- /dev/null
+++ b/isdb-t/br-rs-Encantado
@@ -0,0 +1,32 @@
+# Channel table for Encantado - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1955
+
+# Physical channel 23 (virtual 57.1)
+[RBS Santa Cruz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-EncruzilhadaDoSul b/isdb-t/br-rs-EncruzilhadaDoSul
new file mode 100644
index 00000000..86f5f5bd
--- /dev/null
+++ b/isdb-t/br-rs-EncruzilhadaDoSul
@@ -0,0 +1,32 @@
+# Channel table for Encruzilhada Do Sul - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1956
+
+# Physical channel 42 (virtual 22.1)
+[RBS Santa Cruz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Erechim b/isdb-t/br-rs-Erechim
index a16b1eb5..b4403ea5 100644
--- a/isdb-t/br-rs-Erechim
+++ b/isdb-t/br-rs-Erechim
@@ -1,5 +1,5 @@
 # Channel table for Erechim - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/74
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=74
 
 # Physical channel 17 (virtual 22.1)
 [Rede Vida]
diff --git a/isdb-t/br-rs-Espumoso b/isdb-t/br-rs-Espumoso
index 60b68dfd..b20bfa26 100644
--- a/isdb-t/br-rs-Espumoso
+++ b/isdb-t/br-rs-Espumoso
@@ -1,5 +1,5 @@
 # Channel table for Espumoso - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1969
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1969
 
 # Physical channel 23 (virtual 46.1)
 [RBS Passo Fundo]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 27.1)
+# Physical channel 27 (virtual 5.1)
 [SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 40.1)
+# Physical channel 49 (virtual 4.1)
 [TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rs-EstanciaVelha b/isdb-t/br-rs-EstanciaVelha
index 12c152ae..d062c2cd 100644
--- a/isdb-t/br-rs-EstanciaVelha
+++ b/isdb-t/br-rs-EstanciaVelha
@@ -1,8 +1,37 @@
-# Channel table for Estância Velha - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3764
+# Channel table for Est�ncia Velha - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3764
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 14 (virtual 52.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 22.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -88,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Pampa]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 4.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 7.1)
-[TVE RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 30 (virtual 7.1)
+[TVE RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 20.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Canção Nova]
+# Physical channel 35 (virtual 20.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Esteio b/isdb-t/br-rs-Esteio
index eeca5645..8adfab83 100644
--- a/isdb-t/br-rs-Esteio
+++ b/isdb-t/br-rs-Esteio
@@ -1,11 +1,11 @@
 # Channel table for Esteio - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3765
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3765
 
-# Physical channel 15 (virtual 14.1)
-[Ideal TV]
+# Physical channel 14 (virtual 52.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 479142857
+	FREQUENCY = 473142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 14.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 18.1)
-[Record News]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 22.1)
-[Rede Brasil]
+# Physical channel 19 (virtual 18.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 503142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -349,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 59.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 46.1)
 [CNT RS]
 	DELIVERY_SYSTEM = ISDBT
@@ -378,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Canção Nova]
+# Physical channel 50 (virtual 48.1)
+[Ulbra TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 689142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Estrela b/isdb-t/br-rs-Estrela
index 66bbb477..bac021dd 100644
--- a/isdb-t/br-rs-Estrela
+++ b/isdb-t/br-rs-Estrela
@@ -1,5 +1,5 @@
 # Channel table for Estrela - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1968
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1968
 
 # Physical channel 16 (virtual 16.2)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-Farroupilha b/isdb-t/br-rs-Farroupilha
index 26d4298e..4a8fba8e 100644
--- a/isdb-t/br-rs-Farroupilha
+++ b/isdb-t/br-rs-Farroupilha
@@ -1,5 +1,5 @@
 # Channel table for Farroupilha - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1971
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1971
 
 # Physical channel 17 (virtual 57.1)
 [Rede Vida]
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 5.1)
+# Physical channel 29 (virtual 29.1)
 [SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 43.1)
+# Physical channel 40 (virtual 43.1)
 [Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-FaxinalDoSoturno b/isdb-t/br-rs-FaxinalDoSoturno
index e132dea5..f502b352 100644
--- a/isdb-t/br-rs-FaxinalDoSoturno
+++ b/isdb-t/br-rs-FaxinalDoSoturno
@@ -1,5 +1,5 @@
 # Channel table for Faxinal Do Soturno - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1978
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1978
 
 # Physical channel 25 (virtual 5.1)
 [RBS Santa Maria]
diff --git a/isdb-t/br-rs-Feliz b/isdb-t/br-rs-Feliz
index 12f91e8e..e369214b 100644
--- a/isdb-t/br-rs-Feliz
+++ b/isdb-t/br-rs-Feliz
@@ -1,5 +1,5 @@
 # Channel table for Feliz - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1979
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1979
 
 # Physical channel 25 (virtual 17.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-FloresDaCunha b/isdb-t/br-rs-FloresDaCunha
index 223283a7..8762faec 100644
--- a/isdb-t/br-rs-FloresDaCunha
+++ b/isdb-t/br-rs-FloresDaCunha
@@ -1,5 +1,5 @@
 # Channel table for Flores Da Cunha - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1630
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1630
 
 # Physical channel 22 (virtual 2.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-FredericoWestphalen b/isdb-t/br-rs-FredericoWestphalen
index d7c4d588..6607f112 100644
--- a/isdb-t/br-rs-FredericoWestphalen
+++ b/isdb-t/br-rs-FredericoWestphalen
@@ -1,5 +1,34 @@
 # Channel table for Frederico Westphalen - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1982
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1982
+
+# Physical channel 15 (virtual 22.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-rs-Garibaldi b/isdb-t/br-rs-Garibaldi
index 3a3bcbcc..c304a3d2 100644
--- a/isdb-t/br-rs-Garibaldi
+++ b/isdb-t/br-rs-Garibaldi
@@ -1,5 +1,5 @@
 # Channel table for Garibaldi - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1629
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1629
 
 # Physical channel 28 (virtual 28.1)
 [SBT RS]
@@ -30,11 +30,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 54.1)
+# Physical channel 39 (virtual 39.1)
+[Band RS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 54.1)
 [RBS Caxias do Sul]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-GeneralCamara b/isdb-t/br-rs-GeneralCamara
index f0ef2912..89e456d5 100644
--- a/isdb-t/br-rs-GeneralCamara
+++ b/isdb-t/br-rs-GeneralCamara
@@ -1,5 +1,5 @@
-# Channel table for General Câmara - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3767
+# Channel table for General C�mara - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3767
 
 # Physical channel 21 (virtual 2.1)
 [Record TV RS]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
diff --git a/isdb-t/br-rs-GetulioVargas b/isdb-t/br-rs-GetulioVargas
index 695120fe..59d858da 100644
--- a/isdb-t/br-rs-GetulioVargas
+++ b/isdb-t/br-rs-GetulioVargas
@@ -1,8 +1,8 @@
-# Channel table for Getúlio Vargas - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1984
+# Channel table for Get�lio Vargas - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1984
 
-# Physical channel 17 (virtual 29.1)
-[Rede Vida]
+# Physical channel 17 (virtual 29.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
diff --git a/isdb-t/br-rs-Glorinha b/isdb-t/br-rs-Glorinha
index b29d1bae..c55ed038 100644
--- a/isdb-t/br-rs-Glorinha
+++ b/isdb-t/br-rs-Glorinha
@@ -1,5 +1,5 @@
 # Channel table for Glorinha - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3768
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3768
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -320,3 +320,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 48.1)
+[Ulbra TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Gramado b/isdb-t/br-rs-Gramado
index 45881ed5..76eccebe 100644
--- a/isdb-t/br-rs-Gramado
+++ b/isdb-t/br-rs-Gramado
@@ -1,5 +1,5 @@
 # Channel table for Gramado - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/138
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=138
 
 # Physical channel 15 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-rs-Gravatai b/isdb-t/br-rs-Gravatai
index 4d775a96..fcab8abf 100644
--- a/isdb-t/br-rs-Gravatai
+++ b/isdb-t/br-rs-Gravatai
@@ -1,8 +1,8 @@
-# Channel table for Gravataí - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3769
+# Channel table for Gravata� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3769
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 22.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -378,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 40.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rs-Guaiba b/isdb-t/br-rs-Guaiba
index e59dceb4..de4e23ad 100644
--- a/isdb-t/br-rs-Guaiba
+++ b/isdb-t/br-rs-Guaiba
@@ -1,8 +1,8 @@
-# Channel table for Guaíba - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3770
+# Channel table for Gua�ba - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3770
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -320,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 40.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rs-Guapore b/isdb-t/br-rs-Guapore
index 3e3b6464..e84c117e 100644
--- a/isdb-t/br-rs-Guapore
+++ b/isdb-t/br-rs-Guapore
@@ -1,5 +1,5 @@
-# Channel table for Guaporé - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1961
+# Channel table for Guapor� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1961
 
 # Physical channel 16 (virtual 21.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-GuaraniDasMissoes b/isdb-t/br-rs-GuaraniDasMissoes
new file mode 100644
index 00000000..336769ac
--- /dev/null
+++ b/isdb-t/br-rs-GuaraniDasMissoes
@@ -0,0 +1,32 @@
+# Channel table for Guarani Das Miss�es - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1962
+
+# Physical channel 24 (virtual 5.1)
+[RBS Santa Rosa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-HulhaNegra b/isdb-t/br-rs-HulhaNegra
index 5d785865..a45771c6 100644
--- a/isdb-t/br-rs-HulhaNegra
+++ b/isdb-t/br-rs-HulhaNegra
@@ -1,5 +1,5 @@
 # Channel table for Hulha Negra - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1954
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1954
 
 # Physical channel 34 (virtual 6.1)
 [RBS Bagé]
diff --git a/isdb-t/br-rs-Ibiruba b/isdb-t/br-rs-Ibiruba
new file mode 100644
index 00000000..1977fb9a
--- /dev/null
+++ b/isdb-t/br-rs-Ibiruba
@@ -0,0 +1,32 @@
+# Channel table for Ibirub� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=998
+
+# Physical channel 35 (virtual 8.1)
+[RBS Cruz Alta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Igrejinha b/isdb-t/br-rs-Igrejinha
index fda863f5..166c224f 100644
--- a/isdb-t/br-rs-Igrejinha
+++ b/isdb-t/br-rs-Igrejinha
@@ -1,5 +1,5 @@
 # Channel table for Igrejinha - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1694
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1694
 
 # Physical channel 22 (virtual 2.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-Ijui b/isdb-t/br-rs-Ijui
index 623d4129..fa0d7a59 100644
--- a/isdb-t/br-rs-Ijui
+++ b/isdb-t/br-rs-Ijui
@@ -1,5 +1,5 @@
-# Channel table for Ijuí - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/897
+# Channel table for Iju� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=897
 
 # Physical channel 16 (virtual 24.1)
 [TV Canção Nova]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 30.1)
+# Physical channel 21 (virtual 2.1)
 [Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rs-Ilopolis b/isdb-t/br-rs-Ilopolis
index 62b8f5ed..dc01d180 100644
--- a/isdb-t/br-rs-Ilopolis
+++ b/isdb-t/br-rs-Ilopolis
@@ -1,5 +1,5 @@
-# Channel table for Ilópolis - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2055
+# Channel table for Il�polis - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2055
 
 # Physical channel 16 (virtual 21.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-Imbe b/isdb-t/br-rs-Imbe
index 9626b35d..d1f6fccb 100644
--- a/isdb-t/br-rs-Imbe
+++ b/isdb-t/br-rs-Imbe
@@ -1,11 +1,11 @@
-# Channel table for Imbé - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3389
+# Channel table for Imb� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3389
 
-# Physical channel 21 (virtual 2.1)
+# Physical channel 22 (virtual 13.1)
 [Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Imigrante b/isdb-t/br-rs-Imigrante
index 20bf646f..2a08d943 100644
--- a/isdb-t/br-rs-Imigrante
+++ b/isdb-t/br-rs-Imigrante
@@ -1,5 +1,5 @@
 # Channel table for Imigrante - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1628
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1628
 
 # Physical channel 23 (virtual 13.1)
 [RBS Santa Cruz]
diff --git a/isdb-t/br-rs-Independencia b/isdb-t/br-rs-Independencia
index 8521befc..eda2b390 100644
--- a/isdb-t/br-rs-Independencia
+++ b/isdb-t/br-rs-Independencia
@@ -1,5 +1,5 @@
-# Channel table for Independência - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2056
+# Channel table for Independ�ncia - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2056
 
 # Physical channel 34 (virtual 6.1)
 [RBS Santa Rosa]
diff --git a/isdb-t/br-rs-Itaqui b/isdb-t/br-rs-Itaqui
index c97b7833..55db602e 100644
--- a/isdb-t/br-rs-Itaqui
+++ b/isdb-t/br-rs-Itaqui
@@ -1,5 +1,5 @@
 # Channel table for Itaqui - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/685
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=685
 
 # Physical channel 28 (virtual 28.2)
 [TVE RS]
diff --git a/isdb-t/br-rs-Ivoti b/isdb-t/br-rs-Ivoti
index 47a5b9a3..d506859c 100644
--- a/isdb-t/br-rs-Ivoti
+++ b/isdb-t/br-rs-Ivoti
@@ -1,11 +1,11 @@
 # Channel table for Ivoti - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3772
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3772
 
-# Physical channel 15 (virtual 14.1)
-[Ideal TV]
+# Physical channel 14 (virtual 52.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 479142857
+	FREQUENCY = 473142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 14.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 2.1)
-[Record TV RS]
+# Physical channel 17 (virtual 16.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Pampa]
+# Physical channel 21 (virtual 2.1)
+[Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 4.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 12.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Canção Nova]
+# Physical channel 34 (virtual 12.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Jaguarao b/isdb-t/br-rs-Jaguarao
index 598c0cc4..cc6b4880 100644
--- a/isdb-t/br-rs-Jaguarao
+++ b/isdb-t/br-rs-Jaguarao
@@ -1,5 +1,34 @@
-# Channel table for Jaguarão - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/758
+# Channel table for Jaguar�o - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=758
+
+# Physical channel 16 (virtual 19.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 10.1)
 [RBS Pelotas]
diff --git a/isdb-t/br-rs-Jaguari b/isdb-t/br-rs-Jaguari
index 69e4f876..4f6273f4 100644
--- a/isdb-t/br-rs-Jaguari
+++ b/isdb-t/br-rs-Jaguari
@@ -1,5 +1,5 @@
 # Channel table for Jaguari - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2063
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2063
 
 # Physical channel 25 (virtual 3.1)
 [RBS Santa Cruz]
diff --git a/isdb-t/br-to-AliancaDoTocantins b/isdb-t/br-rs-JulioDeCastilhos
index ba390650..b3a81405 100644
--- a/isdb-t/br-to-AliancaDoTocantins
+++ b/isdb-t/br-rs-JulioDeCastilhos
@@ -1,8 +1,8 @@
-# Channel table for Aliança Do Tocantins - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2768
+# Channel table for J�lio De Castilhos - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2066
 
-# Physical channel 23 (virtual 11.1)
-[TV Anhanguera Gurupi]
+# Physical channel 23 (virtual 6.1)
+[RBS Santa Maria]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-rs-LagoaVermelha b/isdb-t/br-rs-LagoaVermelha
index c2dc5fdb..feded556 100644
--- a/isdb-t/br-rs-LagoaVermelha
+++ b/isdb-t/br-rs-LagoaVermelha
@@ -1,5 +1,5 @@
 # Channel table for Lagoa Vermelha - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2068
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2068
 
 # Physical channel 17 (virtual 39.1)
 [Rede Vida]
diff --git a/isdb-t/br-rs-Lajeado b/isdb-t/br-rs-Lajeado
index e96fbb1c..fd4157e6 100644
--- a/isdb-t/br-rs-Lajeado
+++ b/isdb-t/br-rs-Lajeado
@@ -1,5 +1,5 @@
 # Channel table for Lajeado - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/764
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=764
 
 # Physical channel 16 (virtual 29.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-LindolfoCollor b/isdb-t/br-rs-LindolfoCollor
index 3017ed24..88f20f10 100644
--- a/isdb-t/br-rs-LindolfoCollor
+++ b/isdb-t/br-rs-LindolfoCollor
@@ -1,8 +1,37 @@
 # Channel table for Lindolfo Collor - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3782
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3782
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 14 (virtual 52.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 22.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -88,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Pampa]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 4.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 7.1)
-[TVE RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 30 (virtual 7.1)
+[TVE RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 20.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Canção Nova]
+# Physical channel 35 (virtual 20.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-LinhaNova b/isdb-t/br-rs-LinhaNova
index 5af6685b..40162ddd 100644
--- a/isdb-t/br-rs-LinhaNova
+++ b/isdb-t/br-rs-LinhaNova
@@ -1,5 +1,5 @@
 # Channel table for Linha Nova - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3773
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3773
 
 # Physical channel 21 (virtual 2.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-Marau b/isdb-t/br-rs-Marau
index 9e147185..ee6b68f7 100644
--- a/isdb-t/br-rs-Marau
+++ b/isdb-t/br-rs-Marau
@@ -1,5 +1,5 @@
 # Channel table for Marau - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2046
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2046
 
 # Physical channel 34 (virtual 7.1)
 [RBS Passo Fundo]
diff --git a/isdb-t/br-rs-MatoLeitao b/isdb-t/br-rs-MatoLeitao
index 8c2cf4fe..5273fd90 100644
--- a/isdb-t/br-rs-MatoLeitao
+++ b/isdb-t/br-rs-MatoLeitao
@@ -1,5 +1,5 @@
-# Channel table for Mato Leitão - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3745
+# Channel table for Mato Leit�o - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3745
 
 # Physical channel 14 (virtual 40.1)
 [SBT RS]
diff --git a/isdb-t/br-rs-MinasDoLeao b/isdb-t/br-rs-MinasDoLeao
index 425cff76..ad347499 100644
--- a/isdb-t/br-rs-MinasDoLeao
+++ b/isdb-t/br-rs-MinasDoLeao
@@ -1,5 +1,5 @@
-# Channel table for Minas Do Leão - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1858
+# Channel table for Minas Do Le�o - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1858
 
 # Physical channel 25 (virtual 38.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-MonteAlegreDosCampos b/isdb-t/br-rs-MonteAlegreDosCampos
index 86eee00f..fa9fa2ef 100644
--- a/isdb-t/br-rs-MonteAlegreDosCampos
+++ b/isdb-t/br-rs-MonteAlegreDosCampos
@@ -1,5 +1,5 @@
 # Channel table for Monte Alegre Dos Campos - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2041
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2041
 
 # Physical channel 16 (virtual 17.1)
 [Rede Vida]
diff --git a/isdb-t/br-rs-Montenegro b/isdb-t/br-rs-Montenegro
index be2f43da..477e8349 100644
--- a/isdb-t/br-rs-Montenegro
+++ b/isdb-t/br-rs-Montenegro
@@ -1,5 +1,5 @@
 # Channel table for Montenegro - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2038
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2038
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
diff --git a/isdb-t/br-rs-MorroRedondo b/isdb-t/br-rs-MorroRedondo
index 428b2d9e..7679a3ed 100644
--- a/isdb-t/br-rs-MorroRedondo
+++ b/isdb-t/br-rs-MorroRedondo
@@ -1,5 +1,5 @@
 # Channel table for Morro Redondo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2132
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2132
 
 # Physical channel 34 (virtual 4.1)
 [RBS Pelotas]
diff --git a/isdb-t/br-rs-MorroReuter b/isdb-t/br-rs-MorroReuter
index eb98d449..34df77e0 100644
--- a/isdb-t/br-rs-MorroReuter
+++ b/isdb-t/br-rs-MorroReuter
@@ -1,11 +1,11 @@
 # Channel table for Morro Reuter - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3775
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3775
 
-# Physical channel 15 (virtual 14.1)
-[Ideal TV]
+# Physical channel 14 (virtual 52.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 479142857
+	FREQUENCY = 473142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 14.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 2.1)
-[Record TV RS]
+# Physical channel 17 (virtual 16.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Pampa]
+# Physical channel 21 (virtual 2.1)
+[Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 4.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 12.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Canção Nova]
+# Physical channel 34 (virtual 12.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Nao-me-toque b/isdb-t/br-rs-Nao-me-toque
new file mode 100644
index 00000000..d3a22329
--- /dev/null
+++ b/isdb-t/br-rs-Nao-me-toque
@@ -0,0 +1,32 @@
+# Channel table for N�o-me-toque - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2170
+
+# Physical channel 42 (virtual 5.1)
+[RBS Passo Fundo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-NovaHartz b/isdb-t/br-rs-NovaHartz
index 6d094527..a3b1c2f2 100644
--- a/isdb-t/br-rs-NovaHartz
+++ b/isdb-t/br-rs-NovaHartz
@@ -1,5 +1,5 @@
 # Channel table for Nova Hartz - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3844
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3844
 
 # Physical channel 22 (virtual 2.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-NovaPetropolis b/isdb-t/br-rs-NovaPetropolis
index a88d5d12..50312a80 100644
--- a/isdb-t/br-rs-NovaPetropolis
+++ b/isdb-t/br-rs-NovaPetropolis
@@ -1,5 +1,5 @@
-# Channel table for Nova Petrópolis - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2157
+# Channel table for Nova Petr�polis - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2157
 
 # Physical channel 29 (virtual 19.1)
 [SBT RS]
diff --git a/isdb-t/br-rs-NovaPrata b/isdb-t/br-rs-NovaPrata
index e10dce71..fb9a4e68 100644
--- a/isdb-t/br-rs-NovaPrata
+++ b/isdb-t/br-rs-NovaPrata
@@ -1,5 +1,5 @@
 # Channel table for Nova Prata - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/649
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=649
 
 # Physical channel 25 (virtual 5.1)
 [RBS Caxias do Sul]
diff --git a/isdb-t/br-rs-NovaSantaRita b/isdb-t/br-rs-NovaSantaRita
index 5945bef7..834114d2 100644
--- a/isdb-t/br-rs-NovaSantaRita
+++ b/isdb-t/br-rs-NovaSantaRita
@@ -1,8 +1,8 @@
 # Channel table for Nova Santa Rita - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3072
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3072
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -320,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 40.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -436,3 +436,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 48.1)
+[Ulbra TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-NovoHamburgo b/isdb-t/br-rs-NovoHamburgo
index 9041ef02..96d2e66f 100644
--- a/isdb-t/br-rs-NovoHamburgo
+++ b/isdb-t/br-rs-NovoHamburgo
@@ -1,8 +1,37 @@
 # Channel table for Novo Hamburgo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2149
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2149
+
+# Physical channel 14 (virtual 52.1)
+[TV Canção Nova RS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 22.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -117,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Pampa]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 4.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 7.1)
-[TVE RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 30 (virtual 7.1)
+[TVE RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 20.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Canção Nova]
+# Physical channel 35 (virtual 20.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Osorio b/isdb-t/br-rs-Osorio
index 8eef42e8..015cf19a 100644
--- a/isdb-t/br-rs-Osorio
+++ b/isdb-t/br-rs-Osorio
@@ -1,11 +1,11 @@
-# Channel table for Osório - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/761
+# Channel table for Os�rio - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=761
 
-# Physical channel 21 (virtual 13.1)
-[Record TV RS]
+# Physical channel 16 (virtual 41.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 485142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 20.1)
-[SBT RS]
+# Physical channel 22 (virtual 13.1)
+[Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 3.1)
-[Band RS]
+# Physical channel 28 (virtual 20.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 6.1)
-[RBS TV]
+# Physical channel 32 (virtual 3.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 11.1)
-[TV Pampa]
+# Physical channel 35 (virtual 6.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 58 (virtual 58.1)
-[TV Canção Nova]
+# Physical channel 49 (virtual 11.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 737142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-PalmaresDoSul b/isdb-t/br-rs-PalmaresDoSul
index b2fbc145..f45db562 100644
--- a/isdb-t/br-rs-PalmaresDoSul
+++ b/isdb-t/br-rs-PalmaresDoSul
@@ -1,5 +1,5 @@
 # Channel table for Palmares Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2148
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2148
 
 # Physical channel 23 (virtual 13.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-PalmeiraDasMissoes b/isdb-t/br-rs-PalmeiraDasMissoes
index 486f4258..98d6892d 100644
--- a/isdb-t/br-rs-PalmeiraDasMissoes
+++ b/isdb-t/br-rs-PalmeiraDasMissoes
@@ -1,5 +1,5 @@
-# Channel table for Palmeira Das Missões - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2169
+# Channel table for Palmeira Das Miss�es - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2169
 
 # Physical channel 28 (virtual 27.1)
 [SBT RS]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 8.1)
+[RBS Passo Fundo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Panambi b/isdb-t/br-rs-Panambi
index aa74f04d..624d0c24 100644
--- a/isdb-t/br-rs-Panambi
+++ b/isdb-t/br-rs-Panambi
@@ -1,5 +1,34 @@
 # Channel table for Panambi - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2173
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2173
+
+# Physical channel 42 (virtual 48.1)
+[RBS Cruz Alta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 54.1)
 [TV Pampa Norte]
diff --git a/isdb-t/br-rs-ParaisoDoSul b/isdb-t/br-rs-ParaisoDoSul
index b27c60d7..7d0a4958 100644
--- a/isdb-t/br-rs-ParaisoDoSul
+++ b/isdb-t/br-rs-ParaisoDoSul
@@ -1,5 +1,5 @@
-# Channel table for Paraíso Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/337
+# Channel table for Para�so Do Sul - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=337
 
 # Physical channel 33 (virtual 6.1)
 [RBS Santa Cruz]
diff --git a/isdb-t/br-rs-PareciNovo b/isdb-t/br-rs-PareciNovo
index 1ab4d264..8c1f1841 100644
--- a/isdb-t/br-rs-PareciNovo
+++ b/isdb-t/br-rs-PareciNovo
@@ -1,5 +1,5 @@
 # Channel table for Pareci Novo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3776
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3776
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
diff --git a/isdb-t/br-rs-Parobe b/isdb-t/br-rs-Parobe
index aec54f6e..b8c21dc3 100644
--- a/isdb-t/br-rs-Parobe
+++ b/isdb-t/br-rs-Parobe
@@ -1,5 +1,5 @@
-# Channel table for Parobé - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3777
+# Channel table for Parob� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3777
 
 # Physical channel 16 (virtual 41.1)
 [TV Canção Nova]
@@ -117,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 39.1)
+[Band RS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-PassoFundo b/isdb-t/br-rs-PassoFundo
index 14c4dc2f..83b19d9e 100644
--- a/isdb-t/br-rs-PassoFundo
+++ b/isdb-t/br-rs-PassoFundo
@@ -1,5 +1,5 @@
 # Channel table for Passo Fundo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/61
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=61
 
 # Physical channel 15 (virtual 30.1)
 [TV Canção Nova]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 28.1)
+# Physical channel 20 (virtual 2.1)
 [Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 13.1)
+[TV Pampa Norte]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-PedrasAltas b/isdb-t/br-rs-PedrasAltas
index 921de2e3..be9d5621 100644
--- a/isdb-t/br-rs-PedrasAltas
+++ b/isdb-t/br-rs-PedrasAltas
@@ -1,5 +1,5 @@
 # Channel table for Pedras Altas - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2178
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2178
 
 # Physical channel 23 (virtual 45.1)
 [RBS Bagé]
diff --git a/isdb-t/br-rs-PedroOsorio b/isdb-t/br-rs-PedroOsorio
index 48fa743c..0d5a21ee 100644
--- a/isdb-t/br-rs-PedroOsorio
+++ b/isdb-t/br-rs-PedroOsorio
@@ -1,5 +1,5 @@
-# Channel table for Pedro Osório - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2176
+# Channel table for Pedro Os�rio - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2176
 
 # Physical channel 25 (virtual 12.1)
 [RBS Pelotas]
diff --git a/isdb-t/br-rs-Pejucara b/isdb-t/br-rs-Pejucara
index 065ec5ed..0162907b 100644
--- a/isdb-t/br-rs-Pejucara
+++ b/isdb-t/br-rs-Pejucara
@@ -1,5 +1,5 @@
-# Channel table for Pejuçara - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2177
+# Channel table for Peju�ara - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2177
 
 # Physical channel 33 (virtual 3.1)
 [RBS Cruz Alta]
diff --git a/isdb-t/br-rs-Pelotas b/isdb-t/br-rs-Pelotas
index cf05a6fa..527c92b5 100644
--- a/isdb-t/br-rs-Pelotas
+++ b/isdb-t/br-rs-Pelotas
@@ -1,5 +1,5 @@
 # Channel table for Pelotas - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/70
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=70
 
 # Physical channel 16 (virtual 30.1)
 [TV Canção Nova]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 14.1)
-[Rede Vida]
+# Physical channel 17 (virtual 7.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 21 (virtual 21.5)
+[TV Câmara, TV Câmara Municipal Pelotas, TV AL RS, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 26 (virtual 13.1)
 [TV Pampa Sul]
 	DELIVERY_SYSTEM = ISDBT
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 20.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 24.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-rs-PicadaCafe b/isdb-t/br-rs-PicadaCafe
index 074797a2..a57f6644 100644
--- a/isdb-t/br-rs-PicadaCafe
+++ b/isdb-t/br-rs-PicadaCafe
@@ -1,5 +1,5 @@
-# Channel table for Picada Café - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2171
+# Channel table for Picada Caf� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2171
 
 # Physical channel 35 (virtual 12.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-Portao b/isdb-t/br-rs-Portao
index 75463763..28ea4f42 100644
--- a/isdb-t/br-rs-Portao
+++ b/isdb-t/br-rs-Portao
@@ -1,8 +1,8 @@
-# Channel table for Portão - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3779
+# Channel table for Port�o - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3779
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-rs-PortoAlegre b/isdb-t/br-rs-PortoAlegre
index 33101152..14e0c75b 100644
--- a/isdb-t/br-rs-PortoAlegre
+++ b/isdb-t/br-rs-PortoAlegre
@@ -1,8 +1,8 @@
 # Channel table for Porto Alegre - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/29
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=29
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 22.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -407,7 +407,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 40.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-rs-PousoNovo b/isdb-t/br-rs-PousoNovo
index b9c6a63a..2010ffaf 100644
--- a/isdb-t/br-rs-PousoNovo
+++ b/isdb-t/br-rs-PousoNovo
@@ -1,5 +1,5 @@
 # Channel table for Pouso Novo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4032
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4032
 
 # Physical channel 42 (virtual 42.1)
 [RBS Santa Cruz]
diff --git a/isdb-t/br-rs-PresidenteLucena b/isdb-t/br-rs-PresidenteLucena
index b9c0b481..3fa30def 100644
--- a/isdb-t/br-rs-PresidenteLucena
+++ b/isdb-t/br-rs-PresidenteLucena
@@ -1,5 +1,5 @@
 # Channel table for Presidente Lucena - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3780
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3780
 
 # Physical channel 33 (virtual 33.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-Quarai b/isdb-t/br-rs-Quarai
index df03a3d7..2dea4054 100644
--- a/isdb-t/br-rs-Quarai
+++ b/isdb-t/br-rs-Quarai
@@ -1,5 +1,5 @@
-# Channel table for Quaraí - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/439
+# Channel table for Quara� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=439
 
 # Physical channel 27 (virtual 3.2)
 [Artigas Televisión, Artigas TV+]
diff --git a/isdb-t/br-rs-RioGrande b/isdb-t/br-rs-RioGrande
index 9c2d196e..73157881 100644
--- a/isdb-t/br-rs-RioGrande
+++ b/isdb-t/br-rs-RioGrande
@@ -1,5 +1,5 @@
 # Channel table for Rio Grande - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/73
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=73
 
 # Physical channel 14 (virtual 28.1)
 [TV Canção Nova]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 15 (virtual 17.1)
-[Rede Vida]
+# Physical channel 15 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 23 (virtual 7.1)
+[RBS Rio Grande]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 27 (virtual 25.1)
 [SBT RS]
 	DELIVERY_SYSTEM = ISDBT
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.4)
-[TV Câmara, TV Câmara Municipal, ALTV, TV Senado]
+# Physical channel 47 (virtual 8.4)
+[TV Câmara, TV Câmara Municipal, TV AL RS, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-rs-RioPardo b/isdb-t/br-rs-RioPardo
index 8975dc0d..9c553fb4 100644
--- a/isdb-t/br-rs-RioPardo
+++ b/isdb-t/br-rs-RioPardo
@@ -1,11 +1,11 @@
 # Channel table for Rio Pardo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1622
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1622
 
-# Physical channel 33 (virtual 6.1)
+# Physical channel 25 (virtual 47.1)
 [RBS Santa Cruz]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-RocaSales b/isdb-t/br-rs-RocaSales
index 6c1f24ee..945f6a36 100644
--- a/isdb-t/br-rs-RocaSales
+++ b/isdb-t/br-rs-RocaSales
@@ -1,5 +1,5 @@
 # Channel table for Roca Sales - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1904
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1904
 
 # Physical channel 23 (virtual 57.1)
 [RBS Santa Cruz]
diff --git a/isdb-t/br-rs-Rolante b/isdb-t/br-rs-Rolante
index c24ae5dc..fb45791c 100644
--- a/isdb-t/br-rs-Rolante
+++ b/isdb-t/br-rs-Rolante
@@ -1,5 +1,5 @@
 # Channel table for Rolante - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/760
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=760
 
 # Physical channel 22 (virtual 43.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-RosarioDoSul b/isdb-t/br-rs-RosarioDoSul
index f5ad74f9..97b3db0c 100644
--- a/isdb-t/br-rs-RosarioDoSul
+++ b/isdb-t/br-rs-RosarioDoSul
@@ -1,5 +1,5 @@
-# Channel table for Rosário Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1908
+# Channel table for Ros�rio Do Sul - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1908
 
 # Physical channel 17 (virtual 31.1)
 [Rede Vida]
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 35 (virtual 11.1)
+[RBS Santa Maria]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-SalvadorDoSul b/isdb-t/br-rs-SalvadorDoSul
index 5ee4e3ba..e00dca3f 100644
--- a/isdb-t/br-rs-SalvadorDoSul
+++ b/isdb-t/br-rs-SalvadorDoSul
@@ -1,5 +1,5 @@
 # Channel table for Salvador Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1912
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1912
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-rs-Sananduva b/isdb-t/br-rs-Sananduva
index 8688c293..959aa0c1 100644
--- a/isdb-t/br-rs-Sananduva
+++ b/isdb-t/br-rs-Sananduva
@@ -1,5 +1,5 @@
 # Channel table for Sananduva - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1913
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1913
 
 # Physical channel 18 (virtual 7.1)
 [RBS Passo Fundo]
diff --git a/isdb-t/br-rs-SantaCruzDoSul b/isdb-t/br-rs-SantaCruzDoSul
index 24388cf8..cff3d04a 100644
--- a/isdb-t/br-rs-SantaCruzDoSul
+++ b/isdb-t/br-rs-SantaCruzDoSul
@@ -1,8 +1,37 @@
 # Channel table for Santa Cruz Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/76
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=76
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 31.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -30,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 18 (virtual 18.1)
+[Canal em teste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 21 (virtual 13.1)
 [Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
@@ -175,3 +233,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 45.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 11.1)
+[TV Pampa Santa Maria]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-SantaCruzDoSul(monteAlverne) b/isdb-t/br-rs-SantaCruzDoSul(monteAlverne)
index f8f96c48..7520feae 100644
--- a/isdb-t/br-rs-SantaCruzDoSul(monteAlverne)
+++ b/isdb-t/br-rs-SantaCruzDoSul(monteAlverne)
@@ -1,5 +1,5 @@
 # Channel table for Santa Cruz Do Sul (monte Alverne) - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3583
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3583
 
 # Physical channel 34 (virtual 13.1)
 [RBS Santa Cruz]
diff --git a/isdb-t/br-rs-SantaMaria b/isdb-t/br-rs-SantaMaria
index d46bd00c..61e4f523 100644
--- a/isdb-t/br-rs-SantaMaria
+++ b/isdb-t/br-rs-SantaMaria
@@ -1,5 +1,5 @@
 # Channel table for Santa Maria - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/71
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=71
 
 # Physical channel 14 (virtual 17.1)
 [TV Canção Nova]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 15.1)
-[Rede Vida]
+# Physical channel 16 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 18.4)
-[TV Câmara, TV Câmara Santa Maria, ALTV, TV Senado]
+[TV Câmara, TV Câmara Santa Maria, TV AL RS, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 46.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 21.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-rs-SantaRosa b/isdb-t/br-rs-SantaRosa
index e9c8d7bf..c1ff6a8d 100644
--- a/isdb-t/br-rs-SantaRosa
+++ b/isdb-t/br-rs-SantaRosa
@@ -1,5 +1,5 @@
 # Channel table for Santa Rosa - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/901
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=901
 
 # Physical channel 16 (virtual 23.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-SantaVitoriaDoPalmar b/isdb-t/br-rs-SantaVitoriaDoPalmar
new file mode 100644
index 00000000..51b6a5ef
--- /dev/null
+++ b/isdb-t/br-rs-SantaVitoriaDoPalmar
@@ -0,0 +1,32 @@
+# Channel table for Santa Vit�ria Do Palmar - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1917
+
+# Physical channel 24 (virtual 5.1)
+[RBS Pelotas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-SantanaDoLivramento b/isdb-t/br-rs-SantanaDoLivramento
index 9b1e543d..0ac3461d 100644
--- a/isdb-t/br-rs-SantanaDoLivramento
+++ b/isdb-t/br-rs-SantanaDoLivramento
@@ -1,5 +1,34 @@
 # Channel table for Santana Do Livramento - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/147
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=147
+
+# Physical channel 16 (virtual 33.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 5.2)
 [TNU]
diff --git a/isdb-t/br-rs-Santiago b/isdb-t/br-rs-Santiago
index 822e2d14..d60866d9 100644
--- a/isdb-t/br-rs-Santiago
+++ b/isdb-t/br-rs-Santiago
@@ -1,5 +1,5 @@
 # Channel table for Santiago - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1919
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1919
 
 # Physical channel 24 (virtual 10.1)
 [RBS Santa Maria]
diff --git a/isdb-t/br-rs-SantoAntonioDaPatrulha b/isdb-t/br-rs-SantoAntonioDaPatrulha
index 2dc60d93..678f9e0b 100644
--- a/isdb-t/br-rs-SantoAntonioDaPatrulha
+++ b/isdb-t/br-rs-SantoAntonioDaPatrulha
@@ -1,5 +1,5 @@
-# Channel table for Santo Antônio Da Patrulha - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1895
+# Channel table for Santo Ant�nio Da Patrulha - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1895
 
 # Physical channel 19 (virtual 18.1)
 [Record News]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[RCI]
+# Physical channel 39 (virtual 39.1)
+[TV Novo Tempo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -262,32 +262,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 44.1)
-[TV Novo Tempo]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-rs-SantoCristo b/isdb-t/br-rs-SantoCristo
index b6107da2..4ccd27ac 100644
--- a/isdb-t/br-rs-SantoCristo
+++ b/isdb-t/br-rs-SantoCristo
@@ -1,5 +1,5 @@
 # Channel table for Santo Cristo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3381
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3381
 
 # Physical channel 24 (virtual 6.1)
 [RBS Santa Rosa]
diff --git a/isdb-t/br-rs-SantoAngelo b/isdb-t/br-rs-Santoangelo
index b570392c..3d3e657d 100644
--- a/isdb-t/br-rs-SantoAngelo
+++ b/isdb-t/br-rs-Santoangelo
@@ -1,5 +1,5 @@
-# Channel table for Santo Ângelo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/462
+# Channel table for Santo �ngelo - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=462
 
 # Physical channel 15 (virtual 32.1)
 [TV Canção Nova]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
diff --git a/isdb-t/br-rs-SaoBorja b/isdb-t/br-rs-SaoBorja
index 68ee59e9..64248137 100644
--- a/isdb-t/br-rs-SaoBorja
+++ b/isdb-t/br-rs-SaoBorja
@@ -1,5 +1,5 @@
-# Channel table for São Borja - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/686
+# Channel table for S�o Borja - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=686
 
 # Physical channel 18 (virtual 18.2)
 [TV Mundo Maior/TV CEI]
diff --git a/isdb-t/br-rs-SaoFranciscoDePaula b/isdb-t/br-rs-SaoFranciscoDePaula
index 1cf14845..31014237 100644
--- a/isdb-t/br-rs-SaoFranciscoDePaula
+++ b/isdb-t/br-rs-SaoFranciscoDePaula
@@ -1,5 +1,5 @@
-# Channel table for São Francisco De Paula - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1932
+# Channel table for S�o Francisco De Paula - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1932
 
 # Physical channel 28 (virtual 28.1)
 [SBT RS]
diff --git a/isdb-t/br-rs-SaoGabriel b/isdb-t/br-rs-SaoGabriel
index cd5ceca0..4cf18948 100644
--- a/isdb-t/br-rs-SaoGabriel
+++ b/isdb-t/br-rs-SaoGabriel
@@ -1,5 +1,34 @@
-# Channel table for São Gabriel - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/640
+# Channel table for S�o Gabriel - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=640
+
+# Physical channel 16 (virtual 26.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 17 (virtual 20.1)
 [Rede Vida]
diff --git a/isdb-t/br-rs-SaoJeronimo b/isdb-t/br-rs-SaoJeronimo
index c853464a..86faec56 100644
--- a/isdb-t/br-rs-SaoJeronimo
+++ b/isdb-t/br-rs-SaoJeronimo
@@ -1,5 +1,5 @@
-# Channel table for São Jerônimo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3781
+# Channel table for S�o Jer�nimo - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3781
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Pampa]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 4.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 12.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 40.1)
-[RBI TV]
+# Physical channel 34 (virtual 12.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 61 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 41 (virtual 40.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 755142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-SaoJoseDoNorte b/isdb-t/br-rs-SaoJoseDoNorte
index 6c74a32f..3e5ba4d5 100644
--- a/isdb-t/br-rs-SaoJoseDoNorte
+++ b/isdb-t/br-rs-SaoJoseDoNorte
@@ -1,8 +1,37 @@
-# Channel table for São José Do Norte - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1951
+# Channel table for S�o Jos� Do Norte - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1951
 
-# Physical channel 15 (virtual 17.1)
-[Rede Vida]
+# Physical channel 14 (virtual 28.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 15 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -88,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 36.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 34.1)
 [Band RS]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 6.1)
+[TV Pampa Sul]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-SaoLeopoldo b/isdb-t/br-rs-SaoLeopoldo
index c18304be..f0365cd8 100644
--- a/isdb-t/br-rs-SaoLeopoldo
+++ b/isdb-t/br-rs-SaoLeopoldo
@@ -1,8 +1,37 @@
-# Channel table for São Leopoldo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3784
+# Channel table for S�o Leopoldo - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3784
+
+# Physical channel 14 (virtual 52.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 22.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -350,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -407,11 +436,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Canção Nova]
+# Physical channel 50 (virtual 48.1)
+[Ulbra TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 689142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-SaoLourencoDoSul b/isdb-t/br-rs-SaoLourencoDoSul
index abc8f521..27eaaeec 100644
--- a/isdb-t/br-rs-SaoLourencoDoSul
+++ b/isdb-t/br-rs-SaoLourencoDoSul
@@ -1,5 +1,5 @@
-# Channel table for São Lourenço Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1939
+# Channel table for S�o Louren�o Do Sul - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1939
 
 # Physical channel 23 (virtual 12.1)
 [RBS Pelotas]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-SaoLuizGonzaga b/isdb-t/br-rs-SaoLuizGonzaga
index a3a21313..0846ef18 100644
--- a/isdb-t/br-rs-SaoLuizGonzaga
+++ b/isdb-t/br-rs-SaoLuizGonzaga
@@ -1,5 +1,5 @@
-# Channel table for São Luiz Gonzaga - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1940
+# Channel table for S�o Luiz Gonzaga - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1940
 
 # Physical channel 58 (virtual 58.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-SaoMarcos b/isdb-t/br-rs-SaoMarcos
index 0fdc365b..4092457d 100644
--- a/isdb-t/br-rs-SaoMarcos
+++ b/isdb-t/br-rs-SaoMarcos
@@ -1,5 +1,5 @@
-# Channel table for São Marcos - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1621
+# Channel table for S�o Marcos - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1621
 
 # Physical channel 22 (virtual 2.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-SaoSebastiaoDoCai b/isdb-t/br-rs-SaoSebastiaoDoCai
index 93416715..f7ac4af0 100644
--- a/isdb-t/br-rs-SaoSebastiaoDoCai
+++ b/isdb-t/br-rs-SaoSebastiaoDoCai
@@ -1,5 +1,5 @@
-# Channel table for São Sebastião Do Caí - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1946
+# Channel table for S�o Sebasti�o Do Ca� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1946
 
 # Physical channel 24 (virtual 59.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-SaoSepe b/isdb-t/br-rs-SaoSepe
index 035bbfb5..096631de 100644
--- a/isdb-t/br-rs-SaoSepe
+++ b/isdb-t/br-rs-SaoSepe
@@ -1,5 +1,5 @@
-# Channel table for São Sepé - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1947
+# Channel table for S�o Sep� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1947
 
 # Physical channel 24 (virtual 5.1)
 [RBS Santa Maria]
diff --git a/isdb-t/br-rs-SaoValentim b/isdb-t/br-rs-SaoValentim
new file mode 100644
index 00000000..6dbc53c6
--- /dev/null
+++ b/isdb-t/br-rs-SaoValentim
@@ -0,0 +1,32 @@
+# Channel table for S�o Valentim - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1948
+
+# Physical channel 42 (virtual 6.1)
+[RBS Erechim]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Sapiranga b/isdb-t/br-rs-Sapiranga
index f2d5eaae..7a01d2a4 100644
--- a/isdb-t/br-rs-Sapiranga
+++ b/isdb-t/br-rs-Sapiranga
@@ -1,5 +1,5 @@
 # Channel table for Sapiranga - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1921
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1921
 
 # Physical channel 21 (virtual 22.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-SapucaiaDoSul b/isdb-t/br-rs-SapucaiaDoSul
index 0b9e07ca..83a81cb8 100644
--- a/isdb-t/br-rs-SapucaiaDoSul
+++ b/isdb-t/br-rs-SapucaiaDoSul
@@ -1,11 +1,11 @@
 # Channel table for Sapucaia Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3785
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3785
 
-# Physical channel 15 (virtual 14.1)
-[Ideal TV]
+# Physical channel 14 (virtual 52.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 479142857
+	FREQUENCY = 473142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 14.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 18.1)
-[Record News]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 22.1)
-[Rede Brasil]
+# Physical channel 19 (virtual 18.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 503142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -349,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 59.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 46.1)
 [CNT RS]
 	DELIVERY_SYSTEM = ISDBT
@@ -378,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 52.1)
-[TV Canção Nova]
+# Physical channel 50 (virtual 48.1)
+[Ulbra TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 689142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Sarandi b/isdb-t/br-rs-Sarandi
index e95cbb4e..95fed69a 100644
--- a/isdb-t/br-rs-Sarandi
+++ b/isdb-t/br-rs-Sarandi
@@ -1,5 +1,5 @@
 # Channel table for Sarandi - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/63
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=63
 
 # Physical channel 35 (virtual 12.1)
 [RBS Passo Fundo]
diff --git a/isdb-t/br-rs-Sertao b/isdb-t/br-rs-Sertao
index c7df1493..712b893e 100644
--- a/isdb-t/br-rs-Sertao
+++ b/isdb-t/br-rs-Sertao
@@ -1,5 +1,5 @@
-# Channel table for Sertão - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1924
+# Channel table for Sert�o - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1924
 
 # Physical channel 34 (virtual 7.1)
 [RBS Passo Fundo]
diff --git a/isdb-t/br-rs-Sinimbu b/isdb-t/br-rs-Sinimbu
index c0994f64..1afc4c73 100644
--- a/isdb-t/br-rs-Sinimbu
+++ b/isdb-t/br-rs-Sinimbu
@@ -1,5 +1,5 @@
 # Channel table for Sinimbu - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2783
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2783
 
 # Physical channel 33 (virtual 6.1)
 [RBS Santa Cruz]
diff --git a/isdb-t/br-rs-Soledade b/isdb-t/br-rs-Soledade
index 1bd172ac..6c06886b 100644
--- a/isdb-t/br-rs-Soledade
+++ b/isdb-t/br-rs-Soledade
@@ -1,5 +1,5 @@
 # Channel table for Soledade - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1928
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1928
 
 # Physical channel 36 (virtual 12.1)
 [RBS Passo Fundo]
diff --git a/isdb-t/br-rs-Tapejara b/isdb-t/br-rs-Tapejara
index e5906832..2490ccb0 100644
--- a/isdb-t/br-rs-Tapejara
+++ b/isdb-t/br-rs-Tapejara
@@ -1,5 +1,5 @@
 # Channel table for Tapejara - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1883
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1883
 
 # Physical channel 25 (virtual 12.1)
 [RBS Passo Fundo]
diff --git a/isdb-t/br-rs-Tapera b/isdb-t/br-rs-Tapera
new file mode 100644
index 00000000..24d31e60
--- /dev/null
+++ b/isdb-t/br-rs-Tapera
@@ -0,0 +1,32 @@
+# Channel table for Tapera - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1884
+
+# Physical channel 25 (virtual 2.1)
+[RBS Passo Fundo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Taquara b/isdb-t/br-rs-Taquara
index d0692783..bc952dcb 100644
--- a/isdb-t/br-rs-Taquara
+++ b/isdb-t/br-rs-Taquara
@@ -1,5 +1,5 @@
 # Channel table for Taquara - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1127
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1127
 
 # Physical channel 16 (virtual 41.1)
 [TV Canção Nova]
@@ -117,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 39.1)
+[Band RS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Taquari b/isdb-t/br-rs-Taquari
index 0e3d0880..256b26a6 100644
--- a/isdb-t/br-rs-Taquari
+++ b/isdb-t/br-rs-Taquari
@@ -1,5 +1,5 @@
 # Channel table for Taquari - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1843
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1843
 
 # Physical channel 16 (virtual 26.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-rs-TerraDeAreia b/isdb-t/br-rs-TerraDeAreia
index b4f99034..87d486bd 100644
--- a/isdb-t/br-rs-TerraDeAreia
+++ b/isdb-t/br-rs-TerraDeAreia
@@ -1,5 +1,5 @@
 # Channel table for Terra De Areia - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1887
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1887
 
 # Physical channel 24 (virtual 4.1)
 [RBS TV]
@@ -30,64 +30,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 7.1)
-[RBS TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 35 (virtual 6.1)
-[RBS TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 38 (virtual 14.1)
 [Band RS]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rs-Teutonia b/isdb-t/br-rs-Teutonia
index 67e0be62..2aa87bad 100644
--- a/isdb-t/br-rs-Teutonia
+++ b/isdb-t/br-rs-Teutonia
@@ -1,5 +1,5 @@
-# Channel table for Teutônia - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1888
+# Channel table for Teut�nia - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1888
 
 # Physical channel 22 (virtual 2.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-Torres b/isdb-t/br-rs-Torres
index 954f5185..75f5f17a 100644
--- a/isdb-t/br-rs-Torres
+++ b/isdb-t/br-rs-Torres
@@ -1,8 +1,8 @@
 # Channel table for Torres - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/563
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=563
 
-# Physical channel 17 (virtual 19.1)
-[Rede Vida]
+# Physical channel 17 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
diff --git a/isdb-t/br-rs-Tramandai b/isdb-t/br-rs-Tramandai
index e7492b61..d39828ae 100644
--- a/isdb-t/br-rs-Tramandai
+++ b/isdb-t/br-rs-Tramandai
@@ -1,11 +1,40 @@
-# Channel table for Tramandaí - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1467
+# Channel table for Tramanda� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1467
 
-# Physical channel 21 (virtual 2.1)
+# Physical channel 16 (virtual 41.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 13.1)
 [Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-TresCachoeiras b/isdb-t/br-rs-TresCachoeiras
index ddb74614..fa09ae0c 100644
--- a/isdb-t/br-rs-TresCachoeiras
+++ b/isdb-t/br-rs-TresCachoeiras
@@ -1,5 +1,5 @@
-# Channel table for Três Cachoeiras - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1892
+# Channel table for Tr�s Cachoeiras - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1892
 
 # Physical channel 23 (virtual 8.1)
 [RBS TV]
diff --git a/isdb-t/br-rs-TresCoroas b/isdb-t/br-rs-TresCoroas
index 62ca3d39..85fbf055 100644
--- a/isdb-t/br-rs-TresCoroas
+++ b/isdb-t/br-rs-TresCoroas
@@ -1,5 +1,5 @@
-# Channel table for Três Coroas - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1893
+# Channel table for Tr�s Coroas - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1893
 
 # Physical channel 16 (virtual 41.1)
 [TV Canção Nova]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 19.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 2.1)
 [Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-rs-TresDeMaio b/isdb-t/br-rs-TresDeMaio
index 9730c49e..a239047f 100644
--- a/isdb-t/br-rs-TresDeMaio
+++ b/isdb-t/br-rs-TresDeMaio
@@ -1,5 +1,5 @@
-# Channel table for Três De Maio - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1882
+# Channel table for Tr�s De Maio - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1882
 
 # Physical channel 34 (virtual 6.1)
 [RBS Santa Rosa]
diff --git a/isdb-t/br-rs-TresPassos b/isdb-t/br-rs-TresPassos
index 054c4d21..834ea6db 100644
--- a/isdb-t/br-rs-TresPassos
+++ b/isdb-t/br-rs-TresPassos
@@ -1,5 +1,5 @@
-# Channel table for Três Passos - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1869
+# Channel table for Tr�s Passos - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1869
 
 # Physical channel 35 (virtual 5.1)
 [RBS Santa Rosa]
diff --git a/isdb-t/br-rs-Triunfo b/isdb-t/br-rs-Triunfo
index fc483a62..7b09978e 100644
--- a/isdb-t/br-rs-Triunfo
+++ b/isdb-t/br-rs-Triunfo
@@ -1,5 +1,5 @@
 # Channel table for Triunfo - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1866
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1866
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 4.1)
-[TV Pampa]
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
-[SBT RS]
+# Physical channel 26 (virtual 4.1)
+[TV Pampa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 10.1)
-[Band RS]
+# Physical channel 28 (virtual 5.1)
+[SBT RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 12.1)
-[RBS TV]
+# Physical channel 32 (virtual 10.1)
+[Band RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 40.1)
-[RBI TV]
+# Physical channel 34 (virtual 12.1)
+[RBS TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 635142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 61 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 41 (virtual 40.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 755142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-rs-Tucunduva b/isdb-t/br-rs-Tucunduva
index 5c4e27c0..9be52e13 100644
--- a/isdb-t/br-rs-Tucunduva
+++ b/isdb-t/br-rs-Tucunduva
@@ -1,5 +1,5 @@
 # Channel table for Tucunduva - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/558
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=558
 
 # Physical channel 34 (virtual 6.1)
 [RBS Santa Rosa]
diff --git a/isdb-t/br-rs-Tupandi b/isdb-t/br-rs-Tupandi
index d080921d..89857f05 100644
--- a/isdb-t/br-rs-Tupandi
+++ b/isdb-t/br-rs-Tupandi
@@ -1,5 +1,5 @@
 # Channel table for Tupandi - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3319
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3319
 
 # Physical channel 17 (virtual 16.1)
 [Rede Vida]
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-rs-Uruguaiana b/isdb-t/br-rs-Uruguaiana
index ca296767..e43bd75e 100644
--- a/isdb-t/br-rs-Uruguaiana
+++ b/isdb-t/br-rs-Uruguaiana
@@ -1,8 +1,37 @@
 # Channel table for Uruguaiana - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/902
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=902
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 26.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
diff --git a/isdb-t/br-rs-Vacaria b/isdb-t/br-rs-Vacaria
index 0f4efe57..6f2082f1 100644
--- a/isdb-t/br-rs-Vacaria
+++ b/isdb-t/br-rs-Vacaria
@@ -1,5 +1,5 @@
 # Channel table for Vacaria - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/763
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=763
 
 # Physical channel 15 (virtual 21.1)
 [TV Canção Nova]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 17.1)
-[Rede Vida]
+# Physical channel 16 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
diff --git a/isdb-t/br-rs-VenancioAires b/isdb-t/br-rs-VenancioAires
index 7ce3893e..445ba73f 100644
--- a/isdb-t/br-rs-VenancioAires
+++ b/isdb-t/br-rs-VenancioAires
@@ -1,5 +1,5 @@
-# Channel table for Venâncio Aires - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1874
+# Channel table for Ven�ncio Aires - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1874
 
 # Physical channel 14 (virtual 40.1)
 [SBT RS]
diff --git a/isdb-t/br-rs-VeraCruz b/isdb-t/br-rs-VeraCruz
new file mode 100644
index 00000000..67675421
--- /dev/null
+++ b/isdb-t/br-rs-VeraCruz
@@ -0,0 +1,206 @@
+# Channel table for Vera Cruz - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4039
+
+# Physical channel 17 (virtual 16.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 18.1)
+[TV Gazeta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 13.1)
+[Record TV RS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 43.1)
+[SBT RS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 6.1)
+[RBS Santa Cruz]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 8.1)
+[Band RS]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-Veranopolis b/isdb-t/br-rs-Veranopolis
index 73077ae7..bd6a304c 100644
--- a/isdb-t/br-rs-Veranopolis
+++ b/isdb-t/br-rs-Veranopolis
@@ -1,5 +1,5 @@
-# Channel table for Veranópolis - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/900
+# Channel table for Veran�polis - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=900
 
 # Physical channel 22 (virtual 2.1)
 [Record TV RS]
diff --git a/isdb-t/br-rs-Viamao b/isdb-t/br-rs-Viamao
index e4e54c89..c51da0b1 100644
--- a/isdb-t/br-rs-Viamao
+++ b/isdb-t/br-rs-Viamao
@@ -1,8 +1,8 @@
-# Channel table for Viamão - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3789
+# Channel table for Viam�o - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3789
 
 # Physical channel 15 (virtual 14.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -117,8 +117,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 61.4)
-[TV Câmara, ALTV, TV Senado, TV Câmara Porto Alegre]
+# Physical channel 22 (virtual 22.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 11.5)
+[TV Câmara, TV AL RS, TV Câmara Porto Alegre, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -321,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -349,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 40.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -523,3 +552,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 48.1)
+[Ulbra TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-rs-VilaNovaDoSul b/isdb-t/br-rs-VilaNovaDoSul
index 1827f505..cc4e0ad7 100644
--- a/isdb-t/br-rs-VilaNovaDoSul
+++ b/isdb-t/br-rs-VilaNovaDoSul
@@ -1,5 +1,5 @@
 # Channel table for Vila Nova Do Sul - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1880
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1880
 
 # Physical channel 33 (virtual 12.1)
 [RBS Santa Maria]
diff --git a/isdb-t/br-rs-Westfalia b/isdb-t/br-rs-Westfalia
index c70bf8ce..82338e2e 100644
--- a/isdb-t/br-rs-Westfalia
+++ b/isdb-t/br-rs-Westfalia
@@ -1,5 +1,5 @@
-# Channel table for Westfália - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1867
+# Channel table for Westf�lia - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1867
 
 # Physical channel 23 (virtual 13.1)
 [RBS Santa Cruz]
diff --git a/isdb-t/br-rs-Xangri-la b/isdb-t/br-rs-Xangri-la
index 32a042ba..e68f52b0 100644
--- a/isdb-t/br-rs-Xangri-la
+++ b/isdb-t/br-rs-Xangri-la
@@ -1,11 +1,11 @@
-# Channel table for Xangri-lá - RS - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2134
+# Channel table for Xangri-l� - RS - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2134
 
-# Physical channel 21 (virtual 2.1)
+# Physical channel 22 (virtual 13.1)
 [Record TV RS]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sc-Agronomica b/isdb-t/br-sc-Agronomica
index b5415779..df1f1aaf 100644
--- a/isdb-t/br-sc-Agronomica
+++ b/isdb-t/br-sc-Agronomica
@@ -1,11 +1,40 @@
-# Channel table for Agronômica - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1820
+# Channel table for Agron�mica - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1820
 
-# Physical channel 20 (virtual 16.1)
-[Rede Vida]
+# Physical channel 22 (virtual 7.1)
+[RBA]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 9.1)
+[NDTV Blumenau]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 13.1)
+[SCC SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-AntonioCarlos b/isdb-t/br-sc-AntonioCarlos
index 69142f19..713aee33 100644
--- a/isdb-t/br-sc-AntonioCarlos
+++ b/isdb-t/br-sc-AntonioCarlos
@@ -1,5 +1,5 @@
-# Channel table for Antônio Carlos - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1468
+# Channel table for Ant�nio Carlos - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1468
 
 # Physical channel 16 (virtual 15.1)
 [TV Gazeta]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -262,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 8.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 61.4)
-[TV Câmara, TV Senado, TV AL, TV Câmara Florianópolis]
+# Physical channel 43 (virtual 11.5)
+[TV Câmara, TV Câmara Florianópolis, TV AL, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sc-Araquari b/isdb-t/br-sc-Araquari
index d274431b..cf8ae773 100644
--- a/isdb-t/br-sc-Araquari
+++ b/isdb-t/br-sc-Araquari
@@ -1,5 +1,5 @@
 # Channel table for Araquari - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3826
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3826
 
 # Physical channel 15 (virtual 55.1)
 [TV Canção Nova]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 8.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Ararangua b/isdb-t/br-sc-Ararangua
index 1dddbc25..2828255e 100644
--- a/isdb-t/br-sc-Ararangua
+++ b/isdb-t/br-sc-Ararangua
@@ -1,5 +1,5 @@
-# Channel table for Araranguá - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/647
+# Channel table for Ararangu� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=647
 
 # Physical channel 28 (virtual 5.1)
 [TV Sul Catarinense]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 25.1)
-[RICTV]
+[NDTV Criciúma]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-BalnearioBarraDoSul b/isdb-t/br-sc-BalnearioBarraDoSul
index ca7bf37c..7b482e64 100644
--- a/isdb-t/br-sc-BalnearioBarraDoSul
+++ b/isdb-t/br-sc-BalnearioBarraDoSul
@@ -1,5 +1,5 @@
-# Channel table for Balneário Barra Do Sul - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3827
+# Channel table for Balne�rio Barra Do Sul - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3827
 
 # Physical channel 28 (virtual 31.1)
 [Record News SC]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 8.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-BalnearioCamboriu b/isdb-t/br-sc-BalnearioCamboriu
index 8d6f317f..33f9a234 100644
--- a/isdb-t/br-sc-BalnearioCamboriu
+++ b/isdb-t/br-sc-BalnearioCamboriu
@@ -1,8 +1,37 @@
-# Channel table for Balneário Camboriú - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/672
+# Channel table for Balne�rio Cambori� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=672
+
+# Physical channel 15 (virtual 15.1)
+[TV Primavera]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 10.1)
-[RICTV Itajaí]
+[NDTV Itajaí]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 43.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-sc-BalnearioPicarras b/isdb-t/br-sc-BalnearioPicarras
index dd33433e..12bff394 100644
--- a/isdb-t/br-sc-BalnearioPicarras
+++ b/isdb-t/br-sc-BalnearioPicarras
@@ -1,8 +1,8 @@
-# Channel table for Balneário Piçarras - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2003
+# Channel table for Balne�rio Pi�arras - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2003
 
-# Physical channel 16 (virtual 43.1)
-[Rede Vida]
+# Physical channel 16 (virtual 43.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 17 (virtual 17.1)
+[Record News SC]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 8.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 7.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sc-BarraVelha b/isdb-t/br-sc-BarraVelha
index 316cc3de..b87617d1 100644
--- a/isdb-t/br-sc-BarraVelha
+++ b/isdb-t/br-sc-BarraVelha
@@ -1,5 +1,5 @@
 # Channel table for Barra Velha - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/721
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=721
 
 # Physical channel 16 (virtual 43.1)
 [Rede Vida]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 8.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -88,8 +88,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 43.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 44 (virtual 7.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -117,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 11.1)
-[SCC SBT]
+# Physical channel 51 (virtual 51.1)
+[TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 695142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sc-BelaVistaDoToldo b/isdb-t/br-sc-BelaVistaDoToldo
index 151af4fa..3501b308 100644
--- a/isdb-t/br-sc-BelaVistaDoToldo
+++ b/isdb-t/br-sc-BelaVistaDoToldo
@@ -1,5 +1,5 @@
 # Channel table for Bela Vista Do Toldo - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2019
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2019
 
 # Physical channel 24 (virtual 8.1)
 [NSC Joinville]
diff --git a/isdb-t/br-sc-Biguacu b/isdb-t/br-sc-Biguacu
index 76546e13..209a63f3 100644
--- a/isdb-t/br-sc-Biguacu
+++ b/isdb-t/br-sc-Biguacu
@@ -1,5 +1,5 @@
-# Channel table for Biguaçu - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3726
+# Channel table for Bigua�u - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3726
 
 # Physical channel 15 (virtual 57.1)
 [Top TV]
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -349,7 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 8.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 61.4)
-[TV Câmara, TV Senado, TV AL, TV Câmara Florianópolis]
+# Physical channel 43 (virtual 11.5)
+[TV Câmara, TV Câmara Florianópolis, TV AL, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sc-Blumenau b/isdb-t/br-sc-Blumenau
index 0727c91a..d59c74fc 100644
--- a/isdb-t/br-sc-Blumenau
+++ b/isdb-t/br-sc-Blumenau
@@ -1,8 +1,8 @@
 # Channel table for Blumenau - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/671
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=671
 
-# Physical channel 16 (virtual 16.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 44.1)
-[RICTV Blumenau]
+[NDTV Blumenau]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 9.1)
-[RICTV Blumenau]
+[NDTV Blumenau]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sc-BomJesus b/isdb-t/br-sc-BomJesus
index 9a9102f1..b475e7a0 100644
--- a/isdb-t/br-sc-BomJesus
+++ b/isdb-t/br-sc-BomJesus
@@ -1,5 +1,5 @@
 # Channel table for Bom Jesus - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2199
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2199
 
 # Physical channel 23 (virtual 27.1)
 [SCC SBT]
diff --git a/isdb-t/br-sc-Bombinhas b/isdb-t/br-sc-Bombinhas
index 51184381..4299233d 100644
--- a/isdb-t/br-sc-Bombinhas
+++ b/isdb-t/br-sc-Bombinhas
@@ -1,5 +1,5 @@
 # Channel table for Bombinhas - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1558
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1558
 
 # Physical channel 23 (virtual 3.1)
 [SCC SBT]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 10.1)
-[RICTV Itajaí]
+[NDTV Itajaí]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-sc-Brusque b/isdb-t/br-sc-Brusque
index 0fc36cdf..c1ab9487 100644
--- a/isdb-t/br-sc-Brusque
+++ b/isdb-t/br-sc-Brusque
@@ -1,7 +1,7 @@
 # Channel table for Brusque - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/474
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=474
 
-# Physical channel 15 (virtual 57.1)
+# Physical channel 15 (virtual 55.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -30,8 +30,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 17 (virtual 17.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 4.1)
-[RICTV Blumenau]
+[NDTV Itajaí]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -88,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 11.1)
+[TVBV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 33 (virtual 5.1)
 [NSC Blumenau]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sc-Cacador b/isdb-t/br-sc-Cacador
index 1bc64429..5f98c29f 100644
--- a/isdb-t/br-sc-Cacador
+++ b/isdb-t/br-sc-Cacador
@@ -1,8 +1,8 @@
-# Channel table for Caçador - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/765
+# Channel table for Ca�ador - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=765
 
-# Physical channel 16 (virtual 17.1)
-[Rede Vida]
+# Physical channel 16 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
diff --git a/isdb-t/br-sc-Camboriu b/isdb-t/br-sc-Camboriu
index c1c0d6b0..7dbdfc6b 100644
--- a/isdb-t/br-sc-Camboriu
+++ b/isdb-t/br-sc-Camboriu
@@ -1,8 +1,37 @@
-# Channel table for Camboriú - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3920
+# Channel table for Cambori� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3920
+
+# Physical channel 15 (virtual 15.1)
+[TV Primavera]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 10.1)
-[RICTV Itajaí]
+[NDTV Itajaí]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 43.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-sc-CamposNovos b/isdb-t/br-sc-CamposNovos
new file mode 100644
index 00000000..3a0b4ae9
--- /dev/null
+++ b/isdb-t/br-sc-CamposNovos
@@ -0,0 +1,32 @@
+# Channel table for Campos Novos - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=838
+
+# Physical channel 42 (virtual 8.1)
+[NSC Centro-Oeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-Canoinhas b/isdb-t/br-sc-Canoinhas
index 5ab95f2f..98980110 100644
--- a/isdb-t/br-sc-Canoinhas
+++ b/isdb-t/br-sc-Canoinhas
@@ -1,5 +1,5 @@
 # Channel table for Canoinhas - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/840
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=840
 
 # Physical channel 24 (virtual 8.1)
 [NSC Joinville]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 11.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 5.1)
+[SCC SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-CapaoAlto b/isdb-t/br-sc-CapaoAlto
index 5082f0f2..fa39eaec 100644
--- a/isdb-t/br-sc-CapaoAlto
+++ b/isdb-t/br-sc-CapaoAlto
@@ -1,5 +1,5 @@
-# Channel table for Capão Alto - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2236
+# Channel table for Cap�o Alto - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2236
 
 # Physical channel 33 (virtual 2.1)
 [NSC Centro-Oeste]
diff --git a/isdb-t/br-sc-CapivariDeBaixo b/isdb-t/br-sc-CapivariDeBaixo
index 344bd043..dae9cf51 100644
--- a/isdb-t/br-sc-CapivariDeBaixo
+++ b/isdb-t/br-sc-CapivariDeBaixo
@@ -1,8 +1,8 @@
 # Channel table for Capivari De Baixo - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1810
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1810
 
-# Physical channel 20 (virtual 24.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-to-Figueiropolis b/isdb-t/br-sc-ChapadaoDoLageado
index e2450675..63641457 100644
--- a/isdb-t/br-to-Figueiropolis
+++ b/isdb-t/br-sc-ChapadaoDoLageado
@@ -1,8 +1,8 @@
-# Channel table for Figueirópolis - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/621
+# Channel table for Chapad�o Do Lageado - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4147
 
-# Physical channel 23 (virtual 11.1)
-[TV Anhanguera Gurupi]
+# Physical channel 23 (virtual 54.1)
+[SCC SBT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-sc-Chapeco b/isdb-t/br-sc-Chapeco
index 407e8e03..1c4a2221 100644
--- a/isdb-t/br-sc-Chapeco
+++ b/isdb-t/br-sc-Chapeco
@@ -1,5 +1,5 @@
-# Channel table for Chapecó - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/475
+# Channel table for Chapec� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=475
 
 # Physical channel 15 (virtual 20.1)
 [TV Canção Nova]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 17.1)
-[Rede Vida]
+# Physical channel 16 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,8 +88,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 29.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 10.1)
-[RICTV Chapecó]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-CocalDoSul b/isdb-t/br-sc-CocalDoSul
index 1537c804..17b1fe96 100644
--- a/isdb-t/br-sc-CocalDoSul
+++ b/isdb-t/br-sc-CocalDoSul
@@ -1,8 +1,8 @@
 # Channel table for Cocal Do Sul - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3321
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3321
 
 # Physical channel 30 (virtual 25.1)
-[RICTV Florianópolis]
+[NDTV Criciúma]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Concordia b/isdb-t/br-sc-Concordia
index 0402beb0..00f39559 100644
--- a/isdb-t/br-sc-Concordia
+++ b/isdb-t/br-sc-Concordia
@@ -1,8 +1,37 @@
-# Channel table for Concórdia - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/821
+# Channel table for Conc�rdia - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=821
+
+# Physical channel 15 (virtual 15.1)
+[TV Primavera]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 27.1)
-[RICTV Chapecó]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-CorreiaPinto b/isdb-t/br-sc-CorreiaPinto
index b20bb9a6..453e2c1a 100644
--- a/isdb-t/br-sc-CorreiaPinto
+++ b/isdb-t/br-sc-CorreiaPinto
@@ -1,8 +1,8 @@
 # Channel table for Correia Pinto - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2231
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2231
 
 # Physical channel 30 (virtual 7.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Corupa b/isdb-t/br-sc-Corupa
index 14f3bdb3..2f6fa947 100644
--- a/isdb-t/br-sc-Corupa
+++ b/isdb-t/br-sc-Corupa
@@ -1,5 +1,5 @@
-# Channel table for Corupá - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2026
+# Channel table for Corup� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2026
 
 # Physical channel 42 (virtual 12.1)
 [NSC Joinville]
diff --git a/isdb-t/br-sc-Criciuma b/isdb-t/br-sc-Criciuma
index c02bd442..e78669bf 100644
--- a/isdb-t/br-sc-Criciuma
+++ b/isdb-t/br-sc-Criciuma
@@ -1,5 +1,5 @@
-# Channel table for Criciúma - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/44
+# Channel table for Crici�ma - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=44
 
 # Physical channel 17 (virtual 17.1)
 [TV Evangelizar]
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 19.1)
+[RTV Criciúma]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 25.1)
-[RICTV Florianópolis]
+[NDTV Criciúma]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 23.1)
-[SCC SBT]
+# Physical channel 36 (virtual 36.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 29.1)
-[RIT]
+# Physical channel 46 (virtual 23.1)
+[SCC SBT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 665142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 12.1)
-[TV Primavera]
+# Physical channel 48 (virtual 29.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 689142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 53 (virtual 53.1)
-[RTV Criciúma]
+# Physical channel 50 (virtual 12.1)
+[TV Primavera]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 707142857
+	FREQUENCY = 689142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sc-CunhaPora b/isdb-t/br-sc-CunhaPora
index 9952d89b..6c7cdaee 100644
--- a/isdb-t/br-sc-CunhaPora
+++ b/isdb-t/br-sc-CunhaPora
@@ -1,5 +1,5 @@
-# Channel table for Cunha Porã - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/841
+# Channel table for Cunha Por� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=841
 
 # Physical channel 15 (virtual 56.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-sc-Cunhatai b/isdb-t/br-sc-Cunhatai
index 95b5f1d5..ac4b7f26 100644
--- a/isdb-t/br-sc-Cunhatai
+++ b/isdb-t/br-sc-Cunhatai
@@ -1,5 +1,5 @@
-# Channel table for Cunhataí - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2027
+# Channel table for Cunhata� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2027
 
 # Physical channel 23 (virtual 54.1)
 [SCC SBT]
diff --git a/isdb-t/br-sc-Curitibanos b/isdb-t/br-sc-Curitibanos
index 18dca3fb..d71d1a2a 100644
--- a/isdb-t/br-sc-Curitibanos
+++ b/isdb-t/br-sc-Curitibanos
@@ -1,8 +1,8 @@
 # Channel table for Curitibanos - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/822
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=822
 
 # Physical channel 30 (virtual 9.1)
-[RICTV Xanxerê]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 7.1)
+[SCC SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-Florianopolis b/isdb-t/br-sc-Florianopolis
index adf5a18a..f93e9ddf 100644
--- a/isdb-t/br-sc-Florianopolis
+++ b/isdb-t/br-sc-Florianopolis
@@ -1,5 +1,5 @@
-# Channel table for Florianópolis - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/185
+# Channel table for Florian�polis - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=185
 
 # Physical channel 15 (virtual 57.1)
 [Top TV]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 20.1)
-[Rede Vida]
+# Physical channel 21 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -349,7 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 8.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 61.4)
-[TV Câmara, TV Senado, TV AL, TV Câmara Florianópolis]
+# Physical channel 43 (virtual 11.5)
+[TV Câmara, TV Câmara Florianópolis, TV AL, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -494,8 +494,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 10.5)
+[TV Senado, TV Câmara São José, TV AL, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 49 (virtual 49.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -524,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sc-Florianopolis(campeche) b/isdb-t/br-sc-Florianopolis(campeche)
index e7068f1f..80adb761 100644
--- a/isdb-t/br-sc-Florianopolis(campeche)
+++ b/isdb-t/br-sc-Florianopolis(campeche)
@@ -1,8 +1,8 @@
-# Channel table for Florianópolis (campeche) - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1808
+# Channel table for Florian�polis (campeche) - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1808
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 19.1)
+# Physical channel 33 (virtual 12.1)
 [NSC TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sc-Florianopolis(canasvieiras) b/isdb-t/br-sc-Florianopolis(canasvieiras)
index 849c33dd..01dfcfdd 100644
--- a/isdb-t/br-sc-Florianopolis(canasvieiras)
+++ b/isdb-t/br-sc-Florianopolis(canasvieiras)
@@ -1,8 +1,8 @@
-# Channel table for Florianópolis (canasvieiras) - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1015
+# Channel table for Florian�polis (canasvieiras) - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1015
 
-# Physical channel 21 (virtual 20.1)
-[Rede Vida]
+# Physical channel 21 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Florianopolis(ingleses) b/isdb-t/br-sc-Florianopolis(ingleses)
index ea36ecdd..15094380 100644
--- a/isdb-t/br-sc-Florianopolis(ingleses)
+++ b/isdb-t/br-sc-Florianopolis(ingleses)
@@ -1,8 +1,8 @@
-# Channel table for Florianópolis (ingleses) - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1016
+# Channel table for Florian�polis (ingleses) - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1016
 
 # Physical channel 30 (virtual 5.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 7.1)
+# Physical channel 33 (virtual 12.1)
 [NSC TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sc-Florianopolis(pantanoDoSul) b/isdb-t/br-sc-Florianopolis(pantanoDoSul)
index c28bf1ed..a6eadcfb 100644
--- a/isdb-t/br-sc-Florianopolis(pantanoDoSul)
+++ b/isdb-t/br-sc-Florianopolis(pantanoDoSul)
@@ -1,5 +1,5 @@
-# Channel table for Florianópolis (pântano Do Sul) - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3878
+# Channel table for Florian�polis (p�ntano Do Sul) - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3878
 
 # Physical channel 30 (virtual 4.1)
 [RICTV]
diff --git a/isdb-t/br-sc-Fraiburgo b/isdb-t/br-sc-Fraiburgo
new file mode 100644
index 00000000..ce6d3f01
--- /dev/null
+++ b/isdb-t/br-sc-Fraiburgo
@@ -0,0 +1,32 @@
+# Channel table for Fraiburgo - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=817
+
+# Physical channel 50 (virtual 50.1)
+[TV Primavera]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-Garopaba b/isdb-t/br-sc-Garopaba
index 5b885fd6..86badf57 100644
--- a/isdb-t/br-sc-Garopaba
+++ b/isdb-t/br-sc-Garopaba
@@ -1,5 +1,5 @@
 # Channel table for Garopaba - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/727
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=727
 
 # Physical channel 23 (virtual 7.1)
 [SCC SBT]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Garuva b/isdb-t/br-sc-Garuva
index 6bf96a59..14d54f1f 100644
--- a/isdb-t/br-sc-Garuva
+++ b/isdb-t/br-sc-Garuva
@@ -1,5 +1,5 @@
 # Channel table for Garuva - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2029
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2029
 
 # Physical channel 15 (virtual 55.1)
 [TV Canção Nova]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 8.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Gaspar b/isdb-t/br-sc-Gaspar
index 14af0bd4..f308ef9b 100644
--- a/isdb-t/br-sc-Gaspar
+++ b/isdb-t/br-sc-Gaspar
@@ -1,5 +1,5 @@
 # Channel table for Gaspar - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/782
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=782
 
 # Physical channel 24 (virtual 8.1)
 [NSC Blumenau]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 9.1)
-[RICTV Blumenau]
+[NDTV Blumenau]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-GovernadorCelsoRamos b/isdb-t/br-sc-GovernadorCelsoRamos
index 2561ecf2..2c889741 100644
--- a/isdb-t/br-sc-GovernadorCelsoRamos
+++ b/isdb-t/br-sc-GovernadorCelsoRamos
@@ -1,5 +1,5 @@
 # Channel table for Governador Celso Ramos - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1805
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1805
 
 # Physical channel 21 (virtual 20.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 9.1)
-[TV Thathi, TVBV]
+# Physical channel 32 (virtual 32.1)
+[TVBV, TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sc-Guabiruba b/isdb-t/br-sc-Guabiruba
index 13bedd63..4813bdb6 100644
--- a/isdb-t/br-sc-Guabiruba
+++ b/isdb-t/br-sc-Guabiruba
@@ -1,5 +1,5 @@
 # Channel table for Guabiruba - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1564
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1564
 
 # Physical channel 33 (virtual 5.1)
 [NSC Blumenau]
diff --git a/isdb-t/br-sc-Guaramirim b/isdb-t/br-sc-Guaramirim
index 92584039..edf44388 100644
--- a/isdb-t/br-sc-Guaramirim
+++ b/isdb-t/br-sc-Guaramirim
@@ -1,5 +1,5 @@
 # Channel table for Guaramirim - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1563
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1563
 
 # Physical channel 16 (virtual 43.1)
 [Rede Vida]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 7.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sc-HervalD'Oeste b/isdb-t/br-sc-HervalD'Oeste
index 93857309..669bd7b1 100644
--- a/isdb-t/br-sc-HervalD'Oeste
+++ b/isdb-t/br-sc-HervalD'Oeste
@@ -1,5 +1,5 @@
-# Channel table for Herval D´ Oeste - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/842
+# Channel table for Herval D� Oeste - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=842
 
 # Physical channel 16 (virtual 17.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 58.1)
-[RICTV Xanxerê]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 26.1)
-[RICTV Xanxerê]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Icara b/isdb-t/br-sc-Icara
index 7fc23091..be14b889 100644
--- a/isdb-t/br-sc-Icara
+++ b/isdb-t/br-sc-Icara
@@ -1,5 +1,150 @@
-# Channel table for Içara - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1566
+# Channel table for I�ara - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1566
+
+# Physical channel 17 (virtual 17.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 19.1)
+[RTV Criciúma]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 25.1)
+[NDTV Criciúma]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 31.1)
+[Record News SC]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 3.1)
+[TVBV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 9.1)
 [NSC Criciúma]
@@ -59,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 29.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 12.1)
+[TV Primavera]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-Ilhota b/isdb-t/br-sc-Ilhota
index f9db00b7..6044b09d 100644
--- a/isdb-t/br-sc-Ilhota
+++ b/isdb-t/br-sc-Ilhota
@@ -1,5 +1,5 @@
 # Channel table for Ilhota - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3999
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3999
 
 # Physical channel 24 (virtual 10.1)
 [NSC Blumenau]
diff --git a/isdb-t/br-sc-Imarui b/isdb-t/br-sc-Imarui
index a0aa4a22..79c22d9a 100644
--- a/isdb-t/br-sc-Imarui
+++ b/isdb-t/br-sc-Imarui
@@ -1,5 +1,5 @@
-# Channel table for Imaruí - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2204
+# Channel table for Imaru� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2204
 
 # Physical channel 35 (virtual 13.1)
 [NSC Criciúma]
diff --git a/isdb-t/br-sc-Imbituba b/isdb-t/br-sc-Imbituba
index 70822c61..b818b06c 100644
--- a/isdb-t/br-sc-Imbituba
+++ b/isdb-t/br-sc-Imbituba
@@ -1,8 +1,8 @@
 # Channel table for Imbituba - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/728
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=728
 
 # Physical channel 30 (virtual 24.1)
-[RICTV Florianópolis]
+[NDTV Criciúma]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -30,3 +30,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 35 (virtual 8.1)
+[NSC Criciúma]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 49.1)
+[SCC SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-Indaial b/isdb-t/br-sc-Indaial
index 92e2c4a8..6a7c18cf 100644
--- a/isdb-t/br-sc-Indaial
+++ b/isdb-t/br-sc-Indaial
@@ -1,5 +1,5 @@
 # Channel table for Indaial - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1567
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1567
 
 # Physical channel 16 (virtual 16.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 44.1)
-[RICTV Blumenau]
+[NDTV Blumenau]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sc-IporaDoOeste b/isdb-t/br-sc-IporaDoOeste
index 844dd5f3..30ce5aaa 100644
--- a/isdb-t/br-sc-IporaDoOeste
+++ b/isdb-t/br-sc-IporaDoOeste
@@ -1,8 +1,8 @@
-# Channel table for Iporã Do Oeste - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1568
+# Channel table for Ipor� Do Oeste - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1568
 
 # Physical channel 30 (virtual 15.1)
-[RICTV Chapecó]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Itajai b/isdb-t/br-sc-Itajai
index a4baf284..2aac8f85 100644
--- a/isdb-t/br-sc-Itajai
+++ b/isdb-t/br-sc-Itajai
@@ -1,5 +1,5 @@
-# Channel table for Itajaí - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/82
+# Channel table for Itaja� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=82
 
 # Physical channel 22 (virtual 21.1)
 [Brasil Esperança]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 10.1)
-[RICTV Itajaí]
+[NDTV Itajaí]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-sc-Itapema b/isdb-t/br-sc-Itapema
index 795ac54b..0f20d3ac 100644
--- a/isdb-t/br-sc-Itapema
+++ b/isdb-t/br-sc-Itapema
@@ -1,5 +1,5 @@
 # Channel table for Itapema - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1572
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1572
 
 # Physical channel 23 (virtual 3.1)
 [SCC SBT]
diff --git a/isdb-t/br-sc-Itapoa b/isdb-t/br-sc-Itapoa
index 3dba4256..536ffa8b 100644
--- a/isdb-t/br-sc-Itapoa
+++ b/isdb-t/br-sc-Itapoa
@@ -1,8 +1,8 @@
-# Channel table for Itapoá - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2033
+# Channel table for Itapo� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2033
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
diff --git a/isdb-t/br-sc-Jaguaruna b/isdb-t/br-sc-Jaguaruna
index f16c3e7d..5bd9e3df 100644
--- a/isdb-t/br-sc-Jaguaruna
+++ b/isdb-t/br-sc-Jaguaruna
@@ -1,8 +1,8 @@
 # Channel table for Jaguaruna - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2206
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2206
 
-# Physical channel 20 (virtual 24.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-sc-JaraguaDoSul b/isdb-t/br-sc-JaraguaDoSul
index 18598f7a..a4d67e3c 100644
--- a/isdb-t/br-sc-JaraguaDoSul
+++ b/isdb-t/br-sc-JaraguaDoSul
@@ -1,8 +1,8 @@
-# Channel table for Jaraguá Do Sul - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/780
+# Channel table for Jaragu� Do Sul - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=780
 
-# Physical channel 16 (virtual 43.1)
-[Rede Vida]
+# Physical channel 16 (virtual 43.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 7.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -175,32 +175,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 52 (virtual 17.1)
-[Record News SC]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 701142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-sc-Joacaba b/isdb-t/br-sc-Joacaba
index 4b1f7c09..c17fd773 100644
--- a/isdb-t/br-sc-Joacaba
+++ b/isdb-t/br-sc-Joacaba
@@ -1,8 +1,8 @@
-# Channel table for Joaçaba - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/476
+# Channel table for Joa�aba - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=476
 
-# Physical channel 16 (virtual 17.1)
-[Rede Vida]
+# Physical channel 16 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 26.1)
-[RICTV Xanxerê]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Joinville b/isdb-t/br-sc-Joinville
index 29ef9127..3e904855 100644
--- a/isdb-t/br-sc-Joinville
+++ b/isdb-t/br-sc-Joinville
@@ -1,5 +1,5 @@
 # Channel table for Joinville - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/35
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=35
 
 # Physical channel 15 (virtual 55.1)
 [TV Canção Nova]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 20.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 8.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Lages b/isdb-t/br-sc-Lages
index 0b0fca44..4854b2f4 100644
--- a/isdb-t/br-sc-Lages
+++ b/isdb-t/br-sc-Lages
@@ -1,8 +1,8 @@
 # Channel table for Lages - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/80
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=80
 
-# Physical channel 16 (virtual 17.1)
-[Rede Vida]
+# Physical channel 16 (virtual 11.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 23.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 7.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -233,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 34.1)
+# Physical channel 41 (virtual 41.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sc-Laguna b/isdb-t/br-sc-Laguna
index 4f8d9d59..3783c581 100644
--- a/isdb-t/br-sc-Laguna
+++ b/isdb-t/br-sc-Laguna
@@ -1,8 +1,8 @@
 # Channel table for Laguna - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/220
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=220
 
 # Physical channel 30 (virtual 22.1)
-[RICTV Florianópolis]
+[NDTV Criciúma]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Lontras b/isdb-t/br-sc-Lontras
index 69c82d71..6e089d3b 100644
--- a/isdb-t/br-sc-Lontras
+++ b/isdb-t/br-sc-Lontras
@@ -1,8 +1,8 @@
 # Channel table for Lontras - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1575
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1575
 
-# Physical channel 20 (virtual 16.1)
-[Rede Vida]
+# Physical channel 20 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 9.1)
+[NDTV Blumenau]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 11.1)
 [NSC Blumenau]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 13.1)
+[SCC SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-LuizAlves b/isdb-t/br-sc-LuizAlves
index c0dc098c..646d93ab 100644
--- a/isdb-t/br-sc-LuizAlves
+++ b/isdb-t/br-sc-LuizAlves
@@ -1,5 +1,5 @@
 # Channel table for Luiz Alves - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1610
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1610
 
 # Physical channel 35 (virtual 49.1)
 [NSC Blumenau]
diff --git a/isdb-t/br-sc-Mafra b/isdb-t/br-sc-Mafra
index 2baacf71..d30890ea 100644
--- a/isdb-t/br-sc-Mafra
+++ b/isdb-t/br-sc-Mafra
@@ -1,5 +1,5 @@
 # Channel table for Mafra - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/32
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=32
 
 # Physical channel 24 (virtual 57.1)
 [NSC Joinville]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 55.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[RPC TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-Maravilha b/isdb-t/br-sc-Maravilha
index 709aeab5..c2e94682 100644
--- a/isdb-t/br-sc-Maravilha
+++ b/isdb-t/br-sc-Maravilha
@@ -1,8 +1,37 @@
 # Channel table for Maravilha - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/494
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=494
+
+# Physical channel 23 (virtual 54.1)
+[SCC SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 11.1)
-[RICTV Chapecó]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Massaranduba b/isdb-t/br-sc-Massaranduba
index 19bee5b9..c0225e71 100644
--- a/isdb-t/br-sc-Massaranduba
+++ b/isdb-t/br-sc-Massaranduba
@@ -1,5 +1,63 @@
 # Channel table for Massaranduba - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2037
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2037
+
+# Physical channel 30 (virtual 9.1)
+[NDTV Blumenau]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 49.1)
+[NSC Blumenau]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 12.1)
 [NSC Joinville]
@@ -31,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 7.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sc-MirimDoce b/isdb-t/br-sc-MirimDoce
index daa12d63..2406b467 100644
--- a/isdb-t/br-sc-MirimDoce
+++ b/isdb-t/br-sc-MirimDoce
@@ -1,5 +1,5 @@
 # Channel table for Mirim Doce - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1833
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1833
 
 # Physical channel 23 (virtual 54.1)
 [SCC SBT]
diff --git a/isdb-t/br-sc-Navegantes b/isdb-t/br-sc-Navegantes
index b25b1358..98e13ef8 100644
--- a/isdb-t/br-sc-Navegantes
+++ b/isdb-t/br-sc-Navegantes
@@ -1,5 +1,5 @@
 # Channel table for Navegantes - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1581
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1581
 
 # Physical channel 22 (virtual 21.1)
 [Brasil Esperança]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 10.1)
-[RICTV Itajaí]
+[NDTV Itajaí]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-sc-NovaTrento b/isdb-t/br-sc-NovaTrento
index c73c01fa..e47cdf9f 100644
--- a/isdb-t/br-sc-NovaTrento
+++ b/isdb-t/br-sc-NovaTrento
@@ -1,5 +1,5 @@
 # Channel table for Nova Trento - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/814
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=814
 
 # Physical channel 40 (virtual 40.1)
 [SCC SBT]
diff --git a/isdb-t/br-sc-NovaVeneza b/isdb-t/br-sc-NovaVeneza
index d90c85a3..c2384a69 100644
--- a/isdb-t/br-sc-NovaVeneza
+++ b/isdb-t/br-sc-NovaVeneza
@@ -1,5 +1,63 @@
 # Channel table for Nova Veneza - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2184
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2184
+
+# Physical channel 27 (virtual 19.1)
+[RTV Criciúma]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 25.1)
+[NDTV Criciúma]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 9.1)
 [NSC Criciúma]
diff --git a/isdb-t/br-sc-OtacilioCosta b/isdb-t/br-sc-OtacilioCosta
index e4a72949..9a518bd2 100644
--- a/isdb-t/br-sc-OtacilioCosta
+++ b/isdb-t/br-sc-OtacilioCosta
@@ -1,5 +1,5 @@
-# Channel table for Otacílio Costa - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/623
+# Channel table for Otac�lio Costa - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=623
 
 # Physical channel 23 (virtual 54.1)
 [SCC SBT]
diff --git a/isdb-t/br-sc-OuroVerde b/isdb-t/br-sc-OuroVerde
index 75dcdb5f..34012a96 100644
--- a/isdb-t/br-sc-OuroVerde
+++ b/isdb-t/br-sc-OuroVerde
@@ -1,5 +1,5 @@
 # Channel table for Ouro Verde - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2186
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2186
 
 # Physical channel 23 (virtual 27.1)
 [SCC SBT]
diff --git a/isdb-t/br-sc-Painel b/isdb-t/br-sc-Painel
index a9c3c980..6ed0dd57 100644
--- a/isdb-t/br-sc-Painel
+++ b/isdb-t/br-sc-Painel
@@ -1,5 +1,5 @@
 # Channel table for Painel - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2235
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2235
 
 # Physical channel 33 (virtual 2.1)
 [NSC Centro-Oeste]
diff --git a/isdb-t/br-sc-Palhoca b/isdb-t/br-sc-Palhoca
index d0fd7183..36408dce 100644
--- a/isdb-t/br-sc-Palhoca
+++ b/isdb-t/br-sc-Palhoca
@@ -1,5 +1,5 @@
-# Channel table for Palhoça - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3727
+# Channel table for Palho�a - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3727
 
 # Physical channel 15 (virtual 57.1)
 [Top TV]
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -349,7 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 8.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 61.4)
-[TV Câmara, TV Senado, TV AL, TV Câmara Florianópolis]
+# Physical channel 43 (virtual 11.5)
+[TV Câmara, TV Câmara Florianópolis, TV AL, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -494,8 +494,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 10.5)
+[TV Senado, TV Câmara São José, TV AL, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 49 (virtual 49.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -524,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sc-PassoDeTorres b/isdb-t/br-sc-PassoDeTorres
index 3b0c5009..6a6ddb7f 100644
--- a/isdb-t/br-sc-PassoDeTorres
+++ b/isdb-t/br-sc-PassoDeTorres
@@ -1,5 +1,5 @@
 # Channel table for Passo De Torres - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2084
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2084
 
 # Physical channel 17 (virtual 19.1)
 [Rede Vida]
diff --git a/isdb-t/br-sc-PauloLopes b/isdb-t/br-sc-PauloLopes
index 8661e8ae..8f4258fa 100644
--- a/isdb-t/br-sc-PauloLopes
+++ b/isdb-t/br-sc-PauloLopes
@@ -1,5 +1,5 @@
 # Channel table for Paulo Lopes - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3728
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3728
 
 # Physical channel 16 (virtual 15.1)
 [TV Gazeta]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -291,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 8.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -320,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 61.4)
-[TV Câmara, TV Senado, TV AL, TV Câmara Florianópolis]
+# Physical channel 43 (virtual 11.5)
+[TV Câmara, TV Câmara Florianópolis, TV AL, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -408,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sc-Penha b/isdb-t/br-sc-Penha
index b9fd8f2a..51dbdad9 100644
--- a/isdb-t/br-sc-Penha
+++ b/isdb-t/br-sc-Penha
@@ -1,5 +1,5 @@
 # Channel table for Penha - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1835
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1835
 
 # Physical channel 23 (virtual 45.1)
 [SCC SBT]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 10.1)
-[RICTV Itajaí]
+[NDTV Itajaí]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-sc-Pomerode b/isdb-t/br-sc-Pomerode
index 11694d53..d28bcdb1 100644
--- a/isdb-t/br-sc-Pomerode
+++ b/isdb-t/br-sc-Pomerode
@@ -1,5 +1,5 @@
 # Channel table for Pomerode - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/676
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=676
 
 # Physical channel 20 (virtual 20.1)
 [SCC SBT]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 12.1)
+# Physical channel 24 (virtual 12.1)
 [NSC Blumenau]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 8.1)
-[RICTV Blumenau]
+# Physical channel 28 (virtual 9.1)
+[NDTV Blumenau]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-sc-PortoBelo b/isdb-t/br-sc-PortoBelo
index 9f15ef6b..2d4f2959 100644
--- a/isdb-t/br-sc-PortoBelo
+++ b/isdb-t/br-sc-PortoBelo
@@ -1,5 +1,5 @@
 # Channel table for Porto Belo - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/677
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=677
 
 # Physical channel 23 (virtual 3.1)
 [SCC SBT]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 10.1)
-[RICTV Itajaí]
+[NDTV Itajaí]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-sc-PortoUniao b/isdb-t/br-sc-PortoUniao
index c60ec3d1..b7ac5798 100644
--- a/isdb-t/br-sc-PortoUniao
+++ b/isdb-t/br-sc-PortoUniao
@@ -1,5 +1,5 @@
-# Channel table for Porto União - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/323
+# Channel table for Porto Uni�o - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=323
 
 # Physical channel 31 (virtual 21.1)
 [RPC TV]
@@ -30,3 +30,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 33.1)
+[TV Mill]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 38.4)
+[RICTV, Aula Paraná, Aula Paraná, Aula Paraná]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-PousoRedondo b/isdb-t/br-sc-PousoRedondo
index 9057ac86..6ec83cba 100644
--- a/isdb-t/br-sc-PousoRedondo
+++ b/isdb-t/br-sc-PousoRedondo
@@ -1,5 +1,5 @@
 # Channel table for Pouso Redondo - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1827
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1827
 
 # Physical channel 23 (virtual 54.1)
 [SCC SBT]
diff --git a/isdb-t/br-to-Miranorte b/isdb-t/br-sc-RioDoOeste
index 227bf78b..be98587c 100644
--- a/isdb-t/br-to-Miranorte
+++ b/isdb-t/br-sc-RioDoOeste
@@ -1,8 +1,8 @@
-# Channel table for Miranorte - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2897
+# Channel table for Rio Do Oeste - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1816
 
-# Physical channel 23 (virtual 11.1)
-[TV Anhanguera Palmas]
+# Physical channel 23 (virtual 54.1)
+[SCC SBT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
diff --git a/isdb-t/br-sc-RioDoSul b/isdb-t/br-sc-RioDoSul
index 18608239..07863f41 100644
--- a/isdb-t/br-sc-RioDoSul
+++ b/isdb-t/br-sc-RioDoSul
@@ -1,8 +1,8 @@
 # Channel table for Rio Do Sul - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1344
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1344
 
-# Physical channel 20 (virtual 16.1)
-[Rede Vida]
+# Physical channel 20 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 9.1)
-[RICTV Blumenau]
+[NDTV Blumenau]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-RioDosCedros b/isdb-t/br-sc-RioDosCedros
index a820d32a..1e6988a6 100644
--- a/isdb-t/br-sc-RioDosCedros
+++ b/isdb-t/br-sc-RioDosCedros
@@ -1,5 +1,5 @@
 # Channel table for Rio Dos Cedros - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4000
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4000
 
 # Physical channel 24 (virtual 10.1)
 [NSC Blumenau]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 9.1)
-[RICTV Blumenau]
+[NDTV Blumenau]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-RioNegrinho b/isdb-t/br-sc-RioNegrinho
index 1bbd8b8c..3619c47e 100644
--- a/isdb-t/br-sc-RioNegrinho
+++ b/isdb-t/br-sc-RioNegrinho
@@ -1,5 +1,5 @@
 # Channel table for Rio Negrinho - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1591
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1591
 
 # Physical channel 15 (virtual 54.1)
 [Rede TV!]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 48.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-sc-SantaRosaDoSul b/isdb-t/br-sc-SantaRosaDoSul
index bb0af6e0..d077218a 100644
--- a/isdb-t/br-sc-SantaRosaDoSul
+++ b/isdb-t/br-sc-SantaRosaDoSul
@@ -1,5 +1,5 @@
 # Channel table for Santa Rosa Do Sul - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2195
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2195
 
 # Physical channel 34 (virtual 8.1)
 [RBS TV]
diff --git a/isdb-t/br-sc-SantoAmaroDaImperatriz b/isdb-t/br-sc-SantoAmaroDaImperatriz
index aa8c42b8..298627e6 100644
--- a/isdb-t/br-sc-SantoAmaroDaImperatriz
+++ b/isdb-t/br-sc-SantoAmaroDaImperatriz
@@ -1,5 +1,5 @@
 # Channel table for Santo Amaro Da Imperatriz - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1802
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1802
 
 # Physical channel 21 (virtual 20.1)
 [Rede Vida]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,35 +146,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 7.1)
-[NSC TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 42 (virtual 43.1)
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sc-SaoBentoDoSul b/isdb-t/br-sc-SaoBentoDoSul
index 42477845..24eb9c5b 100644
--- a/isdb-t/br-sc-SaoBentoDoSul
+++ b/isdb-t/br-sc-SaoBentoDoSul
@@ -1,5 +1,5 @@
-# Channel table for São Bento Do Sul - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/836
+# Channel table for S�o Bento Do Sul - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=836
 
 # Physical channel 14 (virtual 14.1)
 [TV Primavera]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 13.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-SaoFranciscoDoSul b/isdb-t/br-sc-SaoFranciscoDoSul
index 259674b6..7b454d60 100644
--- a/isdb-t/br-sc-SaoFranciscoDoSul
+++ b/isdb-t/br-sc-SaoFranciscoDoSul
@@ -1,124 +1,8 @@
-# Channel table for São Francisco Do Sul - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3828
-
-# Physical channel 15 (virtual 55.1)
-[TV Canção Nova]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 479142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 18 (virtual 22.1)
-[CNT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 497142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 20 (virtual 20.1)
-[Rede Vida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 21 (virtual 11.1)
-[Brasil Esperança]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+# Channel table for S�o Francisco Do Sul - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3828
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -176,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 8.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -204,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 25.1)
+# Physical channel 33 (virtual 5.1)
 [NSC Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 13.1)
-[SCC SBT]
+# Physical channel 34 (virtual 24.1)
+[NSC Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
-[RIT]
+# Physical channel 49 (virtual 43.1)
+[SCC SBT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sc-SaoJoaoBatista b/isdb-t/br-sc-SaoJoaoBatista
new file mode 100644
index 00000000..29e85a35
--- /dev/null
+++ b/isdb-t/br-sc-SaoJoaoBatista
@@ -0,0 +1,32 @@
+# Channel table for S�o Jo�o Batista - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1818
+
+# Physical channel 40 (virtual 40.1)
+[SCC SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-SaoJose b/isdb-t/br-sc-SaoJose
index 8a2ae455..d27ad851 100644
--- a/isdb-t/br-sc-SaoJose
+++ b/isdb-t/br-sc-SaoJose
@@ -1,5 +1,5 @@
-# Channel table for São José - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3729
+# Channel table for S�o Jos� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3729
 
 # Physical channel 15 (virtual 57.1)
 [Top TV]
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -349,7 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 8.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 61.4)
-[TV Câmara, TV Senado, TV AL, TV Câmara Florianópolis]
+# Physical channel 43 (virtual 11.5)
+[TV Câmara, TV Câmara Florianópolis, TV AL, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -494,8 +494,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 10.5)
+[TV Senado, TV Câmara São José, TV AL, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 49 (virtual 49.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -524,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sc-SaoLourencoDoOeste b/isdb-t/br-sc-SaoLourencoDoOeste
index d312d39b..368cbd05 100644
--- a/isdb-t/br-sc-SaoLourencoDoOeste
+++ b/isdb-t/br-sc-SaoLourencoDoOeste
@@ -1,5 +1,34 @@
-# Channel table for São Lourenço Do Oeste - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1529
+# Channel table for S�o Louren�o Do Oeste - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1529
+
+# Physical channel 25 (virtual 4.1)
+[NSC Chapecó]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 7.1)
 [TV Sudoeste]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 6.1)
-[RICTV Chapecó]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -59,3 +88,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 32.1)
+[TVBV São Lourenço]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-SaoMiguelDoOeste b/isdb-t/br-sc-SaoMiguelDoOeste
index de940c20..ede26e89 100644
--- a/isdb-t/br-sc-SaoMiguelDoOeste
+++ b/isdb-t/br-sc-SaoMiguelDoOeste
@@ -1,8 +1,8 @@
-# Channel table for São Miguel Do Oeste - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/699
+# Channel table for S�o Miguel Do Oeste - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=699
 
 # Physical channel 30 (virtual 15.1)
-[RICTV Chapecó]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 7.1)
+[SCC SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-SaoPedroDeAlcantara b/isdb-t/br-sc-SaoPedroDeAlcantara
index e0b84c14..d125b68f 100644
--- a/isdb-t/br-sc-SaoPedroDeAlcantara
+++ b/isdb-t/br-sc-SaoPedroDeAlcantara
@@ -1,5 +1,5 @@
-# Channel table for São Pedro De Alcântara - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3890
+# Channel table for S�o Pedro De Alc�ntara - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3890
 
 # Physical channel 16 (virtual 15.1)
 [TV Gazeta]
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
+# Physical channel 41 (virtual 8.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 61.4)
-[TV Câmara, TV Senado, TV AL, TV Câmara Florianópolis]
+# Physical channel 43 (virtual 11.5)
+[TV Câmara, TV Câmara Florianópolis, TV AL, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sc-Schroeder b/isdb-t/br-sc-Schroeder
index 83fc4d3d..9f088c54 100644
--- a/isdb-t/br-sc-Schroeder
+++ b/isdb-t/br-sc-Schroeder
@@ -1,8 +1,8 @@
 # Channel table for Schroeder - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2006
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2006
 
-# Physical channel 16 (virtual 43.1)
-[Rede Vida]
+# Physical channel 16 (virtual 43.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 7.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sc-SerraAlta b/isdb-t/br-sc-SerraAlta
index 1f2ba966..31a3966a 100644
--- a/isdb-t/br-sc-SerraAlta
+++ b/isdb-t/br-sc-SerraAlta
@@ -1,5 +1,5 @@
 # Channel table for Serra Alta - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2216
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2216
 
 # Physical channel 33 (virtual 12.1)
 [NSC Chapecó]
diff --git a/isdb-t/br-sc-Taio b/isdb-t/br-sc-Taio
index 0872b608..a71fe70e 100644
--- a/isdb-t/br-sc-Taio
+++ b/isdb-t/br-sc-Taio
@@ -1,5 +1,5 @@
-# Channel table for Taió - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1601
+# Channel table for Tai� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1601
 
 # Physical channel 23 (virtual 54.1)
 [SCC SBT]
diff --git a/isdb-t/br-sc-Tijucas b/isdb-t/br-sc-Tijucas
index 787548ba..259e28e2 100644
--- a/isdb-t/br-sc-Tijucas
+++ b/isdb-t/br-sc-Tijucas
@@ -1,5 +1,5 @@
 # Channel table for Tijucas - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1602
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1602
 
 # Physical channel 21 (virtual 20.1)
 [Rede Vida]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 52.1)
-[RICTV Itajaí]
+# Physical channel 27 (virtual 52.1)
+[NDTV Itajaí]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.1)
-[RICTV Florianópolis]
+[NDTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-Timbo b/isdb-t/br-sc-Timbo
index 3812d183..74e0a8c9 100644
--- a/isdb-t/br-sc-Timbo
+++ b/isdb-t/br-sc-Timbo
@@ -1,5 +1,5 @@
-# Channel table for Timbó - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/781
+# Channel table for Timb� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=781
 
 # Physical channel 24 (virtual 10.1)
 [NSC Blumenau]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 9.1)
-[RICTV Blumenau]
+[NDTV Blumenau]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-TresBarras b/isdb-t/br-sc-TresBarras
index 60d9f6c5..43381642 100644
--- a/isdb-t/br-sc-TresBarras
+++ b/isdb-t/br-sc-TresBarras
@@ -1,8 +1,8 @@
-# Channel table for Três Barras - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1603
+# Channel table for Tr�s Barras - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1603
 
 # Physical channel 24 (virtual 8.1)
-[RICTV Joinville]
+[NDTV Joinville]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -30,3 +30,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 5.1)
+[SCC SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-Tubarao b/isdb-t/br-sc-Tubarao
index 69e5cba9..453b9969 100644
--- a/isdb-t/br-sc-Tubarao
+++ b/isdb-t/br-sc-Tubarao
@@ -1,8 +1,8 @@
-# Channel table for Tubarão - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/729
+# Channel table for Tubar�o - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=729
 
-# Physical channel 20 (virtual 24.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 7.1)
-[RICTV Florianópolis]
+[NDTV Criciúma]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 5.1)
+[TVBV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 46 (virtual 2.1)
 [SCC SBT]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sc-Urupema b/isdb-t/br-sc-Urupema
index 701252cd..8d9e0855 100644
--- a/isdb-t/br-sc-Urupema
+++ b/isdb-t/br-sc-Urupema
@@ -1,5 +1,5 @@
 # Channel table for Urupema - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/818
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=818
 
 # Physical channel 23 (virtual 59.1)
 [SCC SBT]
diff --git a/isdb-t/br-sc-Videira b/isdb-t/br-sc-Videira
new file mode 100644
index 00000000..72c9a43a
--- /dev/null
+++ b/isdb-t/br-sc-Videira
@@ -0,0 +1,61 @@
+# Channel table for Videira - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=837
+
+# Physical channel 25 (virtual 5.1)
+[NSC Centro-Oeste]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 8.1)
+[SCC SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sc-Xanxere b/isdb-t/br-sc-Xanxere
index ab882501..50448bd9 100644
--- a/isdb-t/br-sc-Xanxere
+++ b/isdb-t/br-sc-Xanxere
@@ -1,5 +1,5 @@
-# Channel table for Xanxerê - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1608
+# Channel table for Xanxer� - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1608
 
 # Physical channel 23 (virtual 27.1)
 [SCC SBT]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 3.1)
-[RICTV Xanxerê]
+[NDTV Criciúma]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -59,6 +59,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 10.1)
+[NDTV Chapecó]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 5.1)
+[NSC Chapecó]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 51.1)
 [TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sc-Xaxim b/isdb-t/br-sc-Xaxim
index 45486f8c..f3694e1c 100644
--- a/isdb-t/br-sc-Xaxim
+++ b/isdb-t/br-sc-Xaxim
@@ -1,8 +1,8 @@
 # Channel table for Xaxim - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1609
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1609
 
 # Physical channel 30 (virtual 10.1)
-[RICTV Chapecó]
+[NDTV Chapecó]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sc-AguasMornas b/isdb-t/br-sc-aguasMornas
index 7921a401..11cb2bee 100644
--- a/isdb-t/br-sc-AguasMornas
+++ b/isdb-t/br-sc-aguasMornas
@@ -1,5 +1,5 @@
-# Channel table for Águas Mornas - SC - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1799
+# Channel table for �guas Mornas - SC - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1799
 
 # Physical channel 34 (virtual 7.1)
 [NSC TV]
diff --git a/isdb-t/br-se-Aquidaba b/isdb-t/br-se-Aquidaba
index 5322d306..0bcf9c77 100644
--- a/isdb-t/br-se-Aquidaba
+++ b/isdb-t/br-se-Aquidaba
@@ -1,5 +1,5 @@
-# Channel table for Aquidabã - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2312
+# Channel table for Aquidab� - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2312
 
 # Physical channel 16 (virtual 2.1)
 [Rede Século 21]
diff --git a/isdb-t/br-se-Aracaju b/isdb-t/br-se-Aracaju
index 634bd046..c8d10b47 100644
--- a/isdb-t/br-se-Aracaju
+++ b/isdb-t/br-se-Aracaju
@@ -1,8 +1,8 @@
 # Channel table for Aracaju - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3
 
-# Physical channel 14 (virtual 5.1)
-[TV Liberdade]
+# Physical channel 14 (virtual 7.3)
+[TVC SE, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 6.1)
-[TV Aperipê]
+# Physical channel 31 (virtual 6.2)
+[TV Aperipê, Aperipê Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -233,8 +233,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 32 (virtual 3.1)
+[TV Liberdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -320,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 39.1)
-[Rede Vida]
+# Physical channel 38 (virtual 39.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -465,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-se-Araua b/isdb-t/br-se-Araua
index 28f90a81..fe6e9b55 100644
--- a/isdb-t/br-se-Araua
+++ b/isdb-t/br-se-Araua
@@ -1,5 +1,5 @@
-# Channel table for Arauá - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2313
+# Channel table for Arau� - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2313
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-AreiaBranca b/isdb-t/br-se-AreiaBranca
index f4784a90..dae3bf3d 100644
--- a/isdb-t/br-se-AreiaBranca
+++ b/isdb-t/br-se-AreiaBranca
@@ -1,5 +1,5 @@
 # Channel table for Areia Branca - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2336
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2336
 
 # Physical channel 24 (virtual 23.1)
 [Rede Família]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-se-BarraDosCoqueiros b/isdb-t/br-se-BarraDosCoqueiros
index f8015f00..adcf5eef 100644
--- a/isdb-t/br-se-BarraDosCoqueiros
+++ b/isdb-t/br-se-BarraDosCoqueiros
@@ -1,8 +1,8 @@
 # Channel table for Barra Dos Coqueiros - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2995
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2995
 
-# Physical channel 14 (virtual 5.1)
-[TV Liberdade]
+# Physical channel 14 (virtual 7.3)
+[TVC SE, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 6.1)
-[TV Aperipê]
+# Physical channel 31 (virtual 6.2)
+[TV Aperipê, Aperipê Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -233,8 +233,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 32 (virtual 3.1)
+[TV Liberdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -465,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-se-Boquim b/isdb-t/br-se-Boquim
index 653edb29..b5b1c301 100644
--- a/isdb-t/br-se-Boquim
+++ b/isdb-t/br-se-Boquim
@@ -1,5 +1,5 @@
 # Channel table for Boquim - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2334
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2334
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-CampoDoBrito b/isdb-t/br-se-CampoDoBrito
index 11fb03e0..28416319 100644
--- a/isdb-t/br-se-CampoDoBrito
+++ b/isdb-t/br-se-CampoDoBrito
@@ -1,5 +1,34 @@
 # Channel table for Campo Do Brito - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2337
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2337
+
+# Physical channel 26 (virtual 26.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 13.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-CanindeDeSaoFrancisco b/isdb-t/br-se-CanindeDeSaoFrancisco
index e408c80a..1cdd4640 100644
--- a/isdb-t/br-se-CanindeDeSaoFrancisco
+++ b/isdb-t/br-se-CanindeDeSaoFrancisco
@@ -1,8 +1,8 @@
-# Channel table for Canindé De São Francisco - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/636
+# Channel table for Canind� De S�o Francisco - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=636
 
-# Physical channel 32 (virtual 11.1)
-[TV Sergipe]
+# Physical channel 32 (virtual 11.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-se-Capela b/isdb-t/br-se-Capela
index 7b4ca27e..ef1919c4 100644
--- a/isdb-t/br-se-Capela
+++ b/isdb-t/br-se-Capela
@@ -1,5 +1,121 @@
 # Channel table for Capela - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2315
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2315
+
+# Physical channel 14 (virtual 3.1)
+[TV Liberdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 18.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 20.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 23.1)
+[Rede Família]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 26.1)
 [CNT]
@@ -30,8 +146,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 6.1)
-[TV Aperipê]
+# Physical channel 27 (virtual 27.1)
+[TV Novo Tempo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 28.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 6.2)
+[TV Aperipê, Aperipê Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -59,8 +233,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 32 (virtual 7.1)
+[TVC SE]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -117,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 39.1)
-[Rede Vida]
+# Physical channel 38 (virtual 39.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -175,3 +378,90 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 42.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 50.1)
+[SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-se-Carira b/isdb-t/br-se-Carira
index eb033dde..e1295f34 100644
--- a/isdb-t/br-se-Carira
+++ b/isdb-t/br-se-Carira
@@ -1,5 +1,5 @@
 # Channel table for Carira - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1399
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1399
 
 # Physical channel 34 (virtual 10.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-Carmopolis b/isdb-t/br-se-Carmopolis
index a5c18ace..96da41d4 100644
--- a/isdb-t/br-se-Carmopolis
+++ b/isdb-t/br-se-Carmopolis
@@ -1,5 +1,5 @@
-# Channel table for Carmópolis - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2316
+# Channel table for Carm�polis - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2316
 
 # Physical channel 25 (virtual 26.1)
 [CNT]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,3 +233,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 50.1)
+[SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-se-CedroDeSaoJoao b/isdb-t/br-se-CedroDeSaoJoao
index c73d06da..aa0cae37 100644
--- a/isdb-t/br-se-CedroDeSaoJoao
+++ b/isdb-t/br-se-CedroDeSaoJoao
@@ -1,5 +1,5 @@
-# Channel table for Cedro De São João - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/289
+# Channel table for Cedro De S�o Jo�o - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=289
 
 # Physical channel 16 (virtual 2.1)
 [Rede Século 21]
diff --git a/isdb-t/br-se-Cristinapolis b/isdb-t/br-se-Cristinapolis
index 85e8d581..6864c87e 100644
--- a/isdb-t/br-se-Cristinapolis
+++ b/isdb-t/br-se-Cristinapolis
@@ -1,5 +1,5 @@
-# Channel table for Cristinápolis - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/909
+# Channel table for Cristin�polis - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=909
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-DivinaPastora b/isdb-t/br-se-DivinaPastora
index 9b329696..fd4238dc 100644
--- a/isdb-t/br-se-DivinaPastora
+++ b/isdb-t/br-se-DivinaPastora
@@ -1,7 +1,7 @@
 # Channel table for Divina Pastora - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2318
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2318
 
-# Physical channel 14 (virtual 5.1)
+# Physical channel 14 (virtual 3.1)
 [TV Liberdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 6.1)
-[TV Aperipê]
+# Physical channel 31 (virtual 6.2)
+[TV Aperipê, Aperipê Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
@@ -407,3 +407,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 50.1)
+[SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-se-Estancia b/isdb-t/br-se-Estancia
index d807174e..fd51442d 100644
--- a/isdb-t/br-se-Estancia
+++ b/isdb-t/br-se-Estancia
@@ -1,5 +1,5 @@
-# Channel table for Estância - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/246
+# Channel table for Est�ncia - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=246
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-FeiraNova b/isdb-t/br-se-FeiraNova
index 1c04003c..515a3ff5 100644
--- a/isdb-t/br-se-FeiraNova
+++ b/isdb-t/br-se-FeiraNova
@@ -1,5 +1,5 @@
 # Channel table for Feira Nova - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2319
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2319
 
 # Physical channel 34 (virtual 10.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-FreiPaulo b/isdb-t/br-se-FreiPaulo
index a1529bc9..86d1686c 100644
--- a/isdb-t/br-se-FreiPaulo
+++ b/isdb-t/br-se-FreiPaulo
@@ -1,7 +1,7 @@
 # Channel table for Frei Paulo - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2294
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2294
 
-# Physical channel 14 (virtual 5.1)
+# Physical channel 14 (virtual 3.1)
 [TV Liberdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,37 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 22.1)
-[TV Evangelizar]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -321,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -378,8 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-se-Gararu b/isdb-t/br-se-Gararu
index 963163b0..3697055d 100644
--- a/isdb-t/br-se-Gararu
+++ b/isdb-t/br-se-Gararu
@@ -1,5 +1,5 @@
 # Channel table for Gararu - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2295
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2295
 
 # Physical channel 34 (virtual 10.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-GeneralMaynard b/isdb-t/br-se-GeneralMaynard
index cf274c74..2984c38e 100644
--- a/isdb-t/br-se-GeneralMaynard
+++ b/isdb-t/br-se-GeneralMaynard
@@ -1,5 +1,5 @@
 # Channel table for General Maynard - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2296
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2296
 
 # Physical channel 25 (virtual 26.1)
 [CNT]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,3 +233,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 50.1)
+[SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-se-GrachoCardoso b/isdb-t/br-se-GrachoCardoso
index b1923185..c72f72b2 100644
--- a/isdb-t/br-se-GrachoCardoso
+++ b/isdb-t/br-se-GrachoCardoso
@@ -1,5 +1,5 @@
 # Channel table for Gracho Cardoso - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2297
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2297
 
 # Physical channel 34 (virtual 10.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-IlhaDasFlores b/isdb-t/br-se-IlhaDasFlores
index 9736be55..a57ee037 100644
--- a/isdb-t/br-se-IlhaDasFlores
+++ b/isdb-t/br-se-IlhaDasFlores
@@ -1,5 +1,5 @@
 # Channel table for Ilha Das Flores - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2298
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2298
 
 # Physical channel 21 (virtual 17.1)
 [TV Gazeta AL]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 27 (virtual 27.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 551142857
diff --git a/isdb-t/br-se-Itabaiana b/isdb-t/br-se-Itabaiana
index 09003c69..7f8ae75e 100644
--- a/isdb-t/br-se-Itabaiana
+++ b/isdb-t/br-se-Itabaiana
@@ -1,5 +1,5 @@
 # Channel table for Itabaiana - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/644
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=644
 
 # Physical channel 17 (virtual 18.1)
 [Record News]
@@ -146,8 +146,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 26 (virtual 26.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -321,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
diff --git a/isdb-t/br-se-Itabaianinha b/isdb-t/br-se-Itabaianinha
index f2a62066..7179ce89 100644
--- a/isdb-t/br-se-Itabaianinha
+++ b/isdb-t/br-se-Itabaianinha
@@ -1,5 +1,5 @@
 # Channel table for Itabaianinha - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2300
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2300
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 49 (virtual 49.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-se-Itabi b/isdb-t/br-se-Itabi
index 531c46a2..042b0530 100644
--- a/isdb-t/br-se-Itabi
+++ b/isdb-t/br-se-Itabi
@@ -1,5 +1,5 @@
 # Channel table for Itabi - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2301
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2301
 
 # Physical channel 34 (virtual 10.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-ItaporangaD'Ajuda b/isdb-t/br-se-ItaporangaD'Ajuda
index 48874ce4..4926a12b 100644
--- a/isdb-t/br-se-ItaporangaD'Ajuda
+++ b/isdb-t/br-se-ItaporangaD'Ajuda
@@ -1,5 +1,5 @@
-# Channel table for Itaporanga D´ Ajuda - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2341
+# Channel table for Itaporanga D� Ajuda - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2341
 
 # Physical channel 25 (virtual 26.1)
 [CNT]
diff --git a/isdb-t/br-se-Japaratuba b/isdb-t/br-se-Japaratuba
index c9627069..bd28a992 100644
--- a/isdb-t/br-se-Japaratuba
+++ b/isdb-t/br-se-Japaratuba
@@ -1,5 +1,5 @@
 # Channel table for Japaratuba - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/845
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=845
 
 # Physical channel 25 (virtual 26.1)
 [CNT]
@@ -204,3 +204,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 50.1)
+[SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-se-Lagarto b/isdb-t/br-se-Lagarto
index af3f73f8..be97b555 100644
--- a/isdb-t/br-se-Lagarto
+++ b/isdb-t/br-se-Lagarto
@@ -1,5 +1,5 @@
 # Channel table for Lagarto - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/234
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=234
 
 # Physical channel 17 (virtual 18.1)
 [Record News]
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
diff --git a/isdb-t/br-se-Laranjeiras b/isdb-t/br-se-Laranjeiras
index 2f835164..f0875544 100644
--- a/isdb-t/br-se-Laranjeiras
+++ b/isdb-t/br-se-Laranjeiras
@@ -1,8 +1,8 @@
 # Channel table for Laranjeiras - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2339
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2339
 
-# Physical channel 14 (virtual 5.1)
-[TV Liberdade]
+# Physical channel 14 (virtual 7.1)
+[TVC SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 6.1)
-[TV Aperipê]
+# Physical channel 31 (virtual 6.2)
+[TV Aperipê, Aperipê Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -204,8 +204,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 32 (virtual 3.1)
+[TV Liberdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -350,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -407,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 48 (virtual 48.1)
+[TV ALESE, TV Câmara Municipal Aracaju, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-se-Macambira b/isdb-t/br-se-Macambira
index 89af8d22..0c79888b 100644
--- a/isdb-t/br-se-Macambira
+++ b/isdb-t/br-se-Macambira
@@ -1,5 +1,5 @@
 # Channel table for Macambira - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2331
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2331
 
 # Physical channel 32 (virtual 13.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-Malhador b/isdb-t/br-se-Malhador
index 7059b4aa..7dcfeab7 100644
--- a/isdb-t/br-se-Malhador
+++ b/isdb-t/br-se-Malhador
@@ -1,5 +1,5 @@
 # Channel table for Malhador - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2333
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2333
 
 # Physical channel 24 (virtual 23.1)
 [Rede Família]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-se-Maruim b/isdb-t/br-se-Maruim
index fff90eb2..9dddd87f 100644
--- a/isdb-t/br-se-Maruim
+++ b/isdb-t/br-se-Maruim
@@ -1,7 +1,7 @@
 # Channel table for Maruim - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2342
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2342
 
-# Physical channel 14 (virtual 5.1)
+# Physical channel 14 (virtual 3.1)
 [TV Liberdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
@@ -407,3 +407,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 50.1)
+[SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-se-MoitaBonita b/isdb-t/br-se-MoitaBonita
index c35384e9..b753d9e8 100644
--- a/isdb-t/br-se-MoitaBonita
+++ b/isdb-t/br-se-MoitaBonita
@@ -1,5 +1,5 @@
 # Channel table for Moita Bonita - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2320
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2320
 
 # Physical channel 32 (virtual 13.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-MonteAlegreDeSergipe b/isdb-t/br-se-MonteAlegreDeSergipe
index 359fae9d..5eaf285d 100644
--- a/isdb-t/br-se-MonteAlegreDeSergipe
+++ b/isdb-t/br-se-MonteAlegreDeSergipe
@@ -1,5 +1,5 @@
 # Channel table for Monte Alegre De Sergipe - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/645
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=645
 
 # Physical channel 34 (virtual 10.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-Muribeca b/isdb-t/br-se-Muribeca
index 0c402a6e..0691c048 100644
--- a/isdb-t/br-se-Muribeca
+++ b/isdb-t/br-se-Muribeca
@@ -1,5 +1,5 @@
 # Channel table for Muribeca - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2321
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2321
 
 # Physical channel 33 (virtual 4.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-Neopolis b/isdb-t/br-se-Neopolis
index 73b0b5e1..6fc87bca 100644
--- a/isdb-t/br-se-Neopolis
+++ b/isdb-t/br-se-Neopolis
@@ -1,5 +1,5 @@
-# Channel table for Neópolis - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2322
+# Channel table for Ne�polis - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2322
 
 # Physical channel 21 (virtual 17.1)
 [TV Gazeta AL]
@@ -30,32 +30,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 14.1)
-[Rede Vida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-se-NossaSenhoraAparecida b/isdb-t/br-se-NossaSenhoraAparecida
index d669b660..3d0f11a7 100644
--- a/isdb-t/br-se-NossaSenhoraAparecida
+++ b/isdb-t/br-se-NossaSenhoraAparecida
@@ -1,5 +1,5 @@
 # Channel table for Nossa Senhora Aparecida - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2323
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2323
 
 # Physical channel 34 (virtual 10.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-NossaSenhoraDaGloria b/isdb-t/br-se-NossaSenhoraDaGloria
index f8f995ec..5ef2e083 100644
--- a/isdb-t/br-se-NossaSenhoraDaGloria
+++ b/isdb-t/br-se-NossaSenhoraDaGloria
@@ -1,8 +1,8 @@
-# Channel table for Nossa Senhora Da Glória - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/967
+# Channel table for Nossa Senhora Da Gl�ria - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=967
 
-# Physical channel 34 (virtual 10.1)
-[TV Sergipe]
+# Physical channel 34 (virtual 10.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 43.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-se-NossaSenhoraDasDores b/isdb-t/br-se-NossaSenhoraDasDores
index 71bc76ce..1993cdeb 100644
--- a/isdb-t/br-se-NossaSenhoraDasDores
+++ b/isdb-t/br-se-NossaSenhoraDasDores
@@ -1,5 +1,5 @@
 # Channel table for Nossa Senhora Das Dores - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3273
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3273
 
 # Physical channel 31 (virtual 6.1)
 [TV Aperipê]
diff --git a/isdb-t/br-se-NossaSenhoraDoSocorro b/isdb-t/br-se-NossaSenhoraDoSocorro
index fa41b415..32f67e8d 100644
--- a/isdb-t/br-se-NossaSenhoraDoSocorro
+++ b/isdb-t/br-se-NossaSenhoraDoSocorro
@@ -1,8 +1,8 @@
 # Channel table for Nossa Senhora Do Socorro - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2338
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2338
 
-# Physical channel 14 (virtual 5.1)
-[TV Liberdade]
+# Physical channel 14 (virtual 7.1)
+[TVC SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 473142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 6.1)
-[TV Aperipê]
+# Physical channel 31 (virtual 6.2)
+[TV Aperipê, Aperipê Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -204,8 +204,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 32 (virtual 3.1)
+[TV Liberdade]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -350,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -407,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-se-Pedrinhas b/isdb-t/br-se-Pedrinhas
index dafc4564..3ab3e4a3 100644
--- a/isdb-t/br-se-Pedrinhas
+++ b/isdb-t/br-se-Pedrinhas
@@ -1,5 +1,5 @@
 # Channel table for Pedrinhas - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/910
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=910
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-Pirambu b/isdb-t/br-se-Pirambu
index a08f938a..580d4492 100644
--- a/isdb-t/br-se-Pirambu
+++ b/isdb-t/br-se-Pirambu
@@ -1,5 +1,5 @@
 # Channel table for Pirambu - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3565
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3565
 
 # Physical channel 24 (virtual 23.1)
 [Rede Família]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -262,3 +262,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 50.1)
+[SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-se-PocoRedondo b/isdb-t/br-se-PocoRedondo
index ab80e205..255098dc 100644
--- a/isdb-t/br-se-PocoRedondo
+++ b/isdb-t/br-se-PocoRedondo
@@ -1,8 +1,8 @@
-# Channel table for Poço Redondo - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2327
+# Channel table for Po�o Redondo - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2327
 
-# Physical channel 32 (virtual 11.1)
-[TV Sergipe]
+# Physical channel 32 (virtual 11.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 43.1)
-[RCI Minas]
+[TV Pai Eterno MG]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-se-Propria b/isdb-t/br-se-Propria
index bf53b571..14ccd03d 100644
--- a/isdb-t/br-se-Propria
+++ b/isdb-t/br-se-Propria
@@ -1,5 +1,5 @@
-# Channel table for Propriá - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/632
+# Channel table for Propri� - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=632
 
 # Physical channel 16 (virtual 2.1)
 [Rede Século 21]
diff --git a/isdb-t/br-se-RiachaoDoDantas b/isdb-t/br-se-RiachaoDoDantas
index 96312467..7b36c9a5 100644
--- a/isdb-t/br-se-RiachaoDoDantas
+++ b/isdb-t/br-se-RiachaoDoDantas
@@ -1,5 +1,5 @@
-# Channel table for Riachão Do Dantas - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/329
+# Channel table for Riach�o Do Dantas - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=329
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-Riachuelo b/isdb-t/br-se-Riachuelo
index 6febd86c..633fba32 100644
--- a/isdb-t/br-se-Riachuelo
+++ b/isdb-t/br-se-Riachuelo
@@ -1,7 +1,7 @@
 # Channel table for Riachuelo - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2340
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2340
 
-# Physical channel 14 (virtual 5.1)
+# Physical channel 14 (virtual 3.1)
 [TV Liberdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
@@ -407,3 +407,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 50.1)
+[SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-se-Ribeiropolis b/isdb-t/br-se-Ribeiropolis
index d77aae33..c771fbd0 100644
--- a/isdb-t/br-se-Ribeiropolis
+++ b/isdb-t/br-se-Ribeiropolis
@@ -1,5 +1,5 @@
-# Channel table for Ribeirópolis - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2302
+# Channel table for Ribeir�polis - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2302
 
 # Physical channel 32 (virtual 13.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-RosarioDoCatete b/isdb-t/br-se-RosarioDoCatete
index 6b3802c7..dd452cdb 100644
--- a/isdb-t/br-se-RosarioDoCatete
+++ b/isdb-t/br-se-RosarioDoCatete
@@ -1,5 +1,5 @@
-# Channel table for Rosário Do Catete - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2303
+# Channel table for Ros�rio Do Catete - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2303
 
 # Physical channel 25 (virtual 26.1)
 [CNT]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -233,3 +233,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 50.1)
+[SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-se-Salgado b/isdb-t/br-se-Salgado
index a0afa4d9..b3393aba 100644
--- a/isdb-t/br-se-Salgado
+++ b/isdb-t/br-se-Salgado
@@ -1,5 +1,5 @@
 # Channel table for Salgado - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/697
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=697
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-SantaLuziaDoIntanhy b/isdb-t/br-se-SantaLuziaDoIntanhy
index bf1f2de7..e4922c4b 100644
--- a/isdb-t/br-se-SantaLuziaDoIntanhy
+++ b/isdb-t/br-se-SantaLuziaDoIntanhy
@@ -1,5 +1,5 @@
 # Channel table for Santa Luzia Do Intanhy - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2304
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2304
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-SantoAmaroDasBrotas b/isdb-t/br-se-SantoAmaroDasBrotas
index 271b6fa7..6dcbfb46 100644
--- a/isdb-t/br-se-SantoAmaroDasBrotas
+++ b/isdb-t/br-se-SantoAmaroDasBrotas
@@ -1,7 +1,7 @@
 # Channel table for Santo Amaro Das Brotas - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2305
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2305
 
-# Physical channel 14 (virtual 5.1)
+# Physical channel 14 (virtual 3.1)
 [TV Liberdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 6.1)
-[TV Aperipê]
+# Physical channel 31 (virtual 6.2)
+[TV Aperipê, Aperipê Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-se-SaoCristovao b/isdb-t/br-se-SaoCristovao
index e175baa8..3e1fff2f 100644
--- a/isdb-t/br-se-SaoCristovao
+++ b/isdb-t/br-se-SaoCristovao
@@ -1,7 +1,7 @@
-# Channel table for São Cristóvão - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/661
+# Channel table for S�o Crist�v�o - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=661
 
-# Physical channel 14 (virtual 5.1)
+# Physical channel 14 (virtual 3.1)
 [TV Liberdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 6.1)
-[TV Aperipê]
+# Physical channel 31 (virtual 6.2)
+[TV Aperipê, Aperipê Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -378,8 +378,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 46 (virtual 46.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-se-SaoDomingos b/isdb-t/br-se-SaoDomingos
index 60000349..2e1e7893 100644
--- a/isdb-t/br-se-SaoDomingos
+++ b/isdb-t/br-se-SaoDomingos
@@ -1,5 +1,5 @@
-# Channel table for São Domingos - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3150
+# Channel table for S�o Domingos - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3150
 
 # Physical channel 32 (virtual 13.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-SaoMiguelDoAleixo b/isdb-t/br-se-SaoMiguelDoAleixo
index e9af7e7b..8e45fd73 100644
--- a/isdb-t/br-se-SaoMiguelDoAleixo
+++ b/isdb-t/br-se-SaoMiguelDoAleixo
@@ -1,5 +1,5 @@
-# Channel table for São Miguel Do Aleixo - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2307
+# Channel table for S�o Miguel Do Aleixo - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2307
 
 # Physical channel 34 (virtual 10.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-SimaoDias b/isdb-t/br-se-SimaoDias
index 756818dd..9526174c 100644
--- a/isdb-t/br-se-SimaoDias
+++ b/isdb-t/br-se-SimaoDias
@@ -1,8 +1,8 @@
-# Channel table for Simão Dias - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/288
+# Channel table for Sim�o Dias - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=288
 
 # Physical channel 47 (virtual 47.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
diff --git a/isdb-t/br-se-Siriri b/isdb-t/br-se-Siriri
index 1f2ae773..008e4a8e 100644
--- a/isdb-t/br-se-Siriri
+++ b/isdb-t/br-se-Siriri
@@ -1,7 +1,7 @@
 # Channel table for Siriri - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2993
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2993
 
-# Physical channel 14 (virtual 5.1)
+# Physical channel 14 (virtual 3.1)
 [TV Liberdade]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 28.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 6.1)
-[TV Aperipê]
+# Physical channel 31 (virtual 6.2)
+[TV Aperipê, Aperipê Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
-[TV Sergipe]
+# Physical channel 33 (virtual 4.2)
+[TV Sergipe, Educação SE]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 587142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 42.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -378,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.4)
-[TV Senado, TV ALESE, TV Câmara, TV Câmara Municipal Aracaju]
+# Physical channel 48 (virtual 5.4)
+[TV Senado, TV ALESE, TV Câmara Municipal Aracaju]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
@@ -407,3 +407,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51 (virtual 50.1)
+[SBT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-se-Telha b/isdb-t/br-se-Telha
index f9990657..c1037b62 100644
--- a/isdb-t/br-se-Telha
+++ b/isdb-t/br-se-Telha
@@ -1,5 +1,5 @@
 # Channel table for Telha - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2309
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2309
 
 # Physical channel 41 (virtual 7.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-se-TobiasBarreto b/isdb-t/br-se-TobiasBarreto
index 56e04c87..1c3f933c 100644
--- a/isdb-t/br-se-TobiasBarreto
+++ b/isdb-t/br-se-TobiasBarreto
@@ -1,5 +1,5 @@
 # Channel table for Tobias Barreto - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/678
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=678
 
 # Physical channel 41 (virtual 41.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-se-TomarDoGeru b/isdb-t/br-se-TomarDoGeru
index 74784322..c96b34b2 100644
--- a/isdb-t/br-se-TomarDoGeru
+++ b/isdb-t/br-se-TomarDoGeru
@@ -1,5 +1,5 @@
 # Channel table for Tomar Do Geru - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2310
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2310
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
diff --git a/isdb-t/br-se-Umbauba b/isdb-t/br-se-Umbauba
index 3931a977..73ecf093 100644
--- a/isdb-t/br-se-Umbauba
+++ b/isdb-t/br-se-Umbauba
@@ -1,5 +1,5 @@
-# Channel table for Umbaúba - SE - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/911
+# Channel table for Umba�ba - SE - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=911
 
 # Physical channel 34 (virtual 43.1)
 [TV Sergipe]
diff --git a/isdb-t/br-sp-Adamantina b/isdb-t/br-sp-Adamantina
index 49e1fa14..14d50484 100644
--- a/isdb-t/br-sp-Adamantina
+++ b/isdb-t/br-sp-Adamantina
@@ -1,8 +1,8 @@
 # Channel table for Adamantina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/507
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=507
 
-# Physical channel 16 (virtual 15.1)
-[Rede Vida]
+# Physical channel 16 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-Adolfo b/isdb-t/br-sp-Adolfo
index f053c3f2..11663eff 100644
--- a/isdb-t/br-sp-Adolfo
+++ b/isdb-t/br-sp-Adolfo
@@ -1,5 +1,5 @@
 # Channel table for Adolfo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3699
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3699
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Aguai b/isdb-t/br-sp-Aguai
index 65167860..bb74ca48 100644
--- a/isdb-t/br-sp-Aguai
+++ b/isdb-t/br-sp-Aguai
@@ -1,5 +1,5 @@
-# Channel table for Aguaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2734
+# Channel table for Agua� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2734
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -30,7 +30,65 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 20 (virtual 21.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 22.1)
+[TV União]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -146,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 38 (virtual 10.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Agudos b/isdb-t/br-sp-Agudos
index f074bc7e..4147936f 100644
--- a/isdb-t/br-sp-Agudos
+++ b/isdb-t/br-sp-Agudos
@@ -1,5 +1,5 @@
 # Channel table for Agudos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1421
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1421
 
 # Physical channel 17 (virtual 10.1)
 [Band Paulista]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 21.1)
-[Rede Vida]
+# Physical channel 20 (virtual 21.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 13.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 45.1)
-[TV Unesp]
+# Physical channel 46 (virtual 46.3)
+[TV Unesp, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-AlfredoMarcondes b/isdb-t/br-sp-AlfredoMarcondes
index 34335465..56baf182 100644
--- a/isdb-t/br-sp-AlfredoMarcondes
+++ b/isdb-t/br-sp-AlfredoMarcondes
@@ -1,5 +1,5 @@
 # Channel table for Alfredo Marcondes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3685
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3685
 
 # Physical channel 19 (virtual 10.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Altair b/isdb-t/br-sp-Altair
index 33010046..8c28288a 100644
--- a/isdb-t/br-sp-Altair
+++ b/isdb-t/br-sp-Altair
@@ -1,66 +1,8 @@
 # Channel table for Altair - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3825
-
-# Physical channel 17 (virtual 59.1)
-[TV Gazeta]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 20 (virtual 21.1)
-[RBI TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3825
 
 # Physical channel 22 (virtual 15.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -117,64 +59,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV Câmara São José do Rio Preto, Rede ALESP, TV Senado]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 32 (virtual 11.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 9.1)
+# Physical channel 34 (virtual 9.2)
 [SBT Interior/SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -233,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.1)
-[RCI]
+# Physical channel 38 (virtual 38.1)
+[TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 19.1)
-[RIT]
+# Physical channel 39 (virtual 39.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 44.1)
-[Record News]
+# Physical channel 43 (virtual 43.1)
+[TV Morada do Sol]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 13.1)
-[Rede TV!]
+# Physical channel 44 (virtual 44.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Altinopolis b/isdb-t/br-sp-Altinopolis
index a431f57d..b03487a7 100644
--- a/isdb-t/br-sp-Altinopolis
+++ b/isdb-t/br-sp-Altinopolis
@@ -1,5 +1,5 @@
-# Channel table for Altinópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1387
+# Channel table for Altin�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1387
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 51.1)
-[Rede Vida]
+# Physical channel 21 (virtual 51.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-AltoAlegre b/isdb-t/br-sp-AltoAlegre
index 060a6163..524897b8 100644
--- a/isdb-t/br-sp-AltoAlegre
+++ b/isdb-t/br-sp-AltoAlegre
@@ -1,5 +1,5 @@
 # Channel table for Alto Alegre - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3922
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3922
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Aluminio b/isdb-t/br-sp-Aluminio
index 3a0b546f..b6ad73ae 100644
--- a/isdb-t/br-sp-Aluminio
+++ b/isdb-t/br-sp-Aluminio
@@ -1,5 +1,5 @@
-# Channel table for Alumínio - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1001
+# Channel table for Alum�nio - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1001
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Sorocaba]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-sp-Alvinlandia b/isdb-t/br-sp-Alvinlandia
index a5a012e0..664d7bb4 100644
--- a/isdb-t/br-sp-Alvinlandia
+++ b/isdb-t/br-sp-Alvinlandia
@@ -1,5 +1,5 @@
-# Channel table for Alvinlândia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4001
+# Channel table for Alvinl�ndia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4001
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Americana b/isdb-t/br-sp-Americana
index b38d1517..390526e2 100644
--- a/isdb-t/br-sp-Americana
+++ b/isdb-t/br-sp-Americana
@@ -1,7 +1,7 @@
 # Channel table for Americana - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/307
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=307
 
-# Physical channel 14 (virtual 46.1)
+# Physical channel 14 (virtual 14.1)
 [TV Todo Dia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -349,7 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
+# Physical channel 39 (virtual 11.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-AmericoBrasiliense b/isdb-t/br-sp-AmericoBrasiliense
index e4136b9e..5485b875 100644
--- a/isdb-t/br-sp-AmericoBrasiliense
+++ b/isdb-t/br-sp-AmericoBrasiliense
@@ -1,5 +1,5 @@
-# Channel table for Américo Brasiliense - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2733
+# Channel table for Am�rico Brasiliense - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2733
 
 # Physical channel 18 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 7.1)
-[TV Cultura Paulista]
+# Physical channel 20 (virtual 8.1)
+[TV Morada do Sol]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 20.2)
-[TV Morada do Sol]
+# Physical channel 24 (virtual 24.1)
+[SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 12.1)
-[SBT Central]
+# Physical channel 27 (virtual 34.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 34.1)
-[TV Canção Nova]
+# Physical channel 28 (virtual 13.1)
+[Record TV Interior SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 13.1)
-[Record TV Interior SP]
+# Physical channel 33 (virtual 43.1)
+[Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 43.1)
-[Rede Família]
+# Physical channel 35 (virtual 35.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 35.1)
-[Record News]
+# Physical channel 36 (virtual 7.1)
+[TV Cultura Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-AmericoDeCampos b/isdb-t/br-sp-AmericoDeCampos
index 8a46d8ce..1f423311 100644
--- a/isdb-t/br-sp-AmericoDeCampos
+++ b/isdb-t/br-sp-AmericoDeCampos
@@ -1,5 +1,5 @@
-# Channel table for Américo De Campos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2767
+# Channel table for Am�rico De Campos - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2767
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Rio Preto]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 44.1)
-[Rede Vida]
+# Physical channel 32 (virtual 44.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-Amparo b/isdb-t/br-sp-Amparo
index 3edadbf8..ec8bb7c4 100644
--- a/isdb-t/br-sp-Amparo
+++ b/isdb-t/br-sp-Amparo
@@ -1,5 +1,5 @@
 # Channel table for Amparo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/49
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=49
 
 # Physical channel 14 (virtual 14.1)
 [SRTV]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 30.1)
-[VTV]
+# Physical channel 28 (virtual 6.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 30 (virtual 30.1)
+[VTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 12.1)
-[EPTV Campinas]
+# Physical channel 38 (virtual 10.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 17.1)
-[Record News]
+# Physical channel 42 (virtual 12.1)
+[EPTV Campinas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 6.1)
-[TVB]
+# Physical channel 45 (virtual 17.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Analandia b/isdb-t/br-sp-Analandia
index f078d38e..ae9568cb 100644
--- a/isdb-t/br-sp-Analandia
+++ b/isdb-t/br-sp-Analandia
@@ -1,5 +1,5 @@
-# Channel table for Analândia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2183
+# Channel table for Anal�ndia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2183
 
 # Physical channel 42 (virtual 6.1)
 [EPTV Central]
diff --git a/isdb-t/br-sp-Andradina b/isdb-t/br-sp-Andradina
index f779b2cf..d89bf814 100644
--- a/isdb-t/br-sp-Andradina
+++ b/isdb-t/br-sp-Andradina
@@ -1,5 +1,5 @@
 # Channel table for Andradina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/866
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=866
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.1)
-[Rede Vida]
+# Physical channel 31 (virtual 31.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 34.1)
+# Physical channel 33 (virtual 33.2)
 [SBT Interior/SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 5.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-Angatuba b/isdb-t/br-sp-Angatuba
index 6ef829ed..00768494 100644
--- a/isdb-t/br-sp-Angatuba
+++ b/isdb-t/br-sp-Angatuba
@@ -1,7 +1,7 @@
 # Channel table for Angatuba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/980
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=980
 
-# Physical channel 22 (virtual 59.1)
+# Physical channel 22 (virtual 25.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-sp-Anhembi b/isdb-t/br-sp-Anhembi
index aed13406..9fc0a3d6 100644
--- a/isdb-t/br-sp-Anhembi
+++ b/isdb-t/br-sp-Anhembi
@@ -1,5 +1,5 @@
 # Channel table for Anhembi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3853
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3853
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Anhumas b/isdb-t/br-sp-Anhumas
index b9454f55..9e59582f 100644
--- a/isdb-t/br-sp-Anhumas
+++ b/isdb-t/br-sp-Anhumas
@@ -1,5 +1,5 @@
 # Channel table for Anhumas - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3687
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3687
 
 # Physical channel 19 (virtual 10.1)
 [Band Paulista]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 26.1)
-[Rede Vida]
+# Physical channel 26 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
diff --git a/isdb-t/br-sp-Aparecida b/isdb-t/br-sp-Aparecida
index 7f74b20b..0c4aac5e 100644
--- a/isdb-t/br-sp-Aparecida
+++ b/isdb-t/br-sp-Aparecida
@@ -1,5 +1,5 @@
 # Channel table for Aparecida - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/366
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=366
 
 # Physical channel 21 (virtual 22.1)
 [Band Vale]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 9.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 8.1)
+# Physical channel 42 (virtual 42.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-AparecidaD'Oeste b/isdb-t/br-sp-AparecidaD'Oeste
index a7a127d5..6b2b528e 100644
--- a/isdb-t/br-sp-AparecidaD'Oeste
+++ b/isdb-t/br-sp-AparecidaD'Oeste
@@ -1,5 +1,5 @@
-# Channel table for Aparecida D´ Oeste - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3260
+# Channel table for Aparecida D� Oeste - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3260
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Apiai b/isdb-t/br-sp-Apiai
index 8b6b2af5..c7b114a4 100644
--- a/isdb-t/br-sp-Apiai
+++ b/isdb-t/br-sp-Apiai
@@ -1,5 +1,5 @@
-# Channel table for Apiaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/448
+# Channel table for Apia� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=448
 
 # Physical channel 19 (virtual 18.1)
 [TV Tribuna]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 16.1)
-[Rede Vida]
+# Physical channel 20 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -88,3 +88,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 48.1)
+[Canal Futura]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 50.1)
+[TV Cidadania]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Aracariguama b/isdb-t/br-sp-Aracariguama
index 25ada40b..4fdc8142 100644
--- a/isdb-t/br-sp-Aracariguama
+++ b/isdb-t/br-sp-Aracariguama
@@ -1,5 +1,5 @@
-# Channel table for Araçariguama - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/878
+# Channel table for Ara�ariguama - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=878
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Sorocaba]
diff --git a/isdb-t/br-sp-Aracatuba b/isdb-t/br-sp-Aracatuba
index 7b94e49e..0dc9fec8 100644
--- a/isdb-t/br-sp-Aracatuba
+++ b/isdb-t/br-sp-Aracatuba
@@ -1,11 +1,11 @@
-# Channel table for Araçatuba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/244
+# Channel table for Ara�atuba - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=244
 
-# Physical channel 20 (virtual 28.1)
-[RBI TV]
+# Physical channel 14 (virtual 49.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 473142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 57.1)
-[Ideal TV]
+# Physical channel 17 (virtual 47.1)
+[TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 491142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 9.1)
-[Band Paulista]
+# Physical channel 20 (virtual 28.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 26.1)
-[TV Tem Rio Preto]
+# Physical channel 22 (virtual 57.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 25.1)
-[CNT]
+# Physical channel 24 (virtual 9.1)
+[Band Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 26 (virtual 26.1)
+[TV Tem Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 29 (virtual 25.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 7.1)
-[SBT Interior/SP]
+# Physical channel 30 (virtual 4.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.2)
-[TV Mundo Maior/TV CEI]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 55.1)
-[RIT]
+# Physical channel 34 (virtual 7.2)
+[SBT Interior/SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 13.1)
-[Record TV Rio Preto]
+# Physical channel 36 (virtual 36.2)
+[TV Mundo Maior/TV CEI]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 47.1)
-[TV Gazeta]
+# Physical channel 40 (virtual 55.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 49.1)
-[TV Canção Nova]
+# Physical channel 42 (virtual 13.1)
+[Record TV Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 689142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-AracoiabaDaSerra b/isdb-t/br-sp-AracoiabaDaSerra
index f9ecf34c..457de81f 100644
--- a/isdb-t/br-sp-AracoiabaDaSerra
+++ b/isdb-t/br-sp-AracoiabaDaSerra
@@ -1,5 +1,5 @@
-# Channel table for Araçoiaba Da Serra - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3655
+# Channel table for Ara�oiaba Da Serra - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3655
 
 # Physical channel 17 (virtual 57.1)
 [TV Gazeta]
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.3)
-[Rede ALESP, TV Câmara, TV Câmara Municipal Sorocaba]
+# Physical channel 31 (virtual 31.5)
+[Rede ALESP, TV Câmara, TV Câmara Municipal Sorocaba, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.2)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 14.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -320,37 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 20.1)
-[Top TV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 48 (virtual 49.1)
-[Rede TV!]
+# Physical channel 48 (virtual 49.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-sp-Aramina b/isdb-t/br-sp-Aramina
index 59be18e6..ca7ee2fd 100644
--- a/isdb-t/br-sp-Aramina
+++ b/isdb-t/br-sp-Aramina
@@ -1,8 +1,8 @@
 # Channel table for Aramina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2735
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2735
 
-# Physical channel 21 (virtual 53.1)
-[Rede Vida]
+# Physical channel 21 (virtual 53.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Arandu b/isdb-t/br-sp-Arandu
index 9de86661..f50be0de 100644
--- a/isdb-t/br-sp-Arandu
+++ b/isdb-t/br-sp-Arandu
@@ -1,8 +1,8 @@
 # Channel table for Arandu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3457
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3457
 
-# Physical channel 20 (virtual 45.1)
-[Rede Vida]
+# Physical channel 20 (virtual 45.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
diff --git a/isdb-t/br-sp-Arapei b/isdb-t/br-sp-Arapei
index d0a8ca94..1ad0b4b5 100644
--- a/isdb-t/br-sp-Arapei
+++ b/isdb-t/br-sp-Arapei
@@ -1,5 +1,5 @@
-# Channel table for Arapeí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4025
+# Channel table for Arape� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4025
 
 # Physical channel 22 (virtual 22.1)
 [Band Vale]
diff --git a/isdb-t/br-sp-Araraquara b/isdb-t/br-sp-Araraquara
index d145f46c..56511991 100644
--- a/isdb-t/br-sp-Araraquara
+++ b/isdb-t/br-sp-Araraquara
@@ -1,5 +1,5 @@
 # Channel table for Araraquara - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/7
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=7
 
 # Physical channel 15 (virtual 15.1)
 [TV Rio Verde]
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 7.1)
-[TV Cultura Paulista]
+# Physical channel 20 (virtual 8.1)
+[TV Morada do Sol]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 20.2)
-[TV Morada do Sol]
+# Physical channel 24 (virtual 24.1)
+[SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 12.1)
-[SBT Central]
+# Physical channel 27 (virtual 34.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 34.1)
-[TV Canção Nova]
+# Physical channel 28 (virtual 13.1)
+[Record TV Interior SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 13.1)
-[Record TV Interior SP]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 11.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 38.1)
-[TV Aparecida]
+# Physical channel 36 (virtual 7.3)
+[TV Cultura Paulista, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 6.1)
-[EPTV Central]
+# Physical channel 38 (virtual 38.1)
+[TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -378,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 57.1)
-[RIT]
+# Physical channel 42 (virtual 6.1)
+[EPTV Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -407,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 40.1)
-[Rede TV!]
+# Physical channel 43 (virtual 57.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -436,11 +436,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 50.1)
-[Rede Vida]
+# Physical channel 48 (virtual 40.1)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 695142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Araras b/isdb-t/br-sp-Araras
index 4e7c25eb..8d4e9ad6 100644
--- a/isdb-t/br-sp-Araras
+++ b/isdb-t/br-sp-Araras
@@ -1,11 +1,11 @@
 # Channel table for Araras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/287
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=287
 
-# Physical channel 16 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -233,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 5.1)
+# Physical channel 39 (virtual 39.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 27.1)
-[TVB]
+# Physical channel 46 (virtual 28.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-ArcoIris b/isdb-t/br-sp-Arcoiris
index e69bdf63..8cb024d2 100644
--- a/isdb-t/br-sp-ArcoIris
+++ b/isdb-t/br-sp-Arcoiris
@@ -1,5 +1,5 @@
-# Channel table for Arco Íris - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3924
+# Channel table for Arco �ris - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3924
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Arealva b/isdb-t/br-sp-Arealva
index 60461075..4ffcfa92 100644
--- a/isdb-t/br-sp-Arealva
+++ b/isdb-t/br-sp-Arealva
@@ -1,5 +1,5 @@
 # Channel table for Arealva - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1508
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1508
 
 # Physical channel 14 (virtual 15.1)
 [RBI TV]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 22.1)
-[Rede Vida]
+# Physical channel 20 (virtual 22.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 5.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Areias b/isdb-t/br-sp-Areias
index a7283288..6d93bd4f 100644
--- a/isdb-t/br-sp-Areias
+++ b/isdb-t/br-sp-Areias
@@ -1,5 +1,5 @@
 # Channel table for Areias - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2884
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2884
 
 # Physical channel 22 (virtual 9.1)
 [Band Vale]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 55.1)
-[Rede Vida]
+# Physical channel 34 (virtual 55.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Areiopolis b/isdb-t/br-sp-Areiopolis
index 8ede394f..3cfd9776 100644
--- a/isdb-t/br-sp-Areiopolis
+++ b/isdb-t/br-sp-Areiopolis
@@ -1,5 +1,5 @@
-# Channel table for Areiópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3491
+# Channel table for Arei�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3491
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Ariranha b/isdb-t/br-sp-Ariranha
index d8a43e43..1d20ab1c 100644
--- a/isdb-t/br-sp-Ariranha
+++ b/isdb-t/br-sp-Ariranha
@@ -1,5 +1,5 @@
 # Channel table for Ariranha - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3810
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3810
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-ArturNogueira b/isdb-t/br-sp-ArturNogueira
index 750d7e9e..164591ce 100644
--- a/isdb-t/br-sp-ArturNogueira
+++ b/isdb-t/br-sp-ArturNogueira
@@ -1,5 +1,5 @@
 # Channel table for Artur Nogueira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3656
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3656
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -30,11 +30,69 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 9.1)
-[TV Vale Verde]
+# Physical channel 25 (virtual 12.1)
+[EPTV Campinas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 56.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 6.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 497142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +146,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 19.1)
-[TV Canção Nova]
+# Physical channel 31 (virtual 31.1)
+[Rede Brasil de Televisão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -118,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -146,11 +233,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 12.1)
-[EPTV Campinas]
+# Physical channel 46 (virtual 2.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 50.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 695142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Aruja b/isdb-t/br-sp-Aruja
index baf2f262..201e3a50 100644
--- a/isdb-t/br-sp-Aruja
+++ b/isdb-t/br-sp-Aruja
@@ -1,5 +1,5 @@
-# Channel table for Arujá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3516
+# Channel table for Aruj� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3516
 
 # Physical channel 19 (virtual 19.1)
 [TV Diário]
diff --git a/isdb-t/br-sp-Aspasia b/isdb-t/br-sp-Aspasia
index 01ffd897..ea69ce0b 100644
--- a/isdb-t/br-sp-Aspasia
+++ b/isdb-t/br-sp-Aspasia
@@ -1,5 +1,5 @@
-# Channel table for Aspásia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4002
+# Channel table for Asp�sia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4002
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 31.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-Assis b/isdb-t/br-sp-Assis
index fec2284b..1d024db9 100644
--- a/isdb-t/br-sp-Assis
+++ b/isdb-t/br-sp-Assis
@@ -1,5 +1,5 @@
 # Channel table for Assis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/38
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=38
 
 # Physical channel 14 (virtual 41.1)
 [RBI TV]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 23.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 12.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 29.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.4)
-[TV Câmara, Rede ALESP, TV Câmara Municipal Assis, TV Senado]
+# Physical channel 31 (virtual 31.5)
+[TV Câmara, Rede ALESP, TV Câmara Municipal Assis, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Atibaia b/isdb-t/br-sp-Atibaia
index 50c5cc16..a5775d16 100644
--- a/isdb-t/br-sp-Atibaia
+++ b/isdb-t/br-sp-Atibaia
@@ -1,5 +1,5 @@
 # Channel table for Atibaia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/77
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=77
 
 # Physical channel 17 (virtual 17.1)
 [TV Vanguarda São José]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 27.1)
-[Rede Vida]
+# Physical channel 19 (virtual 19.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 4.1)
+# Physical channel 21 (virtual 21.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
diff --git a/isdb-t/br-sp-Auriflama b/isdb-t/br-sp-Auriflama
index 765e06f4..1fcd7989 100644
--- a/isdb-t/br-sp-Auriflama
+++ b/isdb-t/br-sp-Auriflama
@@ -1,5 +1,5 @@
 # Channel table for Auriflama - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2129
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2129
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Avai b/isdb-t/br-sp-Avai
index d37024a2..169859b1 100644
--- a/isdb-t/br-sp-Avai
+++ b/isdb-t/br-sp-Avai
@@ -1,5 +1,5 @@
-# Channel table for Avaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3681
+# Channel table for Ava� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3681
 
 # Physical channel 20 (virtual 21.1)
 [Rede Vida]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 13.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Avanhandava b/isdb-t/br-sp-Avanhandava
index 610c8cb1..3c85f5cc 100644
--- a/isdb-t/br-sp-Avanhandava
+++ b/isdb-t/br-sp-Avanhandava
@@ -1,5 +1,5 @@
 # Channel table for Avanhandava - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3925
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3925
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Avare b/isdb-t/br-sp-Avare
index 6d169b45..545277b6 100644
--- a/isdb-t/br-sp-Avare
+++ b/isdb-t/br-sp-Avare
@@ -1,5 +1,5 @@
-# Channel table for Avaré - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1768
+# Channel table for Avar� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1768
 
 # Physical channel 18 (virtual 9.1)
 [Band Paulista]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 13.1)
-[Rede Vida]
+# Physical channel 20 (virtual 13.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 46.1)
-[RIT]
+# Physical channel 29 (virtual 29.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 51.1)
-[Rede TV!]
+# Physical channel 30 (virtual 3.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 46.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 54 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 49 (virtual 51.1)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 713142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-BadyBassitt b/isdb-t/br-sp-BadyBassitt
index fef34ba3..7cc2141d 100644
--- a/isdb-t/br-sp-BadyBassitt
+++ b/isdb-t/br-sp-BadyBassitt
@@ -1,8 +1,8 @@
 # Channel table for Bady Bassitt - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3701
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3701
 
 # Physical channel 22 (virtual 15.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV Câmara São José do Rio Preto, Rede ALESP, TV Senado]
+# Physical channel 28 (virtual 28.5)
+[TV Câmara, TV Câmara São José do Rio Preto, Rede ALESP, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 11.1)
-[Rede Vida]
+# Physical channel 32 (virtual 11.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -175,35 +175,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 42 (virtual 7.1)
 [Record TV Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Balbinos b/isdb-t/br-sp-Balbinos
index 2c726579..4c671a4e 100644
--- a/isdb-t/br-sp-Balbinos
+++ b/isdb-t/br-sp-Balbinos
@@ -1,5 +1,5 @@
 # Channel table for Balbinos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3926
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3926
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Balsamo b/isdb-t/br-sp-Balsamo
index 3ef63f18..6920a7c8 100644
--- a/isdb-t/br-sp-Balsamo
+++ b/isdb-t/br-sp-Balsamo
@@ -1,5 +1,5 @@
-# Channel table for Bálsamo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3702
+# Channel table for B�lsamo - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3702
 
 # Physical channel 24 (virtual 5.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Bananal b/isdb-t/br-sp-Bananal
index 21e48fb5..7522f597 100644
--- a/isdb-t/br-sp-Bananal
+++ b/isdb-t/br-sp-Bananal
@@ -1,5 +1,5 @@
 # Channel table for Bananal - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2885
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2885
 
 # Physical channel 17 (virtual 4.1)
 [TV Vanguarda Taubaté]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-BaraoDeAntonina b/isdb-t/br-sp-BaraoDeAntonina
index c3d5375c..18f83304 100644
--- a/isdb-t/br-sp-BaraoDeAntonina
+++ b/isdb-t/br-sp-BaraoDeAntonina
@@ -1,5 +1,5 @@
-# Channel table for Barão De Antonina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3311
+# Channel table for Bar�o De Antonina - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3311
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Barbosa b/isdb-t/br-sp-Barbosa
index 4741343b..9c8efcea 100644
--- a/isdb-t/br-sp-Barbosa
+++ b/isdb-t/br-sp-Barbosa
@@ -1,5 +1,5 @@
 # Channel table for Barbosa - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3390
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3390
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Bariri b/isdb-t/br-sp-Bariri
index faefd388..6901d8e7 100644
--- a/isdb-t/br-sp-Bariri
+++ b/isdb-t/br-sp-Bariri
@@ -1,5 +1,5 @@
 # Channel table for Bariri - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1422
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1422
 
 # Physical channel 18 (virtual 27.1)
 [Band Paulista]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 41.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-BarraBonita b/isdb-t/br-sp-BarraBonita
index 7e9ad241..59f6b00a 100644
--- a/isdb-t/br-sp-BarraBonita
+++ b/isdb-t/br-sp-BarraBonita
@@ -1,5 +1,5 @@
 # Channel table for Barra Bonita - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/50
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=50
 
 # Physical channel 17 (virtual 32.1)
 [Band Paulista]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 22 (virtual 22.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 4.1)
+# Physical channel 28 (virtual 28.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-BarraDoChapeu b/isdb-t/br-sp-BarraDoChapeu
index 71ab0dc5..e856276a 100644
--- a/isdb-t/br-sp-BarraDoChapeu
+++ b/isdb-t/br-sp-BarraDoChapeu
@@ -1,5 +1,5 @@
-# Channel table for Barra Do Chapéu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3462
+# Channel table for Barra Do Chap�u - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3462
 
 # Physical channel 17 (virtual 18.1)
 [TV Tribuna]
diff --git a/isdb-t/br-sp-BarraDoTurvo b/isdb-t/br-sp-BarraDoTurvo
index 288370a9..735b0cdf 100644
--- a/isdb-t/br-sp-BarraDoTurvo
+++ b/isdb-t/br-sp-BarraDoTurvo
@@ -1,8 +1,8 @@
 # Channel table for Barra Do Turvo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4028
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4028
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Barretos b/isdb-t/br-sp-Barretos
index 5b18caaf..965f94c4 100644
--- a/isdb-t/br-sp-Barretos
+++ b/isdb-t/br-sp-Barretos
@@ -1,5 +1,5 @@
 # Channel table for Barretos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/218
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=218
 
 # Physical channel 14 (virtual 14.1)
 [Record News]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 17.1)
+# Physical channel 18 (virtual 18.1)
 [TV Clube Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 6.1)
-[Rede Vida]
+# Physical channel 21 (virtual 6.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -262,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 8.1)
+# Physical channel 32 (virtual 32.1)
 [Vale TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 12.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-sp-Barrinha b/isdb-t/br-sp-Barrinha
index b5ca46d1..1aef7dcd 100644
--- a/isdb-t/br-sp-Barrinha
+++ b/isdb-t/br-sp-Barrinha
@@ -1,34 +1,5 @@
 # Channel table for Barrinha - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/867
-
-# Physical channel 16 (virtual 9.1)
-[TV Clube Ribeirão Preto]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=867
 
 # Physical channel 24 (virtual 5.1)
 [SBT Ribeirão Preto]
@@ -88,64 +59,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 40 (virtual 43.1)
-[Rede TV!]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 44 (virtual 50.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Barueri b/isdb-t/br-sp-Barueri
index a8a51a81..90781424 100644
--- a/isdb-t/br-sp-Barueri
+++ b/isdb-t/br-sp-Barueri
@@ -1,5 +1,5 @@
 # Channel table for Barueri - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3547
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3547
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -466,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -552,8 +552,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -582,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -611,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -639,7 +639,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -668,8 +668,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -900,6 +900,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -958,8 +987,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Bastos b/isdb-t/br-sp-Bastos
index e81f03d0..10ca1ff9 100644
--- a/isdb-t/br-sp-Bastos
+++ b/isdb-t/br-sp-Bastos
@@ -1,5 +1,5 @@
 # Channel table for Bastos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2881
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2881
 
 # Physical channel 18 (virtual 3.1)
 [Band Paulista]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-Batatais b/isdb-t/br-sp-Batatais
index 10903d8f..938f04f4 100644
--- a/isdb-t/br-sp-Batatais
+++ b/isdb-t/br-sp-Batatais
@@ -1,5 +1,5 @@
 # Channel table for Batatais - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/219
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=219
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 22.1)
-[Rede Vida]
+# Physical channel 35 (virtual 22.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
diff --git a/isdb-t/br-sp-Bauru b/isdb-t/br-sp-Bauru
index 51b9adbc..245088c5 100644
--- a/isdb-t/br-sp-Bauru
+++ b/isdb-t/br-sp-Bauru
@@ -1,5 +1,5 @@
 # Channel table for Bauru - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/39
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=39
 
 # Physical channel 14 (virtual 15.1)
 [RBI TV]
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 13.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 5.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.3)
-[TV Câmara, Rede ALESP, TV Câmara Municipal Bauru]
+# Physical channel 31 (virtual 31.5)
+[TV Câmara, Rede ALESP, TV Câmara Municipal Bauru, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 45.1)
-[TV Unesp]
+# Physical channel 46 (virtual 46.3)
+[TV Unesp, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-Bebedouro b/isdb-t/br-sp-Bebedouro
index 2f51aaff..ad7ee52c 100644
--- a/isdb-t/br-sp-Bebedouro
+++ b/isdb-t/br-sp-Bebedouro
@@ -1,5 +1,5 @@
 # Channel table for Bebedouro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/15
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=15
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -30,8 +30,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
-[Rede Vida]
+# Physical channel 17 (virtual 55.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 12.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -175,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 5.1)
+# Physical channel 39 (virtual 39.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -204,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.1)
+# Physical channel 40 (virtual 40.2)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-BentoDeAbreu b/isdb-t/br-sp-BentoDeAbreu
index 3fd52e4a..dcd097c7 100644
--- a/isdb-t/br-sp-BentoDeAbreu
+++ b/isdb-t/br-sp-BentoDeAbreu
@@ -1,5 +1,5 @@
 # Channel table for Bento De Abreu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3811
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3811
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-BernardinoDeCampos b/isdb-t/br-sp-BernardinoDeCampos
index cdbd5780..ea1f252b 100644
--- a/isdb-t/br-sp-BernardinoDeCampos
+++ b/isdb-t/br-sp-BernardinoDeCampos
@@ -1,5 +1,5 @@
 # Channel table for Bernardino De Campos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3492
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3492
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Bertioga b/isdb-t/br-sp-Bertioga
index bff66aab..f03c0740 100644
--- a/isdb-t/br-sp-Bertioga
+++ b/isdb-t/br-sp-Bertioga
@@ -1,5 +1,5 @@
 # Channel table for Bertioga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/148
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=148
 
 # Physical channel 15 (virtual 40.1)
 [Rede Vida]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[TV Costa Norte]
+# Physical channel 49 (virtual 48.3)
+[TV Cultura Litoral, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-sp-Bilac b/isdb-t/br-sp-Bilac
index a6d4f3b1..9a8a9e46 100644
--- a/isdb-t/br-sp-Bilac
+++ b/isdb-t/br-sp-Bilac
@@ -1,5 +1,5 @@
 # Channel table for Bilac - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3927
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3927
 
 # Physical channel 24 (virtual 9.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Birigui b/isdb-t/br-sp-Birigui
index d03e95f1..6ce8dc3a 100644
--- a/isdb-t/br-sp-Birigui
+++ b/isdb-t/br-sp-Birigui
@@ -1,5 +1,63 @@
 # Channel table for Birigui - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/862
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=862
+
+# Physical channel 17 (virtual 47.1)
+[TV Gazeta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 18.5)
+[TV Câmara, Rede ALESP, TV Câmara Municipal, TV Senado, Rádio Câmara]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 20 (virtual 28.1)
 [RBI TV]
@@ -31,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 57.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -88,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 3.1)
+# Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -176,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -291,35 +349,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 47.1)
-[TV Gazeta]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 48 (virtual 22.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Biritiba-mirim b/isdb-t/br-sp-Biritiba-mirim
index 2b0fc3e2..352dc056 100644
--- a/isdb-t/br-sp-Biritiba-mirim
+++ b/isdb-t/br-sp-Biritiba-mirim
@@ -1,5 +1,5 @@
 # Channel table for Biritiba-mirim - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3513
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3513
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
diff --git a/isdb-t/br-sp-BoaEsperancaDoSul b/isdb-t/br-sp-BoaEsperancaDoSul
index ec41a7ac..1f35c620 100644
--- a/isdb-t/br-sp-BoaEsperancaDoSul
+++ b/isdb-t/br-sp-BoaEsperancaDoSul
@@ -1,7 +1,7 @@
-# Channel table for Boa Esperança Do Sul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2736
+# Channel table for Boa Esperan�a Do Sul - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2736
 
-# Physical channel 23 (virtual 12.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Bocaina b/isdb-t/br-sp-Bocaina
index 430484af..f5bd6a19 100644
--- a/isdb-t/br-sp-Bocaina
+++ b/isdb-t/br-sp-Bocaina
@@ -1,5 +1,5 @@
 # Channel table for Bocaina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3747
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3747
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Bofete b/isdb-t/br-sp-Bofete
index 6be49886..67b82933 100644
--- a/isdb-t/br-sp-Bofete
+++ b/isdb-t/br-sp-Bofete
@@ -1,5 +1,5 @@
 # Channel table for Bofete - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3857
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3857
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Boituva b/isdb-t/br-sp-Boituva
index 51927a44..dc885089 100644
--- a/isdb-t/br-sp-Boituva
+++ b/isdb-t/br-sp-Boituva
@@ -1,5 +1,5 @@
 # Channel table for Boituva - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/925
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=925
 
 # Physical channel 17 (virtual 57.1)
 [TV Gazeta]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 14.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-BomJesusDosPerdoes b/isdb-t/br-sp-BomJesusDosPerdoes
new file mode 100644
index 00000000..bb31668c
--- /dev/null
+++ b/isdb-t/br-sp-BomJesusDosPerdoes
@@ -0,0 +1,32 @@
+# Channel table for Bom Jesus Dos Perd�es - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4040
+
+# Physical channel 47 (virtual 47.1)
+[TV Vanguarda São José]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-BomSucessoDeItarare b/isdb-t/br-sp-BomSucessoDeItarare
index 329773a3..e6bfdf5f 100644
--- a/isdb-t/br-sp-BomSucessoDeItarare
+++ b/isdb-t/br-sp-BomSucessoDeItarare
@@ -1,11 +1,11 @@
-# Channel table for Bom Sucesso De Itararé - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3388
+# Channel table for Bom Sucesso De Itarar� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3388
 
-# Physical channel 25 (virtual 25.1)
+# Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Bora b/isdb-t/br-sp-Bora
index 96c678af..eca3ae21 100644
--- a/isdb-t/br-sp-Bora
+++ b/isdb-t/br-sp-Bora
@@ -1,5 +1,5 @@
-# Channel table for Borá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3928
+# Channel table for Bor� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3928
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Boraceia b/isdb-t/br-sp-Boraceia
index 0f62f6f9..f0b1b326 100644
--- a/isdb-t/br-sp-Boraceia
+++ b/isdb-t/br-sp-Boraceia
@@ -1,5 +1,5 @@
-# Channel table for Boracéia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3929
+# Channel table for Borac�ia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3929
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Borborema b/isdb-t/br-sp-Borborema
index 8d4e1931..b65fdfae 100644
--- a/isdb-t/br-sp-Borborema
+++ b/isdb-t/br-sp-Borborema
@@ -1,5 +1,5 @@
 # Channel table for Borborema - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3083
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3083
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Bauru]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Borebi b/isdb-t/br-sp-Borebi
index 0bf1468e..099dcd68 100644
--- a/isdb-t/br-sp-Borebi
+++ b/isdb-t/br-sp-Borebi
@@ -1,5 +1,5 @@
 # Channel table for Borebi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3682
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3682
 
 # Physical channel 17 (virtual 10.1)
 [Band Paulista]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 13.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Botucatu b/isdb-t/br-sp-Botucatu
index ccbddcac..85c1e356 100644
--- a/isdb-t/br-sp-Botucatu
+++ b/isdb-t/br-sp-Botucatu
@@ -1,5 +1,5 @@
 # Channel table for Botucatu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/472
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=472
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 36.1)
-[Rede Vida]
+# Physical channel 21 (virtual 21.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
+# Physical channel 23 (virtual 12.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 61.4)
+# Physical channel 31 (virtual 31.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-BragancaPaulista b/isdb-t/br-sp-BragancaPaulista
index c569592a..7e77c3b5 100644
--- a/isdb-t/br-sp-BragancaPaulista
+++ b/isdb-t/br-sp-BragancaPaulista
@@ -1,5 +1,5 @@
-# Channel table for Bragança Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/852
+# Channel table for Bragan�a Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=852
 
 # Physical channel 17 (virtual 17.1)
 [TV Vanguarda São José]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 4.1)
-[Band Mais]
+# Physical channel 20 (virtual 6.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 21 (virtual 21.1)
+[Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 46.2)
-[Rede TV!]
+# Physical channel 24 (virtual 2.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 48.1)
-[SBT Vale]
+# Physical channel 29 (virtual 46.1)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 20.1)
-[Rede Vida]
+# Physical channel 32 (virtual 48.1)
+[SBT Vale]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 39.1)
-[TV Altiora]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 6.1)
-[TVB]
+# Physical channel 36 (virtual 39.1)
+[TV Altiora]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Brauna b/isdb-t/br-sp-Brauna
index 54edb00d..fb437bc9 100644
--- a/isdb-t/br-sp-Brauna
+++ b/isdb-t/br-sp-Brauna
@@ -1,5 +1,5 @@
-# Channel table for Braúna - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3383
+# Channel table for Bra�na - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3383
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-BrejoAlegre b/isdb-t/br-sp-BrejoAlegre
index 3ca62796..0438f19a 100644
--- a/isdb-t/br-sp-BrejoAlegre
+++ b/isdb-t/br-sp-BrejoAlegre
@@ -1,5 +1,5 @@
 # Channel table for Brejo Alegre - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3930
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3930
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Brodowski b/isdb-t/br-sp-Brodowski
index a8f2c0fa..d1e2b15d 100644
--- a/isdb-t/br-sp-Brodowski
+++ b/isdb-t/br-sp-Brodowski
@@ -1,5 +1,5 @@
 # Channel table for Brodowski - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/783
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=783
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,7 +146,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 14.1)
+# Physical channel 33 (virtual 2.1)
+[Rede Família]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 35.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 2.1)
-[Rede Família]
+# Physical channel 50 (virtual 10.1)
+[TV Nova Imagem]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 689142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Brotas b/isdb-t/br-sp-Brotas
index 92470286..0c97c578 100644
--- a/isdb-t/br-sp-Brotas
+++ b/isdb-t/br-sp-Brotas
@@ -1,5 +1,5 @@
 # Channel table for Brotas - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/854
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=854
 
 # Physical channel 18 (virtual 18.1)
 [TV Clube Ribeirão Preto]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-Buri b/isdb-t/br-sp-Buri
index dae81129..26896cfb 100644
--- a/isdb-t/br-sp-Buri
+++ b/isdb-t/br-sp-Buri
@@ -1,5 +1,5 @@
 # Channel table for Buri - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3918
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3918
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Buritama b/isdb-t/br-sp-Buritama
index 6f6dc99a..ffe0f3b2 100644
--- a/isdb-t/br-sp-Buritama
+++ b/isdb-t/br-sp-Buritama
@@ -1,5 +1,5 @@
 # Channel table for Buritama - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3497
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3497
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Buritizal b/isdb-t/br-sp-Buritizal
index 94b05d52..dfb9ed8c 100644
--- a/isdb-t/br-sp-Buritizal
+++ b/isdb-t/br-sp-Buritizal
@@ -1,8 +1,8 @@
 # Channel table for Buritizal - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2940
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2940
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-CabraliaPaulista b/isdb-t/br-sp-CabraliaPaulista
index b8276700..9f174037 100644
--- a/isdb-t/br-sp-CabraliaPaulista
+++ b/isdb-t/br-sp-CabraliaPaulista
@@ -1,5 +1,5 @@
-# Channel table for Cabrália Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3931
+# Channel table for Cabr�lia Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3931
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Cacapava b/isdb-t/br-sp-Cacapava
index a6290b28..0ebf3a2b 100644
--- a/isdb-t/br-sp-Cacapava
+++ b/isdb-t/br-sp-Cacapava
@@ -1,7 +1,7 @@
-# Channel table for Caçapava - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3650
+# Channel table for Ca�apava - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3650
 
-# Physical channel 14 (virtual 25.1)
+# Physical channel 14 (virtual 14.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -349,37 +349,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 38.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-CachoeiraPaulista b/isdb-t/br-sp-CachoeiraPaulista
index e5c6e221..1ec01121 100644
--- a/isdb-t/br-sp-CachoeiraPaulista
+++ b/isdb-t/br-sp-CachoeiraPaulista
@@ -1,5 +1,5 @@
 # Channel table for Cachoeira Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/368
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=368
 
 # Physical channel 28 (virtual 3.1)
 [TV Vanguarda Taubaté]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 8.1)
+# Physical channel 42 (virtual 42.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede Vida]
+# Physical channel 49 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-sp-Caconde b/isdb-t/br-sp-Caconde
index 4a49b638..25c20174 100644
--- a/isdb-t/br-sp-Caconde
+++ b/isdb-t/br-sp-Caconde
@@ -1,5 +1,5 @@
 # Channel table for Caconde - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2738
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2738
 
 # Physical channel 26 (virtual 6.1)
 [EPTV Central]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Cafelandia b/isdb-t/br-sp-Cafelandia
index a5714bcb..340c9c12 100644
--- a/isdb-t/br-sp-Cafelandia
+++ b/isdb-t/br-sp-Cafelandia
@@ -1,5 +1,5 @@
-# Channel table for Cafelândia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/57
+# Channel table for Cafel�ndia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=57
 
 # Physical channel 16 (virtual 15.1)
 [Rede Vida]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 8.1)
+# Physical channel 23 (virtual 12.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 47.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Caiabu b/isdb-t/br-sp-Caiabu
index 83904468..7bfcc2ff 100644
--- a/isdb-t/br-sp-Caiabu
+++ b/isdb-t/br-sp-Caiabu
@@ -1,5 +1,5 @@
 # Channel table for Caiabu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3688
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3688
 
 # Physical channel 19 (virtual 10.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Caieiras b/isdb-t/br-sp-Caieiras
index b65a0ded..78267c9b 100644
--- a/isdb-t/br-sp-Caieiras
+++ b/isdb-t/br-sp-Caieiras
@@ -1,5 +1,5 @@
 # Channel table for Caieiras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3667
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3667
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -88,8 +88,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 17 (virtual 11.1)
+[TV Gazeta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -291,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -321,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -378,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -407,7 +436,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Caiua b/isdb-t/br-sp-Caiua
index da74b83c..5d01ef0d 100644
--- a/isdb-t/br-sp-Caiua
+++ b/isdb-t/br-sp-Caiua
@@ -1,5 +1,5 @@
-# Channel table for Caiuá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3783
+# Channel table for Caiu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3783
 
 # Physical channel 16 (virtual 17.1)
 [Rede Vida]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 39 (virtual 22.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-Cajamar b/isdb-t/br-sp-Cajamar
index 1a8f16da..33289424 100644
--- a/isdb-t/br-sp-Cajamar
+++ b/isdb-t/br-sp-Cajamar
@@ -1,8 +1,37 @@
 # Channel table for Cajamar - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/943
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=943
+
+# Physical channel 17 (virtual 11.1)
+[TV Gazeta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -147,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -233,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -349,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-sp-Cajati b/isdb-t/br-sp-Cajati
index 98375474..1ed768df 100644
--- a/isdb-t/br-sp-Cajati
+++ b/isdb-t/br-sp-Cajati
@@ -1,5 +1,5 @@
 # Channel table for Cajati - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/449
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=449
 
 # Physical channel 19 (virtual 18.1)
 [TV Tribuna]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Cajobi b/isdb-t/br-sp-Cajobi
index 4ecd628d..955e3e35 100644
--- a/isdb-t/br-sp-Cajobi
+++ b/isdb-t/br-sp-Cajobi
@@ -1,5 +1,5 @@
 # Channel table for Cajobi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2987
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2987
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Cajuru b/isdb-t/br-sp-Cajuru
index 45730620..e8f36d56 100644
--- a/isdb-t/br-sp-Cajuru
+++ b/isdb-t/br-sp-Cajuru
@@ -1,5 +1,5 @@
 # Channel table for Cajuru - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2739
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2739
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 5.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,3 +146,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 44.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-CampinaDoMonteAlegre b/isdb-t/br-sp-CampinaDoMonteAlegre
index 96415557..c4bbebb9 100644
--- a/isdb-t/br-sp-CampinaDoMonteAlegre
+++ b/isdb-t/br-sp-CampinaDoMonteAlegre
@@ -1,5 +1,5 @@
 # Channel table for Campina Do Monte Alegre - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3715
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3715
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Campinas b/isdb-t/br-sp-Campinas
index b97a0152..f11dde26 100644
--- a/isdb-t/br-sp-Campinas
+++ b/isdb-t/br-sp-Campinas
@@ -1,5 +1,5 @@
 # Channel table for Campinas - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/9
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=9
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 55.1)
-[NGT]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 24 (virtual 52.1)
+[CNT Americana]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 52.1)
-[CNT Americana]
+# Physical channel 25 (virtual 12.1)
+[EPTV Campinas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 12.1)
-[EPTV Campinas]
+# Physical channel 27 (virtual 56.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 56.1)
-[TV Canção Nova]
+# Physical channel 28 (virtual 6.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 6.1)
-[TVB]
+# Physical channel 29 (virtual 26.1)
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 26.1)
-[TV Eldorado]
+# Physical channel 30 (virtual 30.1)
+[VTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 30.1)
-[VTV]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 33 (virtual 34.1)
+[TV Cachoeira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 34.1)
-[TV Cachoeira]
+# Physical channel 38 (virtual 10.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -378,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 39 (virtual 11.5)
+[TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -407,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
-[TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
+# Physical channel 41 (virtual 9.1)
+[TV 41]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -523,7 +523,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
+# Physical channel 48 (virtual 48.2)
+[Universo EADTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 49 (virtual 48.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -553,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-CampoLimpoPaulista b/isdb-t/br-sp-CampoLimpoPaulista
index 25f5d717..86bfb1fc 100644
--- a/isdb-t/br-sp-CampoLimpoPaulista
+++ b/isdb-t/br-sp-CampoLimpoPaulista
@@ -1,5 +1,5 @@
 # Channel table for Campo Limpo Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/13
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=13
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 33.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 34.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
@@ -262,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 43 (virtual 42.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
@@ -320,8 +378,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 12.4)
+[TV Câmara, TV Câmara Municipal Jundiaí, Rede ALESP, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 46 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -349,7 +436,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
+# Physical channel 48 (virtual 15.1)
 [TV Rede Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-CamposDoJordao b/isdb-t/br-sp-CamposDoJordao
index fcddc1e3..88bff742 100644
--- a/isdb-t/br-sp-CamposDoJordao
+++ b/isdb-t/br-sp-CamposDoJordao
@@ -1,5 +1,5 @@
-# Channel table for Campos Do Jordão - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/403
+# Channel table for Campos Do Jord�o - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=403
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 8.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -262,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 50.1)
+# Physical channel 43 (virtual 43.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Cananeia b/isdb-t/br-sp-Cananeia
index 3c70ab61..aa2175ab 100644
--- a/isdb-t/br-sp-Cananeia
+++ b/isdb-t/br-sp-Cananeia
@@ -1,5 +1,5 @@
-# Channel table for Cananéia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/440
+# Channel table for Canan�ia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=440
 
 # Physical channel 15 (virtual 20.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
+# Physical channel 33 (virtual 33.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Canas b/isdb-t/br-sp-Canas
index 17d3e650..093cba02 100644
--- a/isdb-t/br-sp-Canas
+++ b/isdb-t/br-sp-Canas
@@ -1,5 +1,5 @@
 # Channel table for Canas - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3651
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3651
 
 # Physical channel 22 (virtual 54.1)
 [Band Vale]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 8.1)
+# Physical channel 42 (virtual 42.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-CandidoMota b/isdb-t/br-sp-CandidoMota
index 274473c3..de68b8fb 100644
--- a/isdb-t/br-sp-CandidoMota
+++ b/isdb-t/br-sp-CandidoMota
@@ -1,5 +1,5 @@
-# Channel table for Cândido Mota - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3428
+# Channel table for C�ndido Mota - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3428
 
 # Physical channel 14 (virtual 41.1)
 [RBI TV]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 23.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 12.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 29.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.4)
-[TV Câmara, Rede ALESP, TV Câmara Municipal Assis, TV Senado]
+# Physical channel 31 (virtual 31.5)
+[TV Câmara, Rede ALESP, TV Câmara Municipal Assis, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Canitar b/isdb-t/br-sp-Canitar
index 493c52f0..7caa420c 100644
--- a/isdb-t/br-sp-Canitar
+++ b/isdb-t/br-sp-Canitar
@@ -1,5 +1,5 @@
 # Channel table for Canitar - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3932
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3932
 
 # Physical channel 16 (virtual 25.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-CapaoBonito b/isdb-t/br-sp-CapaoBonito
index 5c6b62ea..db5a8467 100644
--- a/isdb-t/br-sp-CapaoBonito
+++ b/isdb-t/br-sp-CapaoBonito
@@ -1,5 +1,5 @@
-# Channel table for Capão Bonito - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/459
+# Channel table for Cap�o Bonito - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=459
 
 # Physical channel 17 (virtual 17.1)
 [Band]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 22 (virtual 22.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
 	DELIVERY_SYSTEM = ISDBT
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -88,7 +117,65 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 44.1)
+# Physical channel 32 (virtual 32.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 35 (virtual 35.1)
+[TV Sorocaba]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-CapelaDoAlto b/isdb-t/br-sp-CapelaDoAlto
index ed105394..6af6be2e 100644
--- a/isdb-t/br-sp-CapelaDoAlto
+++ b/isdb-t/br-sp-CapelaDoAlto
@@ -1,5 +1,5 @@
 # Channel table for Capela Do Alto - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3658
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3658
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Sorocaba]
diff --git a/isdb-t/br-sp-Capivari b/isdb-t/br-sp-Capivari
index 4d5adc36..2557418a 100644
--- a/isdb-t/br-sp-Capivari
+++ b/isdb-t/br-sp-Capivari
@@ -1,7 +1,7 @@
 # Channel table for Capivari - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1735
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1735
 
-# Physical channel 15 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 28 (virtual 6.1)
+[TV Thathi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 30.1)
 [VTV]
 	DELIVERY_SYSTEM = ISDBT
@@ -59,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 31.1)
-[Rede Vida]
+# Physical channel 32 (virtual 31.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-Caraguatatuba b/isdb-t/br-sp-Caraguatatuba
index 64eeb448..5cb72234 100644
--- a/isdb-t/br-sp-Caraguatatuba
+++ b/isdb-t/br-sp-Caraguatatuba
@@ -1,5 +1,5 @@
 # Channel table for Caraguatatuba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/162
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=162
 
 # Physical channel 15 (virtual 16.1)
 [Rede Vida]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 20 (virtual 57.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Band Vale]
+# Physical channel 21 (virtual 3.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 29.1)
-[VTV]
+# Physical channel 25 (virtual 26.1)
+[Band Vale]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 32.1)
-[TV Gazeta]
+# Physical channel 29 (virtual 29.1)
+[VTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 575142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
-[Record TV Litoral]
+# Physical channel 31 (virtual 32.1)
+[TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 575142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.2)
-[Rede TV!]
+# Physical channel 33 (virtual 33.1)
+[Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 57 (virtual 57.1)
-[TV Canção Nova]
+# Physical channel 47 (virtual 47.2)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 731142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Carapicuiba b/isdb-t/br-sp-Carapicuiba
index f24781af..7be326da 100644
--- a/isdb-t/br-sp-Carapicuiba
+++ b/isdb-t/br-sp-Carapicuiba
@@ -1,8 +1,8 @@
 # Channel table for Carapicuiba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/216
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=216
 
 # Physical channel 10 (virtual 50.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 195142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -553,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -610,8 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -640,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -669,7 +669,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -697,7 +697,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -726,8 +726,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -958,6 +958,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -1016,8 +1045,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Cardoso b/isdb-t/br-sp-Cardoso
index cd165b80..aea83d49 100644
--- a/isdb-t/br-sp-Cardoso
+++ b/isdb-t/br-sp-Cardoso
@@ -1,5 +1,5 @@
 # Channel table for Cardoso - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2948
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2948
 
 # Physical channel 24 (virtual 21.1)
 [Band Paulista]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-CasaBranca b/isdb-t/br-sp-CasaBranca
index 71e765c7..924cc65c 100644
--- a/isdb-t/br-sp-CasaBranca
+++ b/isdb-t/br-sp-CasaBranca
@@ -1,11 +1,11 @@
 # Channel table for Casa Branca - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2737
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2737
 
-# Physical channel 18 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 497142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 40.1)
-[Rede Vida]
+# Physical channel 50 (virtual 40.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-CassiaDosCoqueiros b/isdb-t/br-sp-CassiaDosCoqueiros
index c9e46c6e..f1172096 100644
--- a/isdb-t/br-sp-CassiaDosCoqueiros
+++ b/isdb-t/br-sp-CassiaDosCoqueiros
@@ -1,5 +1,5 @@
-# Channel table for Cássia Dos Coqueiros - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2740
+# Channel table for C�ssia Dos Coqueiros - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2740
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 5.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Castilho b/isdb-t/br-sp-Castilho
index 048e9ba7..9da05b95 100644
--- a/isdb-t/br-sp-Castilho
+++ b/isdb-t/br-sp-Castilho
@@ -1,5 +1,5 @@
 # Channel table for Castilho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3498
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3498
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Catanduva b/isdb-t/br-sp-Catanduva
index d62c57f8..dc6c2e7f 100644
--- a/isdb-t/br-sp-Catanduva
+++ b/isdb-t/br-sp-Catanduva
@@ -1,5 +1,5 @@
 # Channel table for Catanduva - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/133
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=133
 
 # Physical channel 14 (virtual 27.1)
 [Nova TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -262,3 +262,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 14.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Catigua b/isdb-t/br-sp-Catigua
index d4db9489..aab206d2 100644
--- a/isdb-t/br-sp-Catigua
+++ b/isdb-t/br-sp-Catigua
@@ -1,5 +1,5 @@
-# Channel table for Catiguá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3721
+# Channel table for Catigu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3721
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Cedral b/isdb-t/br-sp-Cedral
index fdab3d6d..d70b224d 100644
--- a/isdb-t/br-sp-Cedral
+++ b/isdb-t/br-sp-Cedral
@@ -1,8 +1,8 @@
 # Channel table for Cedral - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3703
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3703
 
 # Physical channel 22 (virtual 15.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV Câmara São José do Rio Preto, Rede ALESP, TV Senado]
+# Physical channel 28 (virtual 28.5)
+[TV Câmara, TV Câmara São José do Rio Preto, Rede ALESP, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 11.1)
-[Rede Vida]
+# Physical channel 32 (virtual 11.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -204,35 +204,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 40 (virtual 19.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-CerqueiraCesar b/isdb-t/br-sp-CerqueiraCesar
index 997aff4e..8e6ae877 100644
--- a/isdb-t/br-sp-CerqueiraCesar
+++ b/isdb-t/br-sp-CerqueiraCesar
@@ -1,5 +1,5 @@
-# Channel table for Cerqueira César - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2941
+# Channel table for Cerqueira C�sar - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2941
 
 # Physical channel 17 (virtual 40.1)
 [Band Paulista]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 12.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Cerquilho b/isdb-t/br-sp-Cerquilho
index b2a3ef12..8324992d 100644
--- a/isdb-t/br-sp-Cerquilho
+++ b/isdb-t/br-sp-Cerquilho
@@ -1,5 +1,5 @@
 # Channel table for Cerquilho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/886
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=886
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
diff --git a/isdb-t/br-sp-CesarioLange b/isdb-t/br-sp-CesarioLange
index a5091e56..e2334fb3 100644
--- a/isdb-t/br-sp-CesarioLange
+++ b/isdb-t/br-sp-CesarioLange
@@ -1,5 +1,5 @@
-# Channel table for Cesário Lange - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4
+# Channel table for Ces�rio Lange - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4
 
 # Physical channel 22 (virtual 22.1)
 [TV Canção Nova]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 46.1)
-[Rede Vida]
+# Physical channel 29 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-sp-Charqueada b/isdb-t/br-sp-Charqueada
index 1102bb53..6a1344a8 100644
--- a/isdb-t/br-sp-Charqueada
+++ b/isdb-t/br-sp-Charqueada
@@ -1,5 +1,5 @@
 # Channel table for Charqueada - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3659
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3659
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
diff --git a/isdb-t/br-sp-Chavantes b/isdb-t/br-sp-Chavantes
index 3858e9b2..7f6a589e 100644
--- a/isdb-t/br-sp-Chavantes
+++ b/isdb-t/br-sp-Chavantes
@@ -1,5 +1,5 @@
 # Channel table for Chavantes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3884
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3884
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 32.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Clementina b/isdb-t/br-sp-Clementina
index 02619f77..cadd419b 100644
--- a/isdb-t/br-sp-Clementina
+++ b/isdb-t/br-sp-Clementina
@@ -1,5 +1,5 @@
 # Channel table for Clementina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3992
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3992
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Colina b/isdb-t/br-sp-Colina
index 3de41ad9..e402594a 100644
--- a/isdb-t/br-sp-Colina
+++ b/isdb-t/br-sp-Colina
@@ -1,5 +1,5 @@
 # Channel table for Colina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2690
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2690
 
 # Physical channel 14 (virtual 14.1)
 [Record News]
@@ -30,7 +30,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 17.1)
+# Physical channel 17 (virtual 16.1)
+[TV Evangelizar]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 18.1)
 [TV Clube Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 57.1)
+[TV Gazeta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 21 (virtual 6.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
@@ -205,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 12.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -262,6 +320,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 45.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 45 (virtual 59.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Colombia b/isdb-t/br-sp-Colombia
index 3bd7f5d7..dc04773b 100644
--- a/isdb-t/br-sp-Colombia
+++ b/isdb-t/br-sp-Colombia
@@ -1,5 +1,5 @@
-# Channel table for Colômbia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/784
+# Channel table for Col�mbia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=784
 
 # Physical channel 42 (virtual 7.1)
 [EPTV Ribeirão]
diff --git a/isdb-t/br-sp-Conchal b/isdb-t/br-sp-Conchal
index ae70d19b..b85fd706 100644
--- a/isdb-t/br-sp-Conchal
+++ b/isdb-t/br-sp-Conchal
@@ -1,5 +1,5 @@
 # Channel table for Conchal - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1708
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1708
 
 # Physical channel 26 (virtual 6.1)
 [EPTV Central]
diff --git a/isdb-t/br-sp-Conchas b/isdb-t/br-sp-Conchas
index 7f333c22..c56344a8 100644
--- a/isdb-t/br-sp-Conchas
+++ b/isdb-t/br-sp-Conchas
@@ -1,5 +1,5 @@
 # Channel table for Conchas - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/785
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=785
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Itapetininga]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 54.1)
+# Physical channel 45 (virtual 45.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Cordeiropolis b/isdb-t/br-sp-Cordeiropolis
index ada8e30f..eb1304bc 100644
--- a/isdb-t/br-sp-Cordeiropolis
+++ b/isdb-t/br-sp-Cordeiropolis
@@ -1,5 +1,5 @@
-# Channel table for Cordeirópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3661
+# Channel table for Cordeir�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3661
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 39.1)
-[TV Jornal]
+[TV Jornal Limeira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
+# Physical channel 49 (virtual 48.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Coroados b/isdb-t/br-sp-Coroados
index 92793ca0..99d4c6eb 100644
--- a/isdb-t/br-sp-Coroados
+++ b/isdb-t/br-sp-Coroados
@@ -1,5 +1,5 @@
 # Channel table for Coroados - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3933
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3933
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-CoronelMacedo b/isdb-t/br-sp-CoronelMacedo
index ee374858..f9d9c275 100644
--- a/isdb-t/br-sp-CoronelMacedo
+++ b/isdb-t/br-sp-CoronelMacedo
@@ -1,5 +1,5 @@
 # Channel table for Coronel Macedo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3885
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3885
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Corumbatai b/isdb-t/br-sp-Corumbatai
index 93a3aeaa..acb77bb5 100644
--- a/isdb-t/br-sp-Corumbatai
+++ b/isdb-t/br-sp-Corumbatai
@@ -1,5 +1,5 @@
-# Channel table for Corumbataí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/994
+# Channel table for Corumbata� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=994
 
 # Physical channel 42 (virtual 6.1)
 [EPTV Central]
diff --git a/isdb-t/br-sp-Cosmopolis b/isdb-t/br-sp-Cosmopolis
index 485d3b51..05ea4c2e 100644
--- a/isdb-t/br-sp-Cosmopolis
+++ b/isdb-t/br-sp-Cosmopolis
@@ -1,5 +1,5 @@
-# Channel table for Cosmópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3662
+# Channel table for Cosm�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3662
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -204,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[Rede Brasil de Televisão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 32.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -262,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
+# Physical channel 39 (virtual 11.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Cosmorama b/isdb-t/br-sp-Cosmorama
index 3c58376c..3ff846f1 100644
--- a/isdb-t/br-sp-Cosmorama
+++ b/isdb-t/br-sp-Cosmorama
@@ -1,5 +1,5 @@
 # Channel table for Cosmorama - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3490
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3490
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Cotia b/isdb-t/br-sp-Cotia
new file mode 100644
index 00000000..5b48aa9b
--- /dev/null
+++ b/isdb-t/br-sp-Cotia
@@ -0,0 +1,670 @@
+# Channel table for Cotia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4356
+
+# Physical channel 14 (virtual 14.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 15 (virtual 16.1)
+[Mega TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 48.1)
+[NGT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 11.1)
+[TV Gazeta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 5.1)
+[TV Globo SP]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 7.1)
+[Record TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 49.1)
+[Terra Viva]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 21.1)
+[Rede 21]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 13.1)
+[Band]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 2.3)
+[TV Cultura, Univesp, TV Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 25.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 27.1)
+[CNT Americana]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 53.1)
+[Rede Gospel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 4.1)
+[SBT SP]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 32.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 36.1)
+[Mais Família]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 1.4)
+[TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 41.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 64.1)
+[TV Justiça]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 42.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Cravinhos b/isdb-t/br-sp-Cravinhos
index ef9e56e7..95c1aa46 100644
--- a/isdb-t/br-sp-Cravinhos
+++ b/isdb-t/br-sp-Cravinhos
@@ -1,5 +1,5 @@
 # Channel table for Cravinhos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1126
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1126
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 55.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -204,35 +204,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 50.1)
-[TV Canção Nova]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 28 (virtual 13.1)
 [Record TV Interior SP]
 	DELIVERY_SYSTEM = ISDBT
@@ -263,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -291,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Ribeirão Preto]
+# Physical channel 31 (virtual 6.5)
+[TV Câmara, Rede ALESP, TV Câmara Ribeirão Preto, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -320,40 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 14.1)
-[Record News]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 36 (virtual 2.1)
+# Physical channel 33 (virtual 2.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -378,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 29.1)
-[NGT]
+# Physical channel 35 (virtual 35.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -436,35 +378,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 39.1)
-[RIT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 51 (virtual 32.1)
 [TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-CristaisPaulista b/isdb-t/br-sp-CristaisPaulista
index 02863550..acea4c17 100644
--- a/isdb-t/br-sp-CristaisPaulista
+++ b/isdb-t/br-sp-CristaisPaulista
@@ -1,5 +1,5 @@
 # Channel table for Cristais Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2796
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2796
 
 # Physical channel 14 (virtual 13.1)
 [Record TV Interior SP]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
-[Rede Vida]
+# Physical channel 21 (virtual 22.2)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 55.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.1)
+# Physical channel 40 (virtual 43.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Cruzalia b/isdb-t/br-sp-Cruzalia
index 2b6f1db2..9e872d09 100644
--- a/isdb-t/br-sp-Cruzalia
+++ b/isdb-t/br-sp-Cruzalia
@@ -1,5 +1,5 @@
-# Channel table for Cruzália - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3752
+# Channel table for Cruz�lia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3752
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Cruzeiro b/isdb-t/br-sp-Cruzeiro
index f3719e03..dba3fb17 100644
--- a/isdb-t/br-sp-Cruzeiro
+++ b/isdb-t/br-sp-Cruzeiro
@@ -1,5 +1,5 @@
 # Channel table for Cruzeiro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/221
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=221
 
 # Physical channel 23 (virtual 4.1)
 [Band Vale]
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 24.1)
-[Rede Vida]
+# Physical channel 34 (virtual 24.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 26.1)
+# Physical channel 43 (virtual 43.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 38.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Cubatao b/isdb-t/br-sp-Cubatao
index 15c585fb..f7964399 100644
--- a/isdb-t/br-sp-Cubatao
+++ b/isdb-t/br-sp-Cubatao
@@ -1,11 +1,11 @@
-# Channel table for Cubatão - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/295
+# Channel table for Cubat�o - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=295
 
-# Physical channel 18 (virtual 54.1)
-[TV Tribuna]
+# Physical channel 15 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 497142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 18 (virtual 54.1)
+[TV Tribuna]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 515142857
+	FREQUENCY = 497142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 12.1)
-[TVB]
+# Physical channel 21 (virtual 3.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 515142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 10.1)
-[Rede 21]
+# Physical channel 23 (virtual 12.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 32.1)
-[TV Gazeta]
+# Physical channel 27 (virtual 10.1)
+[Rede 21]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 575142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
-[Record TV Litoral]
+# Physical channel 31 (virtual 32.1)
+[TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 575142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 6.1)
-[Record News]
+# Physical channel 33 (virtual 8.1)
+[Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[ISTV]
+# Physical channel 35 (virtual 6.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 38.1)
-[RBI TV]
+# Physical channel 36 (virtual 36.1)
+[ISTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 34.1)
-[RIT]
+# Physical channel 39 (virtual 38.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 56.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -378,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 43.1)
-[NGT]
+# Physical channel 47 (virtual 14.1)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -407,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 14.1)
-[Rede TV!]
+# Physical channel 48 (virtual 48.3)
+[TV Cultura Litoral, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Cunha b/isdb-t/br-sp-Cunha
index 3ae5d24c..2ab96448 100644
--- a/isdb-t/br-sp-Cunha
+++ b/isdb-t/br-sp-Cunha
@@ -1,5 +1,5 @@
 # Channel table for Cunha - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/861
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=861
 
 # Physical channel 23 (virtual 23.1)
 [Band Vale]
diff --git a/isdb-t/br-sp-Descalvado b/isdb-t/br-sp-Descalvado
index 0c444cd7..dd220257 100644
--- a/isdb-t/br-sp-Descalvado
+++ b/isdb-t/br-sp-Descalvado
@@ -1,5 +1,5 @@
 # Channel table for Descalvado - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/565
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=565
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 30 (virtual 30.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 5.1)
+# Physical channel 39 (virtual 39.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 32.1)
-[Rede Vida]
+# Physical channel 50 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Diadema b/isdb-t/br-sp-Diadema
index 5ca8328d..55d4af2f 100644
--- a/isdb-t/br-sp-Diadema
+++ b/isdb-t/br-sp-Diadema
@@ -1,8 +1,8 @@
 # Channel table for Diadema - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1157
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1157
 
 # Physical channel 10 (virtual 50.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 195142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -204,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 21 (virtual 49.1)
+[Terra Viva]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede 21]
 	DELIVERY_SYSTEM = ISDBT
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -407,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -495,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -552,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -582,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -611,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -639,7 +668,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -668,8 +697,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -900,6 +929,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -958,8 +1016,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-DirceReis b/isdb-t/br-sp-DirceReis
index 5a0272ed..45b12c43 100644
--- a/isdb-t/br-sp-DirceReis
+++ b/isdb-t/br-sp-DirceReis
@@ -1,5 +1,5 @@
 # Channel table for Dirce Reis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3934
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3934
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Divinolandia b/isdb-t/br-sp-Divinolandia
index 3247ebdf..7e93a5c4 100644
--- a/isdb-t/br-sp-Divinolandia
+++ b/isdb-t/br-sp-Divinolandia
@@ -1,5 +1,5 @@
-# Channel table for Divinolândia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2798
+# Channel table for Divinol�ndia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2798
 
 # Physical channel 22 (virtual 22.1)
 [Rede Século 21]
diff --git a/isdb-t/br-sp-Dobrada b/isdb-t/br-sp-Dobrada
index 748dfaf4..db621ded 100644
--- a/isdb-t/br-sp-Dobrada
+++ b/isdb-t/br-sp-Dobrada
@@ -1,5 +1,5 @@
 # Channel table for Dobrada - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2746
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2746
 
 # Physical channel 26 (virtual 7.1)
 [EPTV Ribeirão]
diff --git a/isdb-t/br-sp-DoisCorregos b/isdb-t/br-sp-DoisCorregos
index 34162685..f7c30d63 100644
--- a/isdb-t/br-sp-DoisCorregos
+++ b/isdb-t/br-sp-DoisCorregos
@@ -1,5 +1,5 @@
-# Channel table for Dois Córregos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/868
+# Channel table for Dois C�rregos - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=868
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-Dolcinopolis b/isdb-t/br-sp-Dolcinopolis
index e85c9d43..259ad15f 100644
--- a/isdb-t/br-sp-Dolcinopolis
+++ b/isdb-t/br-sp-Dolcinopolis
@@ -1,5 +1,5 @@
-# Channel table for Dolcinópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3935
+# Channel table for Dolcin�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3935
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Dourado b/isdb-t/br-sp-Dourado
index 1a6b9dad..1202f8d0 100644
--- a/isdb-t/br-sp-Dourado
+++ b/isdb-t/br-sp-Dourado
@@ -1,5 +1,5 @@
 # Channel table for Dourado - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3113
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3113
 
 # Physical channel 22 (virtual 53.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Dracena b/isdb-t/br-sp-Dracena
index 8923f023..9ba2db5a 100644
--- a/isdb-t/br-sp-Dracena
+++ b/isdb-t/br-sp-Dracena
@@ -1,8 +1,8 @@
 # Channel table for Dracena - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/145
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=145
 
-# Physical channel 25 (virtual 56.1)
-[Rede Vida]
+# Physical channel 25 (virtual 25.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 54.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 32.1)
 [TV Fronteira]
 	DELIVERY_SYSTEM = ISDBT
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 22.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -175,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 27.1)
+# Physical channel 43 (virtual 43.1)
 [Record TV Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Duartina b/isdb-t/br-sp-Duartina
index 82c7fd1d..7d1c0b9f 100644
--- a/isdb-t/br-sp-Duartina
+++ b/isdb-t/br-sp-Duartina
@@ -1,5 +1,5 @@
 # Channel table for Duartina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1423
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1423
 
 # Physical channel 18 (virtual 36.1)
 [Band Paulista]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 4.1)
+# Physical channel 28 (virtual 50.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Dumont b/isdb-t/br-sp-Dumont
index 51daf835..f2426d78 100644
--- a/isdb-t/br-sp-Dumont
+++ b/isdb-t/br-sp-Dumont
@@ -1,5 +1,5 @@
 # Channel table for Dumont - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2793
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2793
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 55.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,35 +175,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 50.1)
-[TV Canção Nova]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 28 (virtual 13.1)
 [Record TV Interior SP]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,40 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 14.1)
-[Record News]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 36 (virtual 2.1)
+# Physical channel 33 (virtual 2.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 29.1)
-[NGT]
+# Physical channel 35 (virtual 35.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,35 +291,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 39.1)
-[RIT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 44 (virtual 49.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Echapora b/isdb-t/br-sp-Echapora
index 46e5a4a7..e17ba534 100644
--- a/isdb-t/br-sp-Echapora
+++ b/isdb-t/br-sp-Echapora
@@ -1,5 +1,5 @@
-# Channel table for Echaporã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2920
+# Channel table for Echapor� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2920
 
 # Physical channel 18 (virtual 17.1)
 [Band Paulista]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 12.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Eldorado b/isdb-t/br-sp-Eldorado
index 67a10cc7..9faa946e 100644
--- a/isdb-t/br-sp-Eldorado
+++ b/isdb-t/br-sp-Eldorado
@@ -1,5 +1,5 @@
 # Channel table for Eldorado - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/443
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=443
 
 # Physical channel 15 (virtual 51.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Elisiario b/isdb-t/br-sp-Elisiario
index ccfea9d3..d11967e6 100644
--- a/isdb-t/br-sp-Elisiario
+++ b/isdb-t/br-sp-Elisiario
@@ -1,5 +1,5 @@
-# Channel table for Elisiário - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3936
+# Channel table for Elisi�rio - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3936
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Embauba b/isdb-t/br-sp-Embauba
index f5e5218c..67f8801e 100644
--- a/isdb-t/br-sp-Embauba
+++ b/isdb-t/br-sp-Embauba
@@ -1,5 +1,5 @@
-# Channel table for Embaúba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3871
+# Channel table for Emba�ba - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3871
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-EmbuDasArtes b/isdb-t/br-sp-EmbuDasArtes
index ecb46f44..0dee4747 100644
--- a/isdb-t/br-sp-EmbuDasArtes
+++ b/isdb-t/br-sp-EmbuDasArtes
@@ -1,5 +1,5 @@
 # Channel table for Embu Das Artes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/850
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=850
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -175,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 21 (virtual 49.1)
+[Terra Viva]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede 21]
 	DELIVERY_SYSTEM = ISDBT
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -378,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -436,8 +465,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 32 (virtual 10.1)
+[TV Templo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -495,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -523,7 +581,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -552,8 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -755,6 +813,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -784,8 +871,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 49 (virtual 59.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Emilianopolis b/isdb-t/br-sp-Emilianopolis
index 87357275..f2a772d7 100644
--- a/isdb-t/br-sp-Emilianopolis
+++ b/isdb-t/br-sp-Emilianopolis
@@ -1,5 +1,5 @@
-# Channel table for Emilianópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3689
+# Channel table for Emilian�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3689
 
 # Physical channel 19 (virtual 10.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-EngenheiroCoelho b/isdb-t/br-sp-EngenheiroCoelho
index fdd8bb0c..662bc4e3 100644
--- a/isdb-t/br-sp-EngenheiroCoelho
+++ b/isdb-t/br-sp-EngenheiroCoelho
@@ -1,5 +1,5 @@
 # Channel table for Engenheiro Coelho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3664
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3664
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-EspiritoSantoDoPinhal b/isdb-t/br-sp-EspiritoSantoDoPinhal
index b80ef488..28303fbe 100644
--- a/isdb-t/br-sp-EspiritoSantoDoPinhal
+++ b/isdb-t/br-sp-EspiritoSantoDoPinhal
@@ -1,11 +1,11 @@
-# Channel table for Espírito Santo Do Pinhal - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/977
+# Channel table for Esp�rito Santo Do Pinhal - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=977
 
-# Physical channel 16 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 34.1)
-[Rede Vida]
+# Physical channel 32 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-EspiritoSantoDoTurvo b/isdb-t/br-sp-EspiritoSantoDoTurvo
index f03b31cb..c407b065 100644
--- a/isdb-t/br-sp-EspiritoSantoDoTurvo
+++ b/isdb-t/br-sp-EspiritoSantoDoTurvo
@@ -1,5 +1,5 @@
-# Channel table for Espírito Santo Do Turvo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3751
+# Channel table for Esp�rito Santo Do Turvo - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3751
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-EstivaGerbi b/isdb-t/br-sp-EstivaGerbi
index 392b1f2c..eef7cfb9 100644
--- a/isdb-t/br-sp-EstivaGerbi
+++ b/isdb-t/br-sp-EstivaGerbi
@@ -1,92 +1,5 @@
 # Channel table for Estiva Gerbi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2795
-
-# Physical channel 16 (virtual 4.1)
-[Band Mais]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 30 (virtual 30.1)
-[VTV]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 34 (virtual 19.1)
-[TV Canção Nova]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2795
 
 # Physical channel 42 (virtual 12.1)
 [EPTV Campinas]
diff --git a/isdb-t/br-sp-EstrelaD'Oeste b/isdb-t/br-sp-EstrelaD'Oeste
index 1ac76001..033c3f9a 100644
--- a/isdb-t/br-sp-EstrelaD'Oeste
+++ b/isdb-t/br-sp-EstrelaD'Oeste
@@ -1,5 +1,5 @@
-# Channel table for Estrela D´ Oeste - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2886
+# Channel table for Estrela D� Oeste - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2886
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-EstrelaDoNorte b/isdb-t/br-sp-EstrelaDoNorte
index d11db21d..088e2a68 100644
--- a/isdb-t/br-sp-EstrelaDoNorte
+++ b/isdb-t/br-sp-EstrelaDoNorte
@@ -1,5 +1,5 @@
 # Channel table for Estrela Do Norte - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4022
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4022
 
 # Physical channel 30 (virtual 30.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-EuclidesDaCunhaPaulista b/isdb-t/br-sp-EuclidesDaCunhaPaulista
index b61d7223..dfb6db38 100644
--- a/isdb-t/br-sp-EuclidesDaCunhaPaulista
+++ b/isdb-t/br-sp-EuclidesDaCunhaPaulista
@@ -1,5 +1,5 @@
 # Channel table for Euclides Da Cunha Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3422
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3422
 
 # Physical channel 31 (virtual 31.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Fartura b/isdb-t/br-sp-Fartura
index 3b5879f2..5dd567a5 100644
--- a/isdb-t/br-sp-Fartura
+++ b/isdb-t/br-sp-Fartura
@@ -1,5 +1,34 @@
 # Channel table for Fartura - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/888
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=888
+
+# Physical channel 15 (virtual 15.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
@@ -30,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-FernandoPrestes b/isdb-t/br-sp-FernandoPrestes
index 3019a107..1ee5ef9a 100644
--- a/isdb-t/br-sp-FernandoPrestes
+++ b/isdb-t/br-sp-FernandoPrestes
@@ -1,5 +1,5 @@
 # Channel table for Fernando Prestes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2801
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2801
 
 # Physical channel 21 (virtual 22.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Fernandopolis b/isdb-t/br-sp-Fernandopolis
index 60e2eba4..6715be53 100644
--- a/isdb-t/br-sp-Fernandopolis
+++ b/isdb-t/br-sp-Fernandopolis
@@ -1,5 +1,5 @@
-# Channel table for Fernandópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/56
+# Channel table for Fernand�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=56
 
 # Physical channel 14 (virtual 53.1)
 [TV Aparecida]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 20.1)
+# Physical channel 20 (virtual 51.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Fernao b/isdb-t/br-sp-Fernao
index c599eac4..3a21505b 100644
--- a/isdb-t/br-sp-Fernao
+++ b/isdb-t/br-sp-Fernao
@@ -1,5 +1,5 @@
-# Channel table for Fernão - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3937
+# Channel table for Fern�o - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3937
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-FerrazDeVasconcelos b/isdb-t/br-sp-FerrazDeVasconcelos
index 4b95a5c8..ef9f63c8 100644
--- a/isdb-t/br-sp-FerrazDeVasconcelos
+++ b/isdb-t/br-sp-FerrazDeVasconcelos
@@ -1,5 +1,5 @@
 # Channel table for Ferraz De Vasconcelos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2263
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2263
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -466,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -552,8 +552,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -582,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -611,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -639,7 +639,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -668,8 +668,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -900,6 +900,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -929,8 +958,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-FloraRica b/isdb-t/br-sp-FloraRica
index 0251b0a8..2024dc2a 100644
--- a/isdb-t/br-sp-FloraRica
+++ b/isdb-t/br-sp-FloraRica
@@ -1,5 +1,5 @@
 # Channel table for Flora Rica - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3496
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3496
 
 # Physical channel 31 (virtual 31.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Floreal b/isdb-t/br-sp-Floreal
index 758ede65..e717e695 100644
--- a/isdb-t/br-sp-Floreal
+++ b/isdb-t/br-sp-Floreal
@@ -1,5 +1,5 @@
 # Channel table for Floreal - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3938
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3938
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-FloridaPaulista b/isdb-t/br-sp-FloridaPaulista
index 34036369..61318450 100644
--- a/isdb-t/br-sp-FloridaPaulista
+++ b/isdb-t/br-sp-FloridaPaulista
@@ -1,5 +1,5 @@
-# Channel table for Flórida Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4016
+# Channel table for Fl�rida Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4016
 
 # Physical channel 46 (virtual 46.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Florinea b/isdb-t/br-sp-Florinea
index 861896a6..b8d797b1 100644
--- a/isdb-t/br-sp-Florinea
+++ b/isdb-t/br-sp-Florinea
@@ -1,5 +1,5 @@
-# Channel table for Florínea - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3939
+# Channel table for Flor�nea - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3939
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Franca b/isdb-t/br-sp-Franca
index 66382335..3993093c 100644
--- a/isdb-t/br-sp-Franca
+++ b/isdb-t/br-sp-Franca
@@ -1,5 +1,5 @@
 # Channel table for Franca - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/308
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=308
 
 # Physical channel 14 (virtual 13.1)
 [Record TV Interior SP]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
-[Rede Vida]
+# Physical channel 21 (virtual 22.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 55.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 29.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Câmara Municipal Franca, TV Senado]
+# Physical channel 31 (virtual 6.5)
+[TV Câmara, Rede ALESP, TV Câmara Municipal Franca, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -291,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.1)
+# Physical channel 40 (virtual 43.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-FranciscoMorato b/isdb-t/br-sp-FranciscoMorato
index ff17c201..a4bda47c 100644
--- a/isdb-t/br-sp-FranciscoMorato
+++ b/isdb-t/br-sp-FranciscoMorato
@@ -1,5 +1,5 @@
 # Channel table for Francisco Morato - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3303
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3303
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
diff --git a/isdb-t/br-sp-FrancoDaRocha b/isdb-t/br-sp-FrancoDaRocha
index 54239bbd..65771264 100644
--- a/isdb-t/br-sp-FrancoDaRocha
+++ b/isdb-t/br-sp-FrancoDaRocha
@@ -1,5 +1,5 @@
 # Channel table for Franco Da Rocha - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2937
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2937
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -349,65 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 33.3)
-[Top TV, Kiss TV, Canal sem transmissão]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-GabrielMonteiro b/isdb-t/br-sp-GabrielMonteiro
index 451ec783..5a4105fc 100644
--- a/isdb-t/br-sp-GabrielMonteiro
+++ b/isdb-t/br-sp-GabrielMonteiro
@@ -1,5 +1,5 @@
 # Channel table for Gabriel Monteiro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3886
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3886
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Galia b/isdb-t/br-sp-Galia
index 0ed67206..ace986db 100644
--- a/isdb-t/br-sp-Galia
+++ b/isdb-t/br-sp-Galia
@@ -1,5 +1,5 @@
-# Channel table for Gália - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2918
+# Channel table for G�lia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2918
 
 # Physical channel 23 (virtual 12.1)
 [SBT Central]
diff --git a/isdb-t/br-sp-Garca b/isdb-t/br-sp-Garca
index 4e8b08b4..361fb484 100644
--- a/isdb-t/br-sp-Garca
+++ b/isdb-t/br-sp-Garca
@@ -1,8 +1,8 @@
-# Channel table for Garça - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/773
+# Channel table for Gar�a - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=773
 
-# Physical channel 16 (virtual 20.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -175,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 14.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 48.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-GaviaoPeixoto b/isdb-t/br-sp-GaviaoPeixoto
index a67983e5..9931831a 100644
--- a/isdb-t/br-sp-GaviaoPeixoto
+++ b/isdb-t/br-sp-GaviaoPeixoto
@@ -1,5 +1,5 @@
-# Channel table for Gavião Peixoto - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2812
+# Channel table for Gavi�o Peixoto - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2812
 
 # Physical channel 26 (virtual 6.1)
 [EPTV Central]
diff --git a/isdb-t/br-sp-GeneralSalgado b/isdb-t/br-sp-GeneralSalgado
index cb4db3fa..42534e84 100644
--- a/isdb-t/br-sp-GeneralSalgado
+++ b/isdb-t/br-sp-GeneralSalgado
@@ -1,5 +1,34 @@
 # Channel table for General Salgado - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2128
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2128
+
+# Physical channel 20 (virtual 21.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Getulina b/isdb-t/br-sp-Getulina
index b422379d..ddcfc076 100644
--- a/isdb-t/br-sp-Getulina
+++ b/isdb-t/br-sp-Getulina
@@ -1,5 +1,5 @@
 # Channel table for Getulina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3364
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3364
 
 # Physical channel 16 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Glicerio b/isdb-t/br-sp-Glicerio
index f3c2e217..09676239 100644
--- a/isdb-t/br-sp-Glicerio
+++ b/isdb-t/br-sp-Glicerio
@@ -1,5 +1,5 @@
-# Channel table for Glicério - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3940
+# Channel table for Glic�rio - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3940
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Guaicara b/isdb-t/br-sp-Guaicara
index cec8bf58..762a225c 100644
--- a/isdb-t/br-sp-Guaicara
+++ b/isdb-t/br-sp-Guaicara
@@ -1,5 +1,5 @@
-# Channel table for Guaiçara - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3941
+# Channel table for Guai�ara - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3941
 
 # Physical channel 16 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Guaimbe b/isdb-t/br-sp-Guaimbe
index 55b2454c..13afa46e 100644
--- a/isdb-t/br-sp-Guaimbe
+++ b/isdb-t/br-sp-Guaimbe
@@ -1,5 +1,5 @@
-# Channel table for Guaimbê - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3511
+# Channel table for Guaimb� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3511
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Guaira b/isdb-t/br-sp-Guaira
index 4b69d992..d5b57ffa 100644
--- a/isdb-t/br-sp-Guaira
+++ b/isdb-t/br-sp-Guaira
@@ -1,8 +1,8 @@
-# Channel table for Guaíra - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2728
+# Channel table for Gua�ra - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2728
 
-# Physical channel 21 (virtual 22.1)
-[Rede Vida]
+# Physical channel 21 (virtual 22.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Guapiacu b/isdb-t/br-sp-Guapiacu
index 6db58dad..9a573033 100644
--- a/isdb-t/br-sp-Guapiacu
+++ b/isdb-t/br-sp-Guapiacu
@@ -1,8 +1,8 @@
-# Channel table for Guapiaçu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2887
+# Channel table for Guapia�u - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2887
 
 # Physical channel 22 (virtual 15.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
diff --git a/isdb-t/br-sp-Guapiara b/isdb-t/br-sp-Guapiara
index 0262cf01..9032ad59 100644
--- a/isdb-t/br-sp-Guapiara
+++ b/isdb-t/br-sp-Guapiara
@@ -1,5 +1,5 @@
 # Channel table for Guapiara - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2888
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2888
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Guara b/isdb-t/br-sp-Guara
index 3782fe62..7ea886d3 100644
--- a/isdb-t/br-sp-Guara
+++ b/isdb-t/br-sp-Guara
@@ -1,8 +1,37 @@
-# Channel table for Guará - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2727
+# Channel table for Guar� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2727
 
-# Physical channel 21 (virtual 47.1)
-[Rede Vida]
+# Physical channel 15 (virtual 15.1)
+[TV Clube Ribeirão Preto]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -30,7 +59,94 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 5.1)
+# Physical channel 26 (virtual 7.1)
+[EPTV Ribeirão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 13.1)
+[Record TV Interior SP]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 4.3)
+[TV Cultura, Univesp, TV Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 39.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 23.2)
+[Rede TV!, Universo EADTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Guaracai b/isdb-t/br-sp-Guaracai
index 57ae111e..cae84224 100644
--- a/isdb-t/br-sp-Guaracai
+++ b/isdb-t/br-sp-Guaracai
@@ -1,5 +1,5 @@
-# Channel table for Guaraçaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3942
+# Channel table for Guara�a� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3942
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Guaraci b/isdb-t/br-sp-Guaraci
index 14d4facc..9672a6b3 100644
--- a/isdb-t/br-sp-Guaraci
+++ b/isdb-t/br-sp-Guaraci
@@ -1,5 +1,5 @@
 # Channel table for Guaraci - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3495
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3495
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-GuaraniD'Oeste b/isdb-t/br-sp-GuaraniD'Oeste
index 98c223eb..f29da673 100644
--- a/isdb-t/br-sp-GuaraniD'Oeste
+++ b/isdb-t/br-sp-GuaraniD'Oeste
@@ -1,5 +1,63 @@
-# Channel table for Guarani D´ Oeste - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1393
+# Channel table for Guarani D� Oeste - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1393
+
+# Physical channel 20 (virtual 50.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 25.1)
+[Band Paulista]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -30,3 +88,119 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 4.3)
+[TV Cultura, Univesp, TV Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.1)
+[Rede Vida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 33.1)
+[SBT Interior/SP]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 7.1)
+[Record TV Rio Preto]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Guaranta b/isdb-t/br-sp-Guaranta
index e2f4602c..a69dffc8 100644
--- a/isdb-t/br-sp-Guaranta
+++ b/isdb-t/br-sp-Guaranta
@@ -1,5 +1,5 @@
-# Channel table for Guarantã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3335
+# Channel table for Guarant� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3335
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Guararapes b/isdb-t/br-sp-Guararapes
index c2ad3971..e241b347 100644
--- a/isdb-t/br-sp-Guararapes
+++ b/isdb-t/br-sp-Guararapes
@@ -1,5 +1,5 @@
 # Channel table for Guararapes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3733
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3733
 
 # Physical channel 19 (virtual 19.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Guararema b/isdb-t/br-sp-Guararema
index d686fa9f..6d3c01b5 100644
--- a/isdb-t/br-sp-Guararema
+++ b/isdb-t/br-sp-Guararema
@@ -1,5 +1,5 @@
 # Channel table for Guararema - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2894
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2894
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 55.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Guaratingueta b/isdb-t/br-sp-Guaratingueta
index 7f275da5..efc22dc2 100644
--- a/isdb-t/br-sp-Guaratingueta
+++ b/isdb-t/br-sp-Guaratingueta
@@ -1,5 +1,5 @@
-# Channel table for Guaratinguetá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/367
+# Channel table for Guaratinguet� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=367
 
 # Physical channel 21 (virtual 22.1)
 [Band Vale]
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 9.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 8.1)
+# Physical channel 42 (virtual 42.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Guarei b/isdb-t/br-sp-Guarei
index e89f6c19..a3d43004 100644
--- a/isdb-t/br-sp-Guarei
+++ b/isdb-t/br-sp-Guarei
@@ -1,5 +1,5 @@
-# Channel table for Guareí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3228
+# Channel table for Guare� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3228
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Guariba b/isdb-t/br-sp-Guariba
index df511ac0..b8eb370e 100644
--- a/isdb-t/br-sp-Guariba
+++ b/isdb-t/br-sp-Guariba
@@ -1,5 +1,5 @@
 # Channel table for Guariba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/770
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=770
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 30.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Guaruja b/isdb-t/br-sp-Guaruja
index 620ac682..e713c1da 100644
--- a/isdb-t/br-sp-Guaruja
+++ b/isdb-t/br-sp-Guaruja
@@ -1,8 +1,8 @@
-# Channel table for Guarujá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/52
+# Channel table for Guaruj� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=52
 
-# Physical channel 15 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 50.1)
-[TVB]
+# Physical channel 25 (virtual 25.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 56.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 43.1)
-[NGT]
+# Physical channel 47 (virtual 27.1)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 14.1)
-[Rede TV!]
+# Physical channel 48 (virtual 48.3)
+[TV Cultura Litoral, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Guarulhos b/isdb-t/br-sp-Guarulhos
index c447a38d..ef7e9632 100644
--- a/isdb-t/br-sp-Guarulhos
+++ b/isdb-t/br-sp-Guarulhos
@@ -1,5 +1,5 @@
 # Channel table for Guarulhos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/869
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=869
 
 # Physical channel 12 (virtual 58.1)
 [TV FL]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -581,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -611,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -640,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -668,7 +668,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -697,8 +697,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -929,6 +929,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -958,8 +987,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Guatapara b/isdb-t/br-sp-Guatapara
index 64af4982..e67bc51f 100644
--- a/isdb-t/br-sp-Guatapara
+++ b/isdb-t/br-sp-Guatapara
@@ -1,5 +1,5 @@
-# Channel table for Guatapará - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2729
+# Channel table for Guatapar� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2729
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
diff --git a/isdb-t/br-sp-Guzolandia b/isdb-t/br-sp-Guzolandia
index 00db424a..de9ba5f6 100644
--- a/isdb-t/br-sp-Guzolandia
+++ b/isdb-t/br-sp-Guzolandia
@@ -1,5 +1,5 @@
-# Channel table for Guzolândia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2355
+# Channel table for Guzol�ndia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2355
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Herculandia b/isdb-t/br-sp-Herculandia
index 18b079be..763ec406 100644
--- a/isdb-t/br-sp-Herculandia
+++ b/isdb-t/br-sp-Herculandia
@@ -1,5 +1,5 @@
-# Channel table for Herculândia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3896
+# Channel table for Hercul�ndia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3896
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Holambra b/isdb-t/br-sp-Holambra
index 34b202d4..f8979ca4 100644
--- a/isdb-t/br-sp-Holambra
+++ b/isdb-t/br-sp-Holambra
@@ -1,5 +1,5 @@
 # Channel table for Holambra - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3315
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3315
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 22.1)
+# Physical channel 32 (virtual 32.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Hortolandia b/isdb-t/br-sp-Hortolandia
index 7abb7eb6..a24e31ae 100644
--- a/isdb-t/br-sp-Hortolandia
+++ b/isdb-t/br-sp-Hortolandia
@@ -1,5 +1,5 @@
-# Channel table for Hortolândia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/242
+# Channel table for Hortol�ndia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=242
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 26.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -379,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -407,7 +407,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
+# Physical channel 39 (virtual 11.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -523,8 +523,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
-[Rede TV!]
+# Physical channel 49 (virtual 48.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -553,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-Iacanga b/isdb-t/br-sp-Iacanga
index 30930408..45e983da 100644
--- a/isdb-t/br-sp-Iacanga
+++ b/isdb-t/br-sp-Iacanga
@@ -1,11 +1,11 @@
 # Channel table for Iacanga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1424
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1424
 
-# Physical channel 22 (virtual 32.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 5.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Iacri b/isdb-t/br-sp-Iacri
index 1ada9fa2..39ec1c0f 100644
--- a/isdb-t/br-sp-Iacri
+++ b/isdb-t/br-sp-Iacri
@@ -1,5 +1,5 @@
 # Channel table for Iacri - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2883
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2883
 
 # Physical channel 20 (virtual 20.1)
 [Rede Vida]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 54.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Iaras b/isdb-t/br-sp-Iaras
index 4d064624..84d6e271 100644
--- a/isdb-t/br-sp-Iaras
+++ b/isdb-t/br-sp-Iaras
@@ -1,5 +1,5 @@
 # Channel table for Iaras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3943
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3943
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Ibate b/isdb-t/br-sp-Ibate
index 8648ce22..096df3de 100644
--- a/isdb-t/br-sp-Ibate
+++ b/isdb-t/br-sp-Ibate
@@ -1,5 +1,5 @@
-# Channel table for Ibaté - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2724
+# Channel table for Ibat� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2724
 
 # Physical channel 18 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 12.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Ibirarema b/isdb-t/br-sp-Ibirarema
index 244d7cb6..f1e2010c 100644
--- a/isdb-t/br-sp-Ibirarema
+++ b/isdb-t/br-sp-Ibirarema
@@ -1,5 +1,5 @@
 # Channel table for Ibirarema - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3944
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3944
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Ibitinga b/isdb-t/br-sp-Ibitinga
index 87649eb9..718b876e 100644
--- a/isdb-t/br-sp-Ibitinga
+++ b/isdb-t/br-sp-Ibitinga
@@ -1,11 +1,11 @@
 # Channel table for Ibitinga  - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/641
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=641
 
-# Physical channel 22 (virtual 32.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 26.1)
-[TV Tem Bauru]
+# Physical channel 24 (virtual 24.1)
+[SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 4.1)
-[Record TV Paulista]
+# Physical channel 26 (virtual 26.1)
+[TV Tem Bauru]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 12.1)
-[SBT Central]
+# Physical channel 42 (virtual 42.1)
+[Band Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 42.1)
-[Band Paulista]
+# Physical channel 44 (virtual 58.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 58.1)
-[RBI TV]
+# Physical channel 45 (virtual 45.1)
+[Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Ibiuna b/isdb-t/br-sp-Ibiuna
index bddb82f2..d79e7042 100644
--- a/isdb-t/br-sp-Ibiuna
+++ b/isdb-t/br-sp-Ibiuna
@@ -1,8 +1,8 @@
-# Channel table for Ibiúna - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1002
+# Channel table for Ibi�na - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1002
 
 # Physical channel 19 (virtual 19.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 503142857
diff --git a/isdb-t/br-sp-Icem b/isdb-t/br-sp-Icem
index c221e4b6..98a3a0d8 100644
--- a/isdb-t/br-sp-Icem
+++ b/isdb-t/br-sp-Icem
@@ -1,5 +1,5 @@
-# Channel table for Icém - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3084
+# Channel table for Ic�m - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3084
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Iepe b/isdb-t/br-sp-Iepe
index f170f442..41a8dc8a 100644
--- a/isdb-t/br-sp-Iepe
+++ b/isdb-t/br-sp-Iepe
@@ -1,5 +1,5 @@
-# Channel table for Iepê - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1013
+# Channel table for Iep� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1013
 
 # Physical channel 16 (virtual 27.1)
 [Rede Vida]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 22.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-IgaracuDoTiete b/isdb-t/br-sp-IgaracuDoTiete
index 30278a19..661a42ef 100644
--- a/isdb-t/br-sp-IgaracuDoTiete
+++ b/isdb-t/br-sp-IgaracuDoTiete
@@ -1,5 +1,5 @@
-# Channel table for Igaraçu Do Tietê - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1394
+# Channel table for Igara�u Do Tiet� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1394
 
 # Physical channel 17 (virtual 32.1)
 [Band Paulista]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 22 (virtual 22.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 4.1)
+# Physical channel 28 (virtual 28.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-Igarapava b/isdb-t/br-sp-Igarapava
index 8034d740..f03257e9 100644
--- a/isdb-t/br-sp-Igarapava
+++ b/isdb-t/br-sp-Igarapava
@@ -1,8 +1,8 @@
 # Channel table for Igarapava - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/786
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=786
 
-# Physical channel 21 (virtual 53.1)
-[Rede Vida]
+# Physical channel 21 (virtual 53.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Iguape b/isdb-t/br-sp-Iguape
index f0eff42d..354ac598 100644
--- a/isdb-t/br-sp-Iguape
+++ b/isdb-t/br-sp-Iguape
@@ -1,5 +1,5 @@
 # Channel table for Iguape - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/441
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=441
 
 # Physical channel 15 (virtual 15.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,7 +117,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
+# Physical channel 30 (virtual 30.1)
+[ISTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 33.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,6 +175,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 40.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 35.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 51.1)
 [Oeste TV]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-IlhaComprida b/isdb-t/br-sp-IlhaComprida
index 8ce74176..80c47d6a 100644
--- a/isdb-t/br-sp-IlhaComprida
+++ b/isdb-t/br-sp-IlhaComprida
@@ -1,5 +1,5 @@
 # Channel table for Ilha Comprida - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/442
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=442
 
 # Physical channel 15 (virtual 15.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
+# Physical channel 33 (virtual 33.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,6 +146,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 40.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 35.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 51.1)
 [Oeste TV]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-IlhaSolteira b/isdb-t/br-sp-IlhaSolteira
index f19d6290..c861890a 100644
--- a/isdb-t/br-sp-IlhaSolteira
+++ b/isdb-t/br-sp-IlhaSolteira
@@ -1,5 +1,5 @@
 # Channel table for Ilha Solteira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/296
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=296
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.1)
-[Rede Vida]
+# Physical channel 31 (virtual 31.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 5.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 7.1)
+# Physical channel 43 (virtual 43.1)
 [Record TV Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 29.2)
-[Rede TV!]
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-sp-Ilhabela b/isdb-t/br-sp-Ilhabela
index c7870741..96b64354 100644
--- a/isdb-t/br-sp-Ilhabela
+++ b/isdb-t/br-sp-Ilhabela
@@ -1,5 +1,5 @@
 # Channel table for Ilhabela - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2512
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2512
 
 # Physical channel 15 (virtual 16.1)
 [Rede Vida]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Band Vale]
+# Physical channel 20 (virtual 57.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 29.1)
-[VTV]
+# Physical channel 25 (virtual 26.1)
+[Band Vale]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
-[Record TV Litoral]
+# Physical channel 29 (virtual 29.1)
+[VTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
-[Rede TV!]
+# Physical channel 33 (virtual 33.1)
+[Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 57 (virtual 57.1)
-[TV Canção Nova]
+# Physical channel 47 (virtual 54.1)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 731142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Indaiatuba b/isdb-t/br-sp-Indaiatuba
index 7eff09f3..42cc30d6 100644
--- a/isdb-t/br-sp-Indaiatuba
+++ b/isdb-t/br-sp-Indaiatuba
@@ -1,5 +1,5 @@
 # Channel table for Indaiatuba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/60
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=60
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -59,37 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 22.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -147,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -234,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -262,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
+# Physical channel 39 (virtual 11.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -379,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 48 (virtual 48.1)
-[TV Indaiá]
+[TV Sol]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
@@ -407,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
-[Rede TV!]
+# Physical channel 49 (virtual 48.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -437,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-Indiana b/isdb-t/br-sp-Indiana
index 6be9fcd9..e7895216 100644
--- a/isdb-t/br-sp-Indiana
+++ b/isdb-t/br-sp-Indiana
@@ -1,5 +1,5 @@
 # Channel table for Indiana - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3690
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3690
 
 # Physical channel 17 (virtual 46.1)
 [TV Gazeta]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 58.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 22.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 14.1)
-[RBI TV]
+# Physical channel 45 (virtual 56.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 55 (virtual 56.1)
-[CNT]
+# Physical channel 47 (virtual 14.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 719142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Indiapora b/isdb-t/br-sp-Indiapora
index 08b8578d..c208af4a 100644
--- a/isdb-t/br-sp-Indiapora
+++ b/isdb-t/br-sp-Indiapora
@@ -1,5 +1,5 @@
-# Channel table for Indiaporã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3945
+# Channel table for Indiapor� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3945
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-InubiaPaulista b/isdb-t/br-sp-InubiaPaulista
index 78c0bb24..e519f995 100644
--- a/isdb-t/br-sp-InubiaPaulista
+++ b/isdb-t/br-sp-InubiaPaulista
@@ -1,5 +1,5 @@
-# Channel table for Inúbia Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4019
+# Channel table for In�bia Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4019
 
 # Physical channel 30 (virtual 30.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Ipaussu b/isdb-t/br-sp-Ipaussu
index e05149de..c4f94af4 100644
--- a/isdb-t/br-sp-Ipaussu
+++ b/isdb-t/br-sp-Ipaussu
@@ -1,5 +1,5 @@
 # Channel table for Ipaussu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3500
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3500
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Ipero b/isdb-t/br-sp-Ipero
index 68832126..de6739e8 100644
--- a/isdb-t/br-sp-Ipero
+++ b/isdb-t/br-sp-Ipero
@@ -1,5 +1,5 @@
-# Channel table for Iperó - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2830
+# Channel table for Iper� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2830
 
 # Physical channel 17 (virtual 57.1)
 [TV Gazeta]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 14.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-Ipigua b/isdb-t/br-sp-Ipigua
index 392e1d1f..d39141b7 100644
--- a/isdb-t/br-sp-Ipigua
+++ b/isdb-t/br-sp-Ipigua
@@ -1,5 +1,5 @@
-# Channel table for Ipiguá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3704
+# Channel table for Ipigu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3704
 
 # Physical channel 24 (virtual 5.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Iporanga b/isdb-t/br-sp-Iporanga
index e7dc0706..9747982b 100644
--- a/isdb-t/br-sp-Iporanga
+++ b/isdb-t/br-sp-Iporanga
@@ -1,5 +1,5 @@
 # Channel table for Iporanga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/446
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=446
 
 # Physical channel 15 (virtual 23.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Ipua b/isdb-t/br-sp-Ipua
index a3ad65a5..2602199f 100644
--- a/isdb-t/br-sp-Ipua
+++ b/isdb-t/br-sp-Ipua
@@ -1,5 +1,5 @@
-# Channel table for Ipuã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2730
+# Channel table for Ipu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2730
 
 # Physical channel 21 (virtual 47.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Iracemapolis b/isdb-t/br-sp-Iracemapolis
index 57a3473d..1889e156 100644
--- a/isdb-t/br-sp-Iracemapolis
+++ b/isdb-t/br-sp-Iracemapolis
@@ -1,5 +1,5 @@
-# Channel table for Iracemápolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3666
+# Channel table for Iracem�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3666
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 39.1)
-[TV Jornal]
+[TV Jornal Limeira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
+# Physical channel 49 (virtual 48.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Irapua b/isdb-t/br-sp-Irapua
index f85509f6..2bc945d1 100644
--- a/isdb-t/br-sp-Irapua
+++ b/isdb-t/br-sp-Irapua
@@ -1,5 +1,5 @@
-# Channel table for Irapuã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3946
+# Channel table for Irapu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3946
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Irapuru b/isdb-t/br-sp-Irapuru
index d20a69cb..42872fa1 100644
--- a/isdb-t/br-sp-Irapuru
+++ b/isdb-t/br-sp-Irapuru
@@ -1,5 +1,5 @@
 # Channel table for Irapuru - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3691
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3691
 
 # Physical channel 32 (virtual 32.1)
 [TV Fronteira]
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 27.1)
+# Physical channel 43 (virtual 7.1)
 [Record TV Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Itabera b/isdb-t/br-sp-Itabera
index 21f59cae..f9a160f9 100644
--- a/isdb-t/br-sp-Itabera
+++ b/isdb-t/br-sp-Itabera
@@ -1,5 +1,5 @@
-# Channel table for Itaberá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3995
+# Channel table for Itaber� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3995
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Itai b/isdb-t/br-sp-Itai
index 726a5904..785c810d 100644
--- a/isdb-t/br-sp-Itai
+++ b/isdb-t/br-sp-Itai
@@ -1,5 +1,5 @@
-# Channel table for Itaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1834
+# Channel table for Ita� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1834
 
 # Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
diff --git a/isdb-t/br-sp-Itajobi b/isdb-t/br-sp-Itajobi
index 555b7030..a377d1e0 100644
--- a/isdb-t/br-sp-Itajobi
+++ b/isdb-t/br-sp-Itajobi
@@ -1,5 +1,5 @@
 # Channel table for Itajobi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3081
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3081
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 7.1)
+# Physical channel 39 (virtual 39.1)
 [Record TV Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Itaju b/isdb-t/br-sp-Itaju
index 68de2f6e..ca16e41e 100644
--- a/isdb-t/br-sp-Itaju
+++ b/isdb-t/br-sp-Itaju
@@ -1,5 +1,5 @@
 # Channel table for Itaju - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3947
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3947
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Itanhaem b/isdb-t/br-sp-Itanhaem
index e81c914a..3093cb19 100644
--- a/isdb-t/br-sp-Itanhaem
+++ b/isdb-t/br-sp-Itanhaem
@@ -1,8 +1,8 @@
-# Channel table for Itanhaém - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/552
+# Channel table for Itanha�m - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=552
 
-# Physical channel 15 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 41.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 8.1)
+# Physical channel 34 (virtual 34.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 44.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
diff --git a/isdb-t/br-sp-Itapetininga b/isdb-t/br-sp-Itapetininga
index 069cbbd1..6cb89b1c 100644
--- a/isdb-t/br-sp-Itapetininga
+++ b/isdb-t/br-sp-Itapetininga
@@ -1,5 +1,5 @@
 # Channel table for Itapetininga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/271
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=271
 
 # Physical channel 14 (virtual 54.1)
 [RBI TV]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 18.1)
-[Rede Brasil]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 47.1)
-[Rede Vida]
+# Physical channel 20 (virtual 47.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 6.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -233,6 +233,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 33.1)
+[Rede Gospel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 36.1)
 [TV Sorocaba]
 	DELIVERY_SYSTEM = ISDBT
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 20.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -291,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 49.1)
+# Physical channel 48 (virtual 31.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -320,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 11.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 51.1)
 [Rede Século 21]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Itapeva b/isdb-t/br-sp-Itapeva
index 1df5c3b7..1d54f79a 100644
--- a/isdb-t/br-sp-Itapeva
+++ b/isdb-t/br-sp-Itapeva
@@ -1,5 +1,5 @@
 # Channel table for Itapeva - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/458
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=458
 
 # Physical channel 15 (virtual 15.1)
 [TV Sorocaba]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 35.1)
-[Rede Vida]
+# Physical channel 20 (virtual 35.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 26.1)
-[TV Tem Itapetininga]
+# Physical channel 22 (virtual 25.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 38.1)
-[Record TV Paulista]
+# Physical channel 26 (virtual 26.1)
+[TV Tem Itapetininga]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 28 (virtual 4.1)
+[Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 41.1)
-[CNT]
+# Physical channel 30 (virtual 3.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 54 (virtual 25.1)
-[TV Canção Nova]
+# Physical channel 42 (virtual 41.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 713142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Itapevi b/isdb-t/br-sp-Itapevi
index 00883a16..c44499a2 100644
--- a/isdb-t/br-sp-Itapevi
+++ b/isdb-t/br-sp-Itapevi
@@ -1,5 +1,5 @@
 # Channel table for Itapevi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2629
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2629
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 15 (virtual 16.2)
+[Mega TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 16 (virtual 48.1)
 [NGT]
 	DELIVERY_SYSTEM = ISDBT
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -233,6 +262,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 25 (virtual 25.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 26 (virtual 27.1)
 [CNT Americana]
 	DELIVERY_SYSTEM = ISDBT
@@ -320,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -350,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -378,11 +436,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 33.3)
-[Top TV, Kiss TV, Canal sem transmissão]
+# Physical channel 32 (virtual 10.1)
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -407,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -437,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -465,7 +523,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -494,6 +552,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 41.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 64.1)
 [TV Justiça]
 	DELIVERY_SYSTEM = ISDBT
@@ -552,8 +668,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 55.1)
+[TV8]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Itapira b/isdb-t/br-sp-Itapira
index 8f7a5986..4a2b305c 100644
--- a/isdb-t/br-sp-Itapira
+++ b/isdb-t/br-sp-Itapira
@@ -1,7 +1,7 @@
 # Channel table for Itapira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/394
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=394
 
-# Physical channel 15 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-ItapirapuaPaulista b/isdb-t/br-sp-ItapirapuaPaulista
index 2eff5c39..628bc856 100644
--- a/isdb-t/br-sp-ItapirapuaPaulista
+++ b/isdb-t/br-sp-ItapirapuaPaulista
@@ -1,5 +1,5 @@
-# Channel table for Itapirapuã Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2531
+# Channel table for Itapirapu� Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2531
 
 # Physical channel 17 (virtual 18.1)
 [TV Tribuna]
diff --git a/isdb-t/br-sp-Itapolis b/isdb-t/br-sp-Itapolis
index 828121d2..7e590b1b 100644
--- a/isdb-t/br-sp-Itapolis
+++ b/isdb-t/br-sp-Itapolis
@@ -1,5 +1,5 @@
-# Channel table for Itápolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/527
+# Channel table for It�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=527
 
 # Physical channel 18 (virtual 20.1)
 [Band Paulista]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Itaporanga b/isdb-t/br-sp-Itaporanga
index 9e9cad68..970345cf 100644
--- a/isdb-t/br-sp-Itaporanga
+++ b/isdb-t/br-sp-Itaporanga
@@ -1,5 +1,5 @@
 # Channel table for Itaporanga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/889
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=889
 
 # Physical channel 24 (virtual 18.1)
 [SBT]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Itapui b/isdb-t/br-sp-Itapui
index ea7b3ff5..1a4b0d0b 100644
--- a/isdb-t/br-sp-Itapui
+++ b/isdb-t/br-sp-Itapui
@@ -1,5 +1,5 @@
-# Channel table for Itapuí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2410
+# Channel table for Itapu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2410
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Itapura b/isdb-t/br-sp-Itapura
index 21dfe7ce..05f82daf 100644
--- a/isdb-t/br-sp-Itapura
+++ b/isdb-t/br-sp-Itapura
@@ -1,5 +1,5 @@
 # Channel table for Itapura - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3499
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3499
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Itaquaquecetuba b/isdb-t/br-sp-Itaquaquecetuba
index be1fa398..4c4a128b 100644
--- a/isdb-t/br-sp-Itaquaquecetuba
+++ b/isdb-t/br-sp-Itaquaquecetuba
@@ -1,5 +1,5 @@
 # Channel table for Itaquaquecetuba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/311
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=311
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -581,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -640,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -668,7 +668,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -697,8 +697,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -930,7 +930,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 56.1)
-[TV Jovem Colinas]
+[Rede Mundial, TV Colinas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -987,8 +987,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Itarare b/isdb-t/br-sp-Itarare
index c2efd2b6..8a722c99 100644
--- a/isdb-t/br-sp-Itarare
+++ b/isdb-t/br-sp-Itarare
@@ -1,5 +1,5 @@
-# Channel table for Itararé - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/460
+# Channel table for Itarar� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=460
 
 # Physical channel 17 (virtual 10.1)
 [Band]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 58.1)
-[Rede Vida]
+# Physical channel 20 (virtual 58.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,3 +146,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 55.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Itariri b/isdb-t/br-sp-Itariri
index 551ebf0f..307df0ea 100644
--- a/isdb-t/br-sp-Itariri
+++ b/isdb-t/br-sp-Itariri
@@ -1,5 +1,5 @@
 # Channel table for Itariri - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/451
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=451
 
 # Physical channel 15 (virtual 14.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Itatiba b/isdb-t/br-sp-Itatiba
index 38bf9864..9a6871fd 100644
--- a/isdb-t/br-sp-Itatiba
+++ b/isdb-t/br-sp-Itatiba
@@ -1,5 +1,5 @@
 # Channel table for Itatiba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/431
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=431
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 2.2)
-[TV Cultura, Univesp]
+# Physical channel 24 (virtual 2.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-Itatinga b/isdb-t/br-sp-Itatinga
index 14020ddb..d7349b9a 100644
--- a/isdb-t/br-sp-Itatinga
+++ b/isdb-t/br-sp-Itatinga
@@ -1,5 +1,5 @@
 # Channel table for Itatinga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2917
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2917
 
 # Physical channel 17 (virtual 17.1)
 [Band Paulista]
@@ -30,35 +30,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 29.1)
-[Rede Vida]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 24 (virtual 12.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 35.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Itirapina b/isdb-t/br-sp-Itirapina
index c3fbb25a..b3b84825 100644
--- a/isdb-t/br-sp-Itirapina
+++ b/isdb-t/br-sp-Itirapina
@@ -1,5 +1,5 @@
 # Channel table for Itirapina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2293
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2293
 
 # Physical channel 18 (virtual 18.1)
 [TV Clube Ribeirão Preto]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 32 (virtual 46.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 6.1)
 [EPTV Central]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Itirapua b/isdb-t/br-sp-Itirapua
index 2e4aedc7..e080efdd 100644
--- a/isdb-t/br-sp-Itirapua
+++ b/isdb-t/br-sp-Itirapua
@@ -1,5 +1,5 @@
-# Channel table for Itirapuã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2669
+# Channel table for Itirapu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2669
 
 # Physical channel 16 (virtual 16.1)
 [TV Clube Ribeirão Preto]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Itobi b/isdb-t/br-sp-Itobi
index 1a2aa2e0..44c693ef 100644
--- a/isdb-t/br-sp-Itobi
+++ b/isdb-t/br-sp-Itobi
@@ -1,5 +1,5 @@
 # Channel table for Itobi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2731
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2731
 
 # Physical channel 25 (virtual 6.1)
 [EPTV Central]
diff --git a/isdb-t/br-sp-Itu b/isdb-t/br-sp-Itu
index 5882494a..288c315c 100644
--- a/isdb-t/br-sp-Itu
+++ b/isdb-t/br-sp-Itu
@@ -1,5 +1,5 @@
 # Channel table for Itu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/20
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=20
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-sp-Itupeva b/isdb-t/br-sp-Itupeva
index 59a0d4cb..2289d0ac 100644
--- a/isdb-t/br-sp-Itupeva
+++ b/isdb-t/br-sp-Itupeva
@@ -1,5 +1,5 @@
 # Channel table for Itupeva - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3088
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3088
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -233,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
+# Physical channel 48 (virtual 15.1)
 [TV Rede Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Ituverava b/isdb-t/br-sp-Ituverava
index b7084518..8a1eba3b 100644
--- a/isdb-t/br-sp-Ituverava
+++ b/isdb-t/br-sp-Ituverava
@@ -1,5 +1,5 @@
 # Channel table for Ituverava - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/297
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=297
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 22.1)
-[Rede Vida]
+# Physical channel 21 (virtual 22.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Jaborandi b/isdb-t/br-sp-Jaborandi
index 67cf46f0..cf4dcca3 100644
--- a/isdb-t/br-sp-Jaborandi
+++ b/isdb-t/br-sp-Jaborandi
@@ -1,5 +1,5 @@
 # Channel table for Jaborandi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2726
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2726
 
 # Physical channel 14 (virtual 14.1)
 [Record News]
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 12.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-sp-Jaboticabal b/isdb-t/br-sp-Jaboticabal
index 90f0590b..f573cfbe 100644
--- a/isdb-t/br-sp-Jaboticabal
+++ b/isdb-t/br-sp-Jaboticabal
@@ -1,5 +1,5 @@
 # Channel table for Jaboticabal - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2691
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2691
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
-[Rede Vida]
+# Physical channel 21 (virtual 21.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Jacarei b/isdb-t/br-sp-Jacarei
index 80653491..7ef3072c 100644
--- a/isdb-t/br-sp-Jacarei
+++ b/isdb-t/br-sp-Jacarei
@@ -1,7 +1,7 @@
-# Channel table for Jacareí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1766
+# Channel table for Jacare� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1766
 
-# Physical channel 14 (virtual 25.1)
+# Physical channel 14 (virtual 14.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 29 (virtual 29.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 15.1)
 [TV Setorial]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 9.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -262,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Câmara S. José dos Campos, TV Câmara Municipal Jacareí­]
+# Physical channel 39 (virtual 39.4)
+[TV Câmara, TV Câmara Municipal Jacareí­, Rede ALESP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -378,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 38.1)
-[NGT]
+# Physical channel 48 (virtual 22.1)
+[TV Thathi SJC]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -408,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Jaci b/isdb-t/br-sp-Jaci
index 2b582d22..9961f32d 100644
--- a/isdb-t/br-sp-Jaci
+++ b/isdb-t/br-sp-Jaci
@@ -1,5 +1,5 @@
 # Channel table for Jaci - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2356
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2356
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Jacupiranga b/isdb-t/br-sp-Jacupiranga
index e393ce81..cdf6df9d 100644
--- a/isdb-t/br-sp-Jacupiranga
+++ b/isdb-t/br-sp-Jacupiranga
@@ -1,5 +1,5 @@
 # Channel table for Jacupiranga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/454
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=454
 
 # Physical channel 19 (virtual 18.1)
 [TV Tribuna]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Jaguariuna b/isdb-t/br-sp-Jaguariuna
index 53962644..c9e9975d 100644
--- a/isdb-t/br-sp-Jaguariuna
+++ b/isdb-t/br-sp-Jaguariuna
@@ -1,5 +1,5 @@
-# Channel table for Jaguariúna - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2906
+# Channel table for Jaguari�na - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2906
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -59,8 +59,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 20 (virtual 21.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -88,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 52.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 25 (virtual 12.1)
 [EPTV Campinas]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +175,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 56.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -175,8 +262,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 31 (virtual 31.1)
+[Rede Brasil de Televisão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -204,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
+# Physical channel 39 (virtual 11.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -233,6 +349,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 8.1)
+[Rede Família]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 46 (virtual 2.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
@@ -262,8 +407,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 51 (virtual 51.1)
-[RCI]
+# Physical channel 49 (virtual 48.2)
+[Rede TV!, Universo EADTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 51 (virtual 50.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-Jales b/isdb-t/br-sp-Jales
index f8cf11e7..561ba8cd 100644
--- a/isdb-t/br-sp-Jales
+++ b/isdb-t/br-sp-Jales
@@ -1,5 +1,5 @@
 # Channel table for Jales - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1315
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1315
 
 # Physical channel 20 (virtual 50.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 31.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -175,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 34.1)
+# Physical channel 33 (virtual 33.1)
 [SBT Interior/SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Jambeiro b/isdb-t/br-sp-Jambeiro
index c2a58d02..fd2209d7 100644
--- a/isdb-t/br-sp-Jambeiro
+++ b/isdb-t/br-sp-Jambeiro
@@ -1,5 +1,34 @@
 # Channel table for Jambeiro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3836
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3836
+
+# Physical channel 17 (virtual 6.1)
+[TV Vanguarda São José]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 13.1)
 [Band Vale]
diff --git a/isdb-t/br-sp-Jandira b/isdb-t/br-sp-Jandira
index 60b9c5f5..a5c9ecac 100644
--- a/isdb-t/br-sp-Jandira
+++ b/isdb-t/br-sp-Jandira
@@ -1,5 +1,5 @@
 # Channel table for Jandira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2982
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2982
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -466,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -552,8 +552,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -611,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -639,7 +639,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -668,8 +668,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -871,6 +871,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -929,8 +987,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Jardinopolis b/isdb-t/br-sp-Jardinopolis
index 41eeb4ce..961286fb 100644
--- a/isdb-t/br-sp-Jardinopolis
+++ b/isdb-t/br-sp-Jardinopolis
@@ -1,5 +1,5 @@
-# Channel table for Jardinópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2725
+# Channel table for Jardin�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2725
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 55.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -204,35 +204,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 50.1)
-[TV Canção Nova]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 28 (virtual 13.1)
 [Record TV Interior SP]
 	DELIVERY_SYSTEM = ISDBT
@@ -263,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -291,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Ribeirão Preto]
+# Physical channel 31 (virtual 6.5)
+[TV Câmara, Rede ALESP, TV Câmara Ribeirão Preto, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -320,40 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 14.1)
-[Record News]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 36 (virtual 2.1)
+# Physical channel 33 (virtual 2.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -378,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 29.1)
-[NGT]
+# Physical channel 35 (virtual 35.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -436,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 39.1)
-[RIT]
+# Physical channel 44 (virtual 49.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -465,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 49.1)
-[RBI TV]
+# Physical channel 50 (virtual 10.1)
+[TV Nova Imagem]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 689142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Jarinu b/isdb-t/br-sp-Jarinu
index d9717dc4..6599b6fb 100644
--- a/isdb-t/br-sp-Jarinu
+++ b/isdb-t/br-sp-Jarinu
@@ -1,5 +1,5 @@
 # Channel table for Jarinu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/950
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=950
 
 # Physical channel 19 (virtual 19.1)
 [TV Tem Sorocaba]
diff --git a/isdb-t/br-sp-Jau b/isdb-t/br-sp-Jau
index a7ccdcc2..61168d72 100644
--- a/isdb-t/br-sp-Jau
+++ b/isdb-t/br-sp-Jau
@@ -1,5 +1,5 @@
-# Channel table for Jaú - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/713
+# Channel table for Ja� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=713
 
 # Physical channel 18 (virtual 7.1)
 [Band Paulista]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 20.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 4.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,37 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 30.1)
-[RCI]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 34 (virtual 34.4)
-[TV Câmara, TV Câmara Jahu, Rede ALESP, TV Senado]
+# Physical channel 34 (virtual 34.5)
+[TV Câmara, TV Câmara Jahu, Rede ALESP, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -292,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 39.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -350,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 41.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Jeriquara b/isdb-t/br-sp-Jeriquara
index 76ab1f8c..6c2b57ee 100644
--- a/isdb-t/br-sp-Jeriquara
+++ b/isdb-t/br-sp-Jeriquara
@@ -1,5 +1,5 @@
 # Channel table for Jeriquara - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2799
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2799
 
 # Physical channel 39 (virtual 5.1)
 [SBT Ribeirão Preto]
diff --git a/isdb-t/br-sp-Joanopolis b/isdb-t/br-sp-Joanopolis
index a3782e08..651d30ee 100644
--- a/isdb-t/br-sp-Joanopolis
+++ b/isdb-t/br-sp-Joanopolis
@@ -1,5 +1,5 @@
-# Channel table for Joanópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/846
+# Channel table for Joan�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=846
 
 # Physical channel 17 (virtual 17.1)
 [TV Vanguarda São José]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
diff --git a/isdb-t/br-sp-JoaoRamalho b/isdb-t/br-sp-JoaoRamalho
index 9a613b58..630b6f11 100644
--- a/isdb-t/br-sp-JoaoRamalho
+++ b/isdb-t/br-sp-JoaoRamalho
@@ -1,5 +1,5 @@
-# Channel table for João Ramalho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3948
+# Channel table for Jo�o Ramalho - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3948
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-JoseBonifacio b/isdb-t/br-sp-JoseBonifacio
index 0db8e138..25a02ca1 100644
--- a/isdb-t/br-sp-JoseBonifacio
+++ b/isdb-t/br-sp-JoseBonifacio
@@ -1,5 +1,5 @@
-# Channel table for José Bonifácio - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/564
+# Channel table for Jos� Bonif�cio - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=564
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-JulioMesquita b/isdb-t/br-sp-JulioMesquita
index 779bf698..465e2bbe 100644
--- a/isdb-t/br-sp-JulioMesquita
+++ b/isdb-t/br-sp-JulioMesquita
@@ -1,5 +1,5 @@
-# Channel table for Júlio Mesquita - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3949
+# Channel table for J�lio Mesquita - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3949
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Jumirim b/isdb-t/br-sp-Jumirim
index 78b499ca..4c3e0495 100644
--- a/isdb-t/br-sp-Jumirim
+++ b/isdb-t/br-sp-Jumirim
@@ -1,5 +1,5 @@
 # Channel table for Jumirim - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3950
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3950
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Jundiai b/isdb-t/br-sp-Jundiai
index aff31817..05bdfde5 100644
--- a/isdb-t/br-sp-Jundiai
+++ b/isdb-t/br-sp-Jundiai
@@ -1,5 +1,5 @@
-# Channel table for Jundiaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2
+# Channel table for Jundia� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,8 +204,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 33 (virtual 33.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -262,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 43 (virtual 42.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
@@ -320,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 60.4)
-[TV Câmara, TV Câmara Municipal Jundiaí, TV Senado, Rede ALESP]
+# Physical channel 45 (virtual 12.4)
+[TV Câmara, TV Câmara Municipal Jundiaí, Rede ALESP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -350,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -378,7 +436,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
+# Physical channel 48 (virtual 15.1)
 [TV Rede Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Junqueiropolis b/isdb-t/br-sp-Junqueiropolis
index 765cad3b..a3edaef9 100644
--- a/isdb-t/br-sp-Junqueiropolis
+++ b/isdb-t/br-sp-Junqueiropolis
@@ -1,8 +1,8 @@
-# Channel table for Junqueirópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3692
+# Channel table for Junqueir�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3692
 
-# Physical channel 25 (virtual 56.1)
-[Rede Vida]
+# Physical channel 25 (virtual 25.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-Juquia b/isdb-t/br-sp-Juquia
index 6e9a9388..a98f3a4e 100644
--- a/isdb-t/br-sp-Juquia
+++ b/isdb-t/br-sp-Juquia
@@ -1,5 +1,5 @@
-# Channel table for Juquiá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/450
+# Channel table for Juqui� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=450
 
 # Physical channel 19 (virtual 18.1)
 [TV Tribuna]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
+# Physical channel 33 (virtual 33.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 38.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Juquitiba b/isdb-t/br-sp-Juquitiba
index ca150a5e..5fd71f4c 100644
--- a/isdb-t/br-sp-Juquitiba
+++ b/isdb-t/br-sp-Juquitiba
@@ -1,5 +1,5 @@
 # Channel table for Juquitiba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3790
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3790
 
 # Physical channel 20 (virtual 7.1)
 [Record TV]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Lagoinha b/isdb-t/br-sp-Lagoinha
index 15691e93..22108c32 100644
--- a/isdb-t/br-sp-Lagoinha
+++ b/isdb-t/br-sp-Lagoinha
@@ -1,5 +1,5 @@
 # Channel table for Lagoinha - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2929
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2929
 
 # Physical channel 23 (virtual 12.1)
 [Band Vale]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-LaranjalPaulista b/isdb-t/br-sp-LaranjalPaulista
index f66f9116..5ad85c56 100644
--- a/isdb-t/br-sp-LaranjalPaulista
+++ b/isdb-t/br-sp-LaranjalPaulista
@@ -1,5 +1,5 @@
 # Channel table for Laranjal Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2935
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2935
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Itapetininga]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 20.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
diff --git a/isdb-t/br-sp-Lavinia b/isdb-t/br-sp-Lavinia
index 74fd71fc..994c29f5 100644
--- a/isdb-t/br-sp-Lavinia
+++ b/isdb-t/br-sp-Lavinia
@@ -1,5 +1,5 @@
-# Channel table for Lavínia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3951
+# Channel table for Lav�nia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3951
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Lavrinhas b/isdb-t/br-sp-Lavrinhas
index abd91612..90ea4dfc 100644
--- a/isdb-t/br-sp-Lavrinhas
+++ b/isdb-t/br-sp-Lavrinhas
@@ -1,5 +1,5 @@
 # Channel table for Lavrinhas - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3907
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3907
 
 # Physical channel 22 (virtual 22.1)
 [Band Vale]
diff --git a/isdb-t/br-sp-Leme b/isdb-t/br-sp-Leme
index 97592c7e..47f98dd8 100644
--- a/isdb-t/br-sp-Leme
+++ b/isdb-t/br-sp-Leme
@@ -1,5 +1,5 @@
 # Channel table for Leme - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1518
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1518
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 34.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 30 (virtual 30.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 5.1)
+# Physical channel 39 (virtual 39.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.2)
+[TV 41]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 6.1)
 [EPTV Central]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-LencoisPaulista b/isdb-t/br-sp-LencoisPaulista
index 1a44127c..5015cf9d 100644
--- a/isdb-t/br-sp-LencoisPaulista
+++ b/isdb-t/br-sp-LencoisPaulista
@@ -1,5 +1,5 @@
-# Channel table for Lençóis Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/34
+# Channel table for Len��is Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=34
 
 # Physical channel 17 (virtual 17.1)
 [Band Paulista]
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 8.1)
+# Physical channel 27 (virtual 28.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 35 (virtual 35.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -146,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 14.1)
+# Physical channel 38 (virtual 38.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,3 +204,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 43.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Limeira b/isdb-t/br-sp-Limeira
index 45ab5f8e..a613ba2e 100644
--- a/isdb-t/br-sp-Limeira
+++ b/isdb-t/br-sp-Limeira
@@ -1,11 +1,11 @@
 # Channel table for Limeira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/48
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=48
 
-# Physical channel 16 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,7 +59,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 30.1)
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 29.1)
 [VTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -146,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 39.1)
-[TV Jornal]
+# Physical channel 41 (virtual 41.1)
+[TV 41]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 43.1)
-[Rede Século 21]
+# Physical channel 44 (virtual 8.1)
+[Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 8.1)
-[Rede Família]
+# Physical channel 46 (virtual 6.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 665142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 6.1)
-[TVB]
+# Physical channel 48 (virtual 39.1)
+[TV Jornal Limeira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Lindoia b/isdb-t/br-sp-Lindoia
index 096baa32..d4081cea 100644
--- a/isdb-t/br-sp-Lindoia
+++ b/isdb-t/br-sp-Lindoia
@@ -1,8 +1,37 @@
-# Channel table for Lindóia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2522
+# Channel table for Lind�ia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2522
+
+# Physical channel 28 (virtual 28.1)
+[VTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-Lins b/isdb-t/br-sp-Lins
index 084ee8ef..53444c8b 100644
--- a/isdb-t/br-sp-Lins
+++ b/isdb-t/br-sp-Lins
@@ -1,5 +1,5 @@
 # Channel table for Lins - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/573
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=573
 
 # Physical channel 16 (virtual 16.1)
 [Rede Vida]
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 12.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Lorena b/isdb-t/br-sp-Lorena
index dd8a4bce..7977ef35 100644
--- a/isdb-t/br-sp-Lorena
+++ b/isdb-t/br-sp-Lorena
@@ -1,5 +1,5 @@
 # Channel table for Lorena - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/496
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=496
 
 # Physical channel 22 (virtual 54.1)
 [Band Vale]
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 9.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 8.1)
+# Physical channel 42 (virtual 42.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Lourdes b/isdb-t/br-sp-Lourdes
index 8437c3ca..f163ed18 100644
--- a/isdb-t/br-sp-Lourdes
+++ b/isdb-t/br-sp-Lourdes
@@ -1,5 +1,5 @@
 # Channel table for Lourdes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3952
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3952
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Louveira b/isdb-t/br-sp-Louveira
index bdd23434..5fed1d27 100644
--- a/isdb-t/br-sp-Louveira
+++ b/isdb-t/br-sp-Louveira
@@ -1,5 +1,5 @@
 # Channel table for Louveira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3668
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3668
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 51.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-Lucelia b/isdb-t/br-sp-Lucelia
index 05edd7aa..06a141f0 100644
--- a/isdb-t/br-sp-Lucelia
+++ b/isdb-t/br-sp-Lucelia
@@ -1,5 +1,5 @@
-# Channel table for Lucélia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4017
+# Channel table for Luc�lia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4017
 
 # Physical channel 30 (virtual 30.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Lucianopolis b/isdb-t/br-sp-Lucianopolis
index cdbdd8e9..1378b2d4 100644
--- a/isdb-t/br-sp-Lucianopolis
+++ b/isdb-t/br-sp-Lucianopolis
@@ -1,5 +1,5 @@
-# Channel table for Lucianópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3893
+# Channel table for Lucian�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3893
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-LuisAntonio b/isdb-t/br-sp-LuisAntonio
index 7276a78c..6c7154b3 100644
--- a/isdb-t/br-sp-LuisAntonio
+++ b/isdb-t/br-sp-LuisAntonio
@@ -1,5 +1,5 @@
-# Channel table for Luís Antônio - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2754
+# Channel table for Lu�s Ant�nio - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2754
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 30 (virtual 30.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-Luiziania b/isdb-t/br-sp-Luiziania
index 6adbae30..7bd4b678 100644
--- a/isdb-t/br-sp-Luiziania
+++ b/isdb-t/br-sp-Luiziania
@@ -1,5 +1,5 @@
-# Channel table for Luiziânia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3792
+# Channel table for Luizi�nia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3792
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Lupercio b/isdb-t/br-sp-Lupercio
index 336c3b5e..7d36c303 100644
--- a/isdb-t/br-sp-Lupercio
+++ b/isdb-t/br-sp-Lupercio
@@ -1,5 +1,5 @@
-# Channel table for Lupércio - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3504
+# Channel table for Lup�rcio - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3504
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Lutecia b/isdb-t/br-sp-Lutecia
index dbbb810d..dac191b7 100644
--- a/isdb-t/br-sp-Lutecia
+++ b/isdb-t/br-sp-Lutecia
@@ -1,5 +1,5 @@
-# Channel table for Lutécia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3505
+# Channel table for Lut�cia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3505
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Macatuba b/isdb-t/br-sp-Macatuba
index 2a29fb20..024fbeb9 100644
--- a/isdb-t/br-sp-Macatuba
+++ b/isdb-t/br-sp-Macatuba
@@ -1,5 +1,5 @@
 # Channel table for Macatuba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2815
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2815
 
 # Physical channel 18 (virtual 7.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Macaubal b/isdb-t/br-sp-Macaubal
index bf8275bd..537c5479 100644
--- a/isdb-t/br-sp-Macaubal
+++ b/isdb-t/br-sp-Macaubal
@@ -1,5 +1,5 @@
 # Channel table for Macaubal - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3953
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3953
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Macedonia b/isdb-t/br-sp-Macedonia
index b0b8db78..a4c83723 100644
--- a/isdb-t/br-sp-Macedonia
+++ b/isdb-t/br-sp-Macedonia
@@ -1,5 +1,5 @@
-# Channel table for Macedônia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3679
+# Channel table for Maced�nia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3679
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Magda b/isdb-t/br-sp-Magda
index 1578acad..553968bc 100644
--- a/isdb-t/br-sp-Magda
+++ b/isdb-t/br-sp-Magda
@@ -1,5 +1,5 @@
 # Channel table for Magda - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3860
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3860
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Mairinque b/isdb-t/br-sp-Mairinque
index a64674d4..02270659 100644
--- a/isdb-t/br-sp-Mairinque
+++ b/isdb-t/br-sp-Mairinque
@@ -1,5 +1,5 @@
 # Channel table for Mairinque - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1000
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1000
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Sorocaba]
diff --git a/isdb-t/br-sp-Mairipora b/isdb-t/br-sp-Mairipora
index edb732ce..46723efd 100644
--- a/isdb-t/br-sp-Mairipora
+++ b/isdb-t/br-sp-Mairipora
@@ -1,8 +1,8 @@
-# Channel table for Mairiporã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3401
+# Channel table for Mairipor� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3401
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
diff --git a/isdb-t/br-sp-Manduri b/isdb-t/br-sp-Manduri
index ac1c317f..2865cb5d 100644
--- a/isdb-t/br-sp-Manduri
+++ b/isdb-t/br-sp-Manduri
@@ -1,5 +1,5 @@
 # Channel table for Manduri - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/662
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=662
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-MarabaPaulista b/isdb-t/br-sp-MarabaPaulista
index 1fac5420..dfdd8920 100644
--- a/isdb-t/br-sp-MarabaPaulista
+++ b/isdb-t/br-sp-MarabaPaulista
@@ -1,5 +1,5 @@
-# Channel table for Marabá Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2964
+# Channel table for Marab� Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2964
 
 # Physical channel 26 (virtual 16.1)
 [Rede Vida]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-Maracai b/isdb-t/br-sp-Maracai
index 7ce06ab6..728cce1f 100644
--- a/isdb-t/br-sp-Maracai
+++ b/isdb-t/br-sp-Maracai
@@ -1,5 +1,5 @@
-# Channel table for Maracaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3801
+# Channel table for Maraca� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3801
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Marapoama b/isdb-t/br-sp-Marapoama
index e160339b..6a7a414f 100644
--- a/isdb-t/br-sp-Marapoama
+++ b/isdb-t/br-sp-Marapoama
@@ -1,5 +1,5 @@
 # Channel table for Marapoama - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3797
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3797
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Mariapolis b/isdb-t/br-sp-Mariapolis
index 42e3056e..e5f0cba2 100644
--- a/isdb-t/br-sp-Mariapolis
+++ b/isdb-t/br-sp-Mariapolis
@@ -1,5 +1,5 @@
-# Channel table for Mariápolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3766
+# Channel table for Mari�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3766
 
 # Physical channel 31 (virtual 31.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Marilia b/isdb-t/br-sp-Marilia
index ed0b9282..dca0ad78 100644
--- a/isdb-t/br-sp-Marilia
+++ b/isdb-t/br-sp-Marilia
@@ -1,5 +1,5 @@
-# Channel table for Marília - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/8
+# Channel table for Mar�lia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=8
 
 # Physical channel 14 (virtual 46.1)
 [RBI TV]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 51.4)
-[TV Brasil, TV Brasil 2, Canal sem transmissão, Canal sem transmissão]
+[TV Brasil, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 15.1)
-[Rede Vida]
+# Physical channel 16 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.4)
-[TV Câmara, TV Câmara Municipal Marí­lia, Rede ALESP, TV Senado]
+# Physical channel 31 (virtual 31.5)
+[TV Câmara, TV Câmara Municipal Marí­lia, Rede ALESP, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -378,3 +378,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 36.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Marinopolis b/isdb-t/br-sp-Marinopolis
index a5275c5e..37c881af 100644
--- a/isdb-t/br-sp-Marinopolis
+++ b/isdb-t/br-sp-Marinopolis
@@ -1,5 +1,5 @@
-# Channel table for Marinópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3954
+# Channel table for Marin�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3954
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Martinopolis b/isdb-t/br-sp-Martinopolis
index ab68975e..5c71bcf7 100644
--- a/isdb-t/br-sp-Martinopolis
+++ b/isdb-t/br-sp-Martinopolis
@@ -1,8 +1,8 @@
-# Channel table for Martinópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3501
+# Channel table for Martin�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3501
 
-# Physical channel 15 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -175,3 +175,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 45 (virtual 56.1)
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Matao b/isdb-t/br-sp-Matao
index 109751eb..4d78aa52 100644
--- a/isdb-t/br-sp-Matao
+++ b/isdb-t/br-sp-Matao
@@ -1,5 +1,5 @@
-# Channel table for Matão - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/787
+# Channel table for Mat�o - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=787
 
 # Physical channel 14 (virtual 14.1)
 [TV Matão]
@@ -59,7 +59,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 12.1)
+# Physical channel 20 (virtual 20.2)
+[Rede Século 21, Rede Século 21 Educa]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 24.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 10.1)
+# Physical channel 28 (virtual 13.1)
 [Record TV Interior SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 7.1)
-[TV Cultura Paulista]
+# Physical channel 34 (virtual 7.3)
+[TV Cultura Paulista, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -204,6 +233,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 40 (virtual 43.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 6.1)
 [EPTV Central]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Maua b/isdb-t/br-sp-Maua
new file mode 100644
index 00000000..de51bdde
--- /dev/null
+++ b/isdb-t/br-sp-Maua
@@ -0,0 +1,873 @@
+# Channel table for Mau� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4134
+
+# Physical channel 14 (virtual 14.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 15 (virtual 16.1)
+[Mega TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 48.1)
+[NGT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 11.1)
+[TV Gazeta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 5.1)
+[TV Globo SP]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 7.1)
+[Record TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 49.1)
+[Terra Viva]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 21.1)
+[Rede 21]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 13.1)
+[Band]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 2.3)
+[TV Cultura, Univesp, TV Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 25.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 27.1)
+[CNT Americana]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 53.1)
+[Rede Gospel]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 28 (virtual 4.1)
+[SBT SP]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 563142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 31 (virtual 32.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 10.1)
+[TV Templo]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 33.3)
+[Top TV, Kiss TV, Canal sem transmissão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 36 (virtual 36.1)
+[Mais Família]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 38 (virtual 1.4)
+[TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 40.1)
+[TV Sul Bahia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 41.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 42.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 44.1)
+[TVT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 45 (virtual 45.1)
+[Boa Vontade TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 659142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 55.1)
+[TV8]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Mendonca b/isdb-t/br-sp-Mendonca
index 813bedc3..7c6c915a 100644
--- a/isdb-t/br-sp-Mendonca
+++ b/isdb-t/br-sp-Mendonca
@@ -1,5 +1,5 @@
-# Channel table for Mendonça - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2943
+# Channel table for Mendon�a - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2943
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Meridiano b/isdb-t/br-sp-Meridiano
index 141fee92..45b20e00 100644
--- a/isdb-t/br-sp-Meridiano
+++ b/isdb-t/br-sp-Meridiano
@@ -1,5 +1,5 @@
 # Channel table for Meridiano - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3955
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3955
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Miguelopolis b/isdb-t/br-sp-Miguelopolis
index 778656b3..9da3a470 100644
--- a/isdb-t/br-sp-Miguelopolis
+++ b/isdb-t/br-sp-Miguelopolis
@@ -1,5 +1,5 @@
-# Channel table for Miguelópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2849
+# Channel table for Miguel�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2849
 
 # Physical channel 21 (virtual 22.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-MineirosDoTiete b/isdb-t/br-sp-MineirosDoTiete
index 2c61644e..4712867c 100644
--- a/isdb-t/br-sp-MineirosDoTiete
+++ b/isdb-t/br-sp-MineirosDoTiete
@@ -1,5 +1,5 @@
-# Channel table for Mineiros Do Tietê - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3956
+# Channel table for Mineiros Do Tiet� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3956
 
 # Physical channel 22 (virtual 40.1)
 [TV Canção Nova]
diff --git a/isdb-t/br-sp-Miracatu b/isdb-t/br-sp-Miracatu
index 1adb4df6..e4daa236 100644
--- a/isdb-t/br-sp-Miracatu
+++ b/isdb-t/br-sp-Miracatu
@@ -1,5 +1,5 @@
 # Channel table for Miracatu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/453
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=453
 
 # Physical channel 15 (virtual 41.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.2)
-[TV Cultura, Multicultura, Univesp]
+[TV Cultura, TV Educação, Univesp]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Mirandopolis b/isdb-t/br-sp-Mirandopolis
index dce0345e..6dcd8117 100644
--- a/isdb-t/br-sp-Mirandopolis
+++ b/isdb-t/br-sp-Mirandopolis
@@ -1,5 +1,5 @@
-# Channel table for Mirandópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/700
+# Channel table for Mirand�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=700
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 5.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-MiranteDoParanapanema b/isdb-t/br-sp-MiranteDoParanapanema
index 12374fa8..0f32ba16 100644
--- a/isdb-t/br-sp-MiranteDoParanapanema
+++ b/isdb-t/br-sp-MiranteDoParanapanema
@@ -1,8 +1,8 @@
 # Channel table for Mirante Do Paranapanema - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3268
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3268
 
-# Physical channel 16 (virtual 16.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.1)
+# Physical channel 32 (virtual 32.1)
 [TV Fronteira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 575142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Mirassol b/isdb-t/br-sp-Mirassol
index 4653b275..54bb5ea7 100644
--- a/isdb-t/br-sp-Mirassol
+++ b/isdb-t/br-sp-Mirassol
@@ -1,5 +1,5 @@
 # Channel table for Mirassol - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/434
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=434
 
 # Physical channel 14 (virtual 14.1)
 [TV Canção Nova]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 16.1)
+[TV Rio Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 17 (virtual 59.1)
 [TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 15.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -146,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV Câmara São José do Rio Preto, Rede ALESP, TV Senado]
+# Physical channel 28 (virtual 28.5)
+[TV Câmara, TV Câmara São José do Rio Preto, Rede ALESP, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -176,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -204,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 11.1)
-[Rede Vida]
+# Physical channel 32 (virtual 11.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -233,7 +262,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 9.1)
+# Physical channel 34 (virtual 9.2)
 [SBT Interior/SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -262,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[NGT]
+# Physical channel 39 (virtual 39.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 623142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.1)
-[TV Gazeta]
+# Physical channel 40 (virtual 19.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 623142857
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 19.1)
-[RIT]
+# Physical channel 42 (virtual 7.1)
+[Record TV Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 629142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 7.1)
-[Record TV Rio Preto]
+# Physical channel 43 (virtual 43.1)
+[TV Morada do Sol]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -407,6 +436,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[Rede América]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 13.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Mirassolandia b/isdb-t/br-sp-Mirassolandia
index 5632f9e0..bb770355 100644
--- a/isdb-t/br-sp-Mirassolandia
+++ b/isdb-t/br-sp-Mirassolandia
@@ -1,5 +1,5 @@
-# Channel table for Mirassolândia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3705
+# Channel table for Mirassol�ndia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3705
 
 # Physical channel 24 (virtual 5.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Mococa b/isdb-t/br-sp-Mococa
index 6b242658..df3eda34 100644
--- a/isdb-t/br-sp-Mococa
+++ b/isdb-t/br-sp-Mococa
@@ -1,11 +1,11 @@
 # Channel table for Mococa - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/248
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=248
 
-# Physical channel 16 (virtual 9.1)
+# Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 497142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 18.1)
+# Physical channel 19 (virtual 48.1)
 [TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 41.1)
-[RCI]
+# Physical channel 41 (virtual 46.1)
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-sp-MogiDasCruzes b/isdb-t/br-sp-MogiDasCruzes
index ca766856..5bcd8c0a 100644
--- a/isdb-t/br-sp-MogiDasCruzes
+++ b/isdb-t/br-sp-MogiDasCruzes
@@ -1,5 +1,5 @@
 # Channel table for Mogi Das Cruzes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/140
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=140
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -494,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -552,37 +552,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[TV Eldorado]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 38 (virtual 62.4)
-[TV Brasil Sat, TV Brasil 2, TV Escola, Canal Saúde]
+# Physical channel 38 (virtual 1.4)
+[TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -610,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -755,7 +726,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 46.1)
+# Physical channel 44 (virtual 44.1)
 [TVT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -871,8 +842,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 60.3)
-[TV Câmara, TV Câmara Mogi das Cruzes, Rede ALESP]
+# Physical channel 50 (virtual 3.4)
+[TV Câmara, TV Câmara Mogi das Cruzes, Rede ALESP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-MogiGuacu b/isdb-t/br-sp-MogiGuacu
index 81041417..a3658b4d 100644
--- a/isdb-t/br-sp-MogiGuacu
+++ b/isdb-t/br-sp-MogiGuacu
@@ -1,5 +1,5 @@
-# Channel table for Mogi Guaçu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/482
+# Channel table for Mogi Gua�u - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=482
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 9.1)
-[TV Vale Verde]
+# Physical channel 23 (virtual 23.1)
+[Rede Século 21]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 497142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[Rede Século 21]
+# Physical channel 27 (virtual 19.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 19.1)
-[TV Canção Nova]
+# Physical channel 34 (virtual 34.1)
+[TV Vale Verde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 27.1)
-[TVB]
+# Physical channel 46 (virtual 6.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-MogiMirim b/isdb-t/br-sp-MogiMirim
index 08857a38..a73dac8e 100644
--- a/isdb-t/br-sp-MogiMirim
+++ b/isdb-t/br-sp-MogiMirim
@@ -1,5 +1,5 @@
 # Channel table for Mogi Mirim - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3312
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3312
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 9.1)
-[TV Vale Verde]
+# Physical channel 23 (virtual 23.1)
+[Rede Século 21]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 497142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 23.1)
-[Rede Século 21]
+# Physical channel 27 (virtual 19.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 551142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 19.1)
-[TV Canção Nova]
+# Physical channel 34 (virtual 34.1)
+[TV Vale Verde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 27.1)
-[TVB]
+# Physical channel 46 (virtual 6.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-Mombuca b/isdb-t/br-sp-Mombuca
index d767ed75..ba96ffa9 100644
--- a/isdb-t/br-sp-Mombuca
+++ b/isdb-t/br-sp-Mombuca
@@ -1,5 +1,5 @@
 # Channel table for Mombuca - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3669
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3669
 
 # Physical channel 25 (virtual 12.1)
 [EPTV Campinas]
diff --git a/isdb-t/br-sp-Mongagua b/isdb-t/br-sp-Mongagua
index 6b9a9f23..708e1294 100644
--- a/isdb-t/br-sp-Mongagua
+++ b/isdb-t/br-sp-Mongagua
@@ -1,5 +1,5 @@
-# Channel table for Mongaguá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/217
+# Channel table for Mongagu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=217
 
 # Physical channel 15 (virtual 16.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 24.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 8.1)
+# Physical channel 34 (virtual 34.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 44.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -204,35 +204,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 53.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 49 (virtual 52.1)
 [TV Santa Cecília]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-MonteAlegreDoSul b/isdb-t/br-sp-MonteAlegreDoSul
index 5c05abf7..ad5e8c00 100644
--- a/isdb-t/br-sp-MonteAlegreDoSul
+++ b/isdb-t/br-sp-MonteAlegreDoSul
@@ -1,5 +1,5 @@
 # Channel table for Monte Alegre Do Sul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4010
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4010
 
 # Physical channel 15 (virtual 15.1)
 [Band Mais]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-MonteAlto b/isdb-t/br-sp-MonteAlto
index b8a86d23..67f60589 100644
--- a/isdb-t/br-sp-MonteAlto
+++ b/isdb-t/br-sp-MonteAlto
@@ -1,5 +1,5 @@
 # Channel table for Monte Alto - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2802
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2802
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-MonteAprazivel b/isdb-t/br-sp-MonteAprazivel
index 76a4d079..3182769c 100644
--- a/isdb-t/br-sp-MonteAprazivel
+++ b/isdb-t/br-sp-MonteAprazivel
@@ -1,5 +1,5 @@
-# Channel table for Monte Aprazível - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2898
+# Channel table for Monte Apraz�vel - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2898
 
 # Physical channel 20 (virtual 21.1)
 [RBI TV]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-MonteAzulPaulista b/isdb-t/br-sp-MonteAzulPaulista
index 78117494..482e0f9d 100644
--- a/isdb-t/br-sp-MonteAzulPaulista
+++ b/isdb-t/br-sp-MonteAzulPaulista
@@ -1,5 +1,5 @@
 # Channel table for Monte Azul Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2851
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2851
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 5.1)
+# Physical channel 39 (virtual 39.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-MonteCastelo b/isdb-t/br-sp-MonteCastelo
index 5bcedccd..65f67d64 100644
--- a/isdb-t/br-sp-MonteCastelo
+++ b/isdb-t/br-sp-MonteCastelo
@@ -1,5 +1,5 @@
 # Channel table for Monte Castelo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4014
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4014
 
 # Physical channel 31 (virtual 31.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-MonteiroLobato b/isdb-t/br-sp-MonteiroLobato
index 42c81269..85e691fa 100644
--- a/isdb-t/br-sp-MonteiroLobato
+++ b/isdb-t/br-sp-MonteiroLobato
@@ -1,5 +1,5 @@
 # Channel table for Monteiro Lobato - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2930
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2930
 
 # Physical channel 22 (virtual 22.1)
 [Band Vale]
@@ -59,8 +59,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 23.1)
+[TV Vanguarda São José]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-MorroAgudo b/isdb-t/br-sp-MorroAgudo
index cb36585c..48df96c6 100644
--- a/isdb-t/br-sp-MorroAgudo
+++ b/isdb-t/br-sp-MorroAgudo
@@ -1,5 +1,5 @@
 # Channel table for Morro Agudo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2850
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2850
 
 # Physical channel 39 (virtual 5.1)
 [SBT Ribeirão Preto]
diff --git a/isdb-t/br-sp-Morungaba b/isdb-t/br-sp-Morungaba
index e0587df0..bc560c01 100644
--- a/isdb-t/br-sp-Morungaba
+++ b/isdb-t/br-sp-Morungaba
@@ -1,5 +1,5 @@
 # Channel table for Morungaba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2523
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2523
 
 # Physical channel 16 (virtual 16.1)
 [Band Mais]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[Univesp, TV Cultura, Multicultura]
+[Univesp, TV Cultura, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-MurutingaDoSul b/isdb-t/br-sp-MurutingaDoSul
index 44e1af27..280d1567 100644
--- a/isdb-t/br-sp-MurutingaDoSul
+++ b/isdb-t/br-sp-MurutingaDoSul
@@ -1,5 +1,5 @@
 # Channel table for Murutinga Do Sul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3957
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3957
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Nantes b/isdb-t/br-sp-Nantes
index f9d8d35a..cf94ccd6 100644
--- a/isdb-t/br-sp-Nantes
+++ b/isdb-t/br-sp-Nantes
@@ -1,5 +1,5 @@
 # Channel table for Nantes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4021
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4021
 
 # Physical channel 31 (virtual 31.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Narandiba b/isdb-t/br-sp-Narandiba
index 1fd71da1..5e978dff 100644
--- a/isdb-t/br-sp-Narandiba
+++ b/isdb-t/br-sp-Narandiba
@@ -1,5 +1,5 @@
 # Channel table for Narandiba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3693
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3693
 
 # Physical channel 19 (virtual 10.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-NatividadeDaSerra b/isdb-t/br-sp-NatividadeDaSerra
index 97b8fbde..1971e30a 100644
--- a/isdb-t/br-sp-NatividadeDaSerra
+++ b/isdb-t/br-sp-NatividadeDaSerra
@@ -1,5 +1,5 @@
 # Channel table for Natividade Da Serra - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/847
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=847
 
 # Physical channel 23 (virtual 13.1)
 [Band Vale]
diff --git a/isdb-t/br-sp-NazarePaulista b/isdb-t/br-sp-NazarePaulista
index 46c8fdd4..8c229e5b 100644
--- a/isdb-t/br-sp-NazarePaulista
+++ b/isdb-t/br-sp-NazarePaulista
@@ -1,5 +1,5 @@
-# Channel table for Nazaré Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2854
+# Channel table for Nazar� Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2854
 
 # Physical channel 47 (virtual 47.1)
 [TV Vanguarda São José]
diff --git a/isdb-t/br-sp-NevesPaulista b/isdb-t/br-sp-NevesPaulista
index fa50dc5d..f9245216 100644
--- a/isdb-t/br-sp-NevesPaulista
+++ b/isdb-t/br-sp-NevesPaulista
@@ -1,5 +1,5 @@
 # Channel table for Neves Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/561
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=561
 
 # Physical channel 24 (virtual 5.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Nhandeara b/isdb-t/br-sp-Nhandeara
index 9bb127ba..1f145144 100644
--- a/isdb-t/br-sp-Nhandeara
+++ b/isdb-t/br-sp-Nhandeara
@@ -1,5 +1,34 @@
 # Channel table for Nhandeara - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2914
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2914
+
+# Physical channel 20 (virtual 21.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Nipoa b/isdb-t/br-sp-Nipoa
index cfe08d17..7a6e094e 100644
--- a/isdb-t/br-sp-Nipoa
+++ b/isdb-t/br-sp-Nipoa
@@ -1,5 +1,5 @@
-# Channel table for Nipoã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3718
+# Channel table for Nipo� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3718
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-NovaAlianca b/isdb-t/br-sp-NovaAlianca
index c36add3c..7938e59e 100644
--- a/isdb-t/br-sp-NovaAlianca
+++ b/isdb-t/br-sp-NovaAlianca
@@ -1,5 +1,5 @@
-# Channel table for Nova Aliança - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3706
+# Channel table for Nova Alian�a - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3706
 
 # Physical channel 24 (virtual 5.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-NovaCampina b/isdb-t/br-sp-NovaCampina
index 8171b8a4..8e275713 100644
--- a/isdb-t/br-sp-NovaCampina
+++ b/isdb-t/br-sp-NovaCampina
@@ -1,5 +1,5 @@
 # Channel table for Nova Campina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2121
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2121
 
 # Physical channel 20 (virtual 35.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-NovaCanaaPaulista b/isdb-t/br-sp-NovaCanaaPaulista
index bb8abccd..6b54e560 100644
--- a/isdb-t/br-sp-NovaCanaaPaulista
+++ b/isdb-t/br-sp-NovaCanaaPaulista
@@ -1,5 +1,5 @@
-# Channel table for Nova Canaã Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3958
+# Channel table for Nova Cana� Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3958
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-NovaCastilho b/isdb-t/br-sp-NovaCastilho
index 70336178..1acdcb40 100644
--- a/isdb-t/br-sp-NovaCastilho
+++ b/isdb-t/br-sp-NovaCastilho
@@ -1,5 +1,5 @@
 # Channel table for Nova Castilho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3959
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3959
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-NovaEuropa b/isdb-t/br-sp-NovaEuropa
index 48d6462c..9be8d2ee 100644
--- a/isdb-t/br-sp-NovaEuropa
+++ b/isdb-t/br-sp-NovaEuropa
@@ -1,5 +1,34 @@
 # Channel table for Nova Europa - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/772
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=772
+
+# Physical channel 16 (virtual 9.1)
+[TV Clube Ribeirão Preto]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 6.1)
 [EPTV Central]
@@ -31,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -88,3 +117,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 45.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-NovaGranada b/isdb-t/br-sp-NovaGranada
index 257a3d71..8e3d9dbe 100644
--- a/isdb-t/br-sp-NovaGranada
+++ b/isdb-t/br-sp-NovaGranada
@@ -1,5 +1,5 @@
 # Channel table for Nova Granada - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3707
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3707
 
 # Physical channel 24 (virtual 5.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-NovaGuataporanga b/isdb-t/br-sp-NovaGuataporanga
index 53011a96..715c6d79 100644
--- a/isdb-t/br-sp-NovaGuataporanga
+++ b/isdb-t/br-sp-NovaGuataporanga
@@ -1,5 +1,5 @@
 # Channel table for Nova Guataporanga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3771
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3771
 
 # Physical channel 32 (virtual 32.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-NovaIndependencia b/isdb-t/br-sp-NovaIndependencia
index 4dc8307a..342b0db8 100644
--- a/isdb-t/br-sp-NovaIndependencia
+++ b/isdb-t/br-sp-NovaIndependencia
@@ -1,5 +1,5 @@
-# Channel table for Nova Independência - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3960
+# Channel table for Nova Independ�ncia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3960
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-NovaLuzitania b/isdb-t/br-sp-NovaLuzitania
index efb5efd3..fcef3bdd 100644
--- a/isdb-t/br-sp-NovaLuzitania
+++ b/isdb-t/br-sp-NovaLuzitania
@@ -1,5 +1,5 @@
-# Channel table for Nova Luzitânia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3961
+# Channel table for Nova Luzit�nia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3961
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-NovaOdessa b/isdb-t/br-sp-NovaOdessa
index 56839e76..e98a9e67 100644
--- a/isdb-t/br-sp-NovaOdessa
+++ b/isdb-t/br-sp-NovaOdessa
@@ -1,5 +1,5 @@
 # Channel table for Nova Odessa - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3671
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3671
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -349,7 +349,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
+# Physical channel 39 (virtual 11.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
-[Rede TV!]
+# Physical channel 49 (virtual 48.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-Novais b/isdb-t/br-sp-Novais
index a6d569c1..f810b8bc 100644
--- a/isdb-t/br-sp-Novais
+++ b/isdb-t/br-sp-Novais
@@ -1,5 +1,5 @@
 # Channel table for Novais - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3720
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3720
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-NovoHorizonte b/isdb-t/br-sp-NovoHorizonte
index 601825eb..565040e0 100644
--- a/isdb-t/br-sp-NovoHorizonte
+++ b/isdb-t/br-sp-NovoHorizonte
@@ -1,5 +1,34 @@
 # Channel table for Novo Horizonte - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2511
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2511
+
+# Physical channel 23 (virtual 23.1)
+[SBT Central]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -117,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 12.1)
-[SBT Central]
+# Physical channel 32 (virtual 32.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 41.1)
+# Physical channel 44 (virtual 44.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Nuporanga b/isdb-t/br-sp-Nuporanga
index ea552586..66faf160 100644
--- a/isdb-t/br-sp-Nuporanga
+++ b/isdb-t/br-sp-Nuporanga
@@ -1,5 +1,5 @@
 # Channel table for Nuporanga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2855
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2855
 
 # Physical channel 42 (virtual 7.1)
 [EPTV Ribeirão]
diff --git a/isdb-t/br-sp-Ocaucu b/isdb-t/br-sp-Ocaucu
index a61abdb0..2b8cc502 100644
--- a/isdb-t/br-sp-Ocaucu
+++ b/isdb-t/br-sp-Ocaucu
@@ -1,5 +1,5 @@
-# Channel table for Ocauçu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3722
+# Channel table for Ocau�u - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3722
 
 # Physical channel 16 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Olimpia b/isdb-t/br-sp-Olimpia
index b277349c..45151c54 100644
--- a/isdb-t/br-sp-Olimpia
+++ b/isdb-t/br-sp-Olimpia
@@ -1,5 +1,34 @@
-# Channel table for Olímpia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/778
+# Channel table for Ol�mpia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=778
+
+# Physical channel 20 (virtual 21.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 58.1)
 [Band Paulista]
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -117,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 31.1)
-[Rede Vida]
+# Physical channel 32 (virtual 31.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-OndaVerde b/isdb-t/br-sp-OndaVerde
index bc2841f8..b73ea9c3 100644
--- a/isdb-t/br-sp-OndaVerde
+++ b/isdb-t/br-sp-OndaVerde
@@ -1,5 +1,150 @@
 # Channel table for Onda Verde - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3708
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3708
+
+# Physical channel 14 (virtual 14.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 16.1)
+[TV Rio Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 17 (virtual 59.1)
+[TV Gazeta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 21.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 22 (virtual 15.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 5.1)
 [Band Paulista]
@@ -59,6 +204,64 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 28 (virtual 28.4)
+[TV Câmara, TV Câmara Municipal, Rede ALESP, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 4.3)
+[TV Cultura, Univesp, TV Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 32 (virtual 11.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,6 +320,93 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 38.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 39 (virtual 39.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 19.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 7.1)
 [Record TV Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
@@ -146,7 +436,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 42.1)
+# Physical channel 43 (virtual 43.1)
+[TV Morada do Sol]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 44.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,3 +494,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 13.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Oriente b/isdb-t/br-sp-Oriente
index f7aa234c..42823302 100644
--- a/isdb-t/br-sp-Oriente
+++ b/isdb-t/br-sp-Oriente
@@ -1,5 +1,5 @@
 # Channel table for Oriente - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3897
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3897
 
 # Physical channel 16 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Orindiuva b/isdb-t/br-sp-Orindiuva
index 806ae1d3..3563f9f2 100644
--- a/isdb-t/br-sp-Orindiuva
+++ b/isdb-t/br-sp-Orindiuva
@@ -1,5 +1,5 @@
-# Channel table for Orindiúva - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2949
+# Channel table for Orindi�va - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2949
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Orlandia b/isdb-t/br-sp-Orlandia
index 8c41c0f1..9e4688a9 100644
--- a/isdb-t/br-sp-Orlandia
+++ b/isdb-t/br-sp-Orlandia
@@ -1,5 +1,5 @@
-# Channel table for Orlândia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/730
+# Channel table for Orl�ndia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=730
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Osasco b/isdb-t/br-sp-Osasco
index 9ced0103..732f8bf7 100644
--- a/isdb-t/br-sp-Osasco
+++ b/isdb-t/br-sp-Osasco
@@ -1,8 +1,8 @@
 # Channel table for Osasco - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3670
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3670
 
 # Physical channel 10 (virtual 50.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 195142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -553,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -610,8 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -640,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -669,7 +669,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -697,7 +697,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -726,8 +726,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -958,6 +958,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -1016,8 +1045,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-OscarBressane b/isdb-t/br-sp-OscarBressane
index 892e9580..01e9b969 100644
--- a/isdb-t/br-sp-OscarBressane
+++ b/isdb-t/br-sp-OscarBressane
@@ -1,5 +1,5 @@
 # Channel table for Oscar Bressane - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3754
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3754
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-OsvaldoCruz b/isdb-t/br-sp-OsvaldoCruz
index a127906a..b0e850c0 100644
--- a/isdb-t/br-sp-OsvaldoCruz
+++ b/isdb-t/br-sp-OsvaldoCruz
@@ -1,5 +1,5 @@
 # Channel table for Osvaldo Cruz - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1446
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1446
 
 # Physical channel 15 (virtual 16.1)
 [Rede Vida]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-Ourinhos b/isdb-t/br-sp-Ourinhos
index 3dc954be..3de59338 100644
--- a/isdb-t/br-sp-Ourinhos
+++ b/isdb-t/br-sp-Ourinhos
@@ -1,8 +1,8 @@
 # Channel table for Ourinhos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/25
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=25
 
-# Physical channel 16 (virtual 25.1)
-[Rede Vida]
+# Physical channel 16 (virtual 25.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -175,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 36 (virtual 36.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 605142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 40 (virtual 56.1)
 [RIT]
 	DELIVERY_SYSTEM = ISDBT
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
@@ -233,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
+# Physical channel 46 (virtual 22.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 665142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-OuroVerde b/isdb-t/br-sp-OuroVerde
index c9ae3d00..54e35e90 100644
--- a/isdb-t/br-sp-OuroVerde
+++ b/isdb-t/br-sp-OuroVerde
@@ -1,5 +1,5 @@
 # Channel table for Ouro Verde - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3787
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3787
 
 # Physical channel 32 (virtual 32.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Ouroeste b/isdb-t/br-sp-Ouroeste
index d12404a9..8bcd8905 100644
--- a/isdb-t/br-sp-Ouroeste
+++ b/isdb-t/br-sp-Ouroeste
@@ -1,5 +1,5 @@
 # Channel table for Ouroeste - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3506
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3506
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Pacaembu b/isdb-t/br-sp-Pacaembu
index c3c521d6..3c057e1e 100644
--- a/isdb-t/br-sp-Pacaembu
+++ b/isdb-t/br-sp-Pacaembu
@@ -1,5 +1,5 @@
 # Channel table for Pacaembu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3363
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3363
 
 # Physical channel 34 (virtual 34.1)
 [SBT Interior/SP]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 22.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-Palestina b/isdb-t/br-sp-Palestina
index d664dcb4..133db3ee 100644
--- a/isdb-t/br-sp-Palestina
+++ b/isdb-t/br-sp-Palestina
@@ -1,5 +1,5 @@
 # Channel table for Palestina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3085
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3085
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 31.1)
-[Rede Vida]
+# Physical channel 32 (virtual 31.3)
+[Rede Vida Educação, Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-PalmaresPaulista b/isdb-t/br-sp-PalmaresPaulista
index 23e7f7f8..1e7a3b9d 100644
--- a/isdb-t/br-sp-PalmaresPaulista
+++ b/isdb-t/br-sp-PalmaresPaulista
@@ -1,5 +1,5 @@
 # Channel table for Palmares Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2970
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2970
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-PalmeiraD'Oeste b/isdb-t/br-sp-PalmeiraD'Oeste
index 63f8ade8..66f77193 100644
--- a/isdb-t/br-sp-PalmeiraD'Oeste
+++ b/isdb-t/br-sp-PalmeiraD'Oeste
@@ -1,5 +1,5 @@
-# Channel table for Palmeira D´ Oeste - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3962
+# Channel table for Palmeira D� Oeste - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3962
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Palmital b/isdb-t/br-sp-Palmital
index 80048076..40c76f30 100644
--- a/isdb-t/br-sp-Palmital
+++ b/isdb-t/br-sp-Palmital
@@ -1,5 +1,5 @@
 # Channel table for Palmital - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3963
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3963
 
 # Physical channel 20 (virtual 57.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Panorama b/isdb-t/br-sp-Panorama
index bb656d82..ce346979 100644
--- a/isdb-t/br-sp-Panorama
+++ b/isdb-t/br-sp-Panorama
@@ -1,8 +1,8 @@
 # Channel table for Panorama - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/771
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=771
 
-# Physical channel 25 (virtual 48.1)
-[Rede Vida]
+# Physical channel 25 (virtual 48.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
diff --git a/isdb-t/br-sp-ParaguacuPaulista b/isdb-t/br-sp-ParaguacuPaulista
index f619515f..f1afd95f 100644
--- a/isdb-t/br-sp-ParaguacuPaulista
+++ b/isdb-t/br-sp-ParaguacuPaulista
@@ -1,5 +1,34 @@
-# Channel table for Paraguaçu Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/108
+# Channel table for Paragua�u Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=108
+
+# Physical channel 14 (virtual 41.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 17.1)
 [Band Paulista]
@@ -30,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 47.1)
+# Physical channel 20 (virtual 20.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,7 +88,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 12.1)
+# Physical channel 22 (virtual 47.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 24.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 34.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,3 +204,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.4)
+[TV Educação, TV Câmara, Rede ALESP, TV Câmara Municipal Assis, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 13.2)
+[TV Cultura, Univesp]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Paraibuna b/isdb-t/br-sp-Paraibuna
index cedb29ce..72af5044 100644
--- a/isdb-t/br-sp-Paraibuna
+++ b/isdb-t/br-sp-Paraibuna
@@ -1,5 +1,5 @@
 # Channel table for Paraibuna - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2513
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2513
 
 # Physical channel 16 (virtual 17.1)
 [TV Vanguarda São José]
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 49.1)
+# Physical channel 42 (virtual 42.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Paraiso b/isdb-t/br-sp-Paraiso
index 2b1fc881..ab1f973a 100644
--- a/isdb-t/br-sp-Paraiso
+++ b/isdb-t/br-sp-Paraiso
@@ -1,5 +1,5 @@
-# Channel table for Paraíso - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3859
+# Channel table for Para�so - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3859
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Paranapanema b/isdb-t/br-sp-Paranapanema
index 266a51b0..e6f11ec8 100644
--- a/isdb-t/br-sp-Paranapanema
+++ b/isdb-t/br-sp-Paranapanema
@@ -1,5 +1,5 @@
 # Channel table for Paranapanema - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1769
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1769
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Paranapua b/isdb-t/br-sp-Paranapua
index 8ded110b..3ea1d2a7 100644
--- a/isdb-t/br-sp-Paranapua
+++ b/isdb-t/br-sp-Paranapua
@@ -1,5 +1,5 @@
-# Channel table for Paranapuã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3964
+# Channel table for Paranapu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3964
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Parapua b/isdb-t/br-sp-Parapua
index baba86ce..f82434b3 100644
--- a/isdb-t/br-sp-Parapua
+++ b/isdb-t/br-sp-Parapua
@@ -1,5 +1,5 @@
-# Channel table for Parapuã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2601
+# Channel table for Parapu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2601
 
 # Physical channel 34 (virtual 7.1)
 [SBT Interior/SP]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-Pardinho b/isdb-t/br-sp-Pardinho
index 7b9c2a11..b82e5aac 100644
--- a/isdb-t/br-sp-Pardinho
+++ b/isdb-t/br-sp-Pardinho
@@ -1,5 +1,5 @@
 # Channel table for Pardinho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3852
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3852
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-PariqueraAcu b/isdb-t/br-sp-PariqueraAcu
index 09024634..42a21c78 100644
--- a/isdb-t/br-sp-PariqueraAcu
+++ b/isdb-t/br-sp-PariqueraAcu
@@ -1,5 +1,5 @@
-# Channel table for Pariquera Açu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/455
+# Channel table for Pariquera A�u - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=455
 
 # Physical channel 15 (virtual 23.1)
 [Rede Vida]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Parisi b/isdb-t/br-sp-Parisi
index 701c339c..41db9f47 100644
--- a/isdb-t/br-sp-Parisi
+++ b/isdb-t/br-sp-Parisi
@@ -1,5 +1,5 @@
 # Channel table for Parisi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1625
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1625
 
 # Physical channel 17 (virtual 14.1)
 [TV Gazeta]
diff --git a/isdb-t/br-sp-PatrocinioPaulista b/isdb-t/br-sp-PatrocinioPaulista
index 05cd91e0..248e18f7 100644
--- a/isdb-t/br-sp-PatrocinioPaulista
+++ b/isdb-t/br-sp-PatrocinioPaulista
@@ -1,5 +1,5 @@
-# Channel table for Patrocínio Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2658
+# Channel table for Patroc�nio Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2658
 
 # Physical channel 16 (virtual 16.1)
 [TV Clube Ribeirão Preto]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Pauliceia b/isdb-t/br-sp-Pauliceia
index d1bc1760..58e044c3 100644
--- a/isdb-t/br-sp-Pauliceia
+++ b/isdb-t/br-sp-Pauliceia
@@ -1,5 +1,5 @@
-# Channel table for Paulicéia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2992
+# Channel table for Paulic�ia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2992
 
 # Physical channel 31 (virtual 31.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Paulinia b/isdb-t/br-sp-Paulinia
index fd0f9083..6f97ac0d 100644
--- a/isdb-t/br-sp-Paulinia
+++ b/isdb-t/br-sp-Paulinia
@@ -1,5 +1,5 @@
-# Channel table for Paulínia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/325
+# Channel table for Paul�nia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=325
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -88,37 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 55.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -234,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -263,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 26.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -321,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 31.1)
-[TV Educativa Paulinia]
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -349,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -437,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -465,7 +436,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
+# Physical channel 39 (virtual 11.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -581,8 +552,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 48.1)
-[Rede TV!]
+# Physical channel 49 (virtual 48.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -611,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-Paulistania b/isdb-t/br-sp-Paulistania
index bffa83c9..2765806b 100644
--- a/isdb-t/br-sp-Paulistania
+++ b/isdb-t/br-sp-Paulistania
@@ -1,5 +1,5 @@
-# Channel table for Paulistânia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3756
+# Channel table for Paulist�nia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3756
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-PauloDeFaria b/isdb-t/br-sp-PauloDeFaria
index afe27046..0e84ea51 100644
--- a/isdb-t/br-sp-PauloDeFaria
+++ b/isdb-t/br-sp-PauloDeFaria
@@ -1,5 +1,5 @@
 # Channel table for Paulo De Faria - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2950
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2950
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Pederneiras b/isdb-t/br-sp-Pederneiras
index 7e6be8f2..1440ffc6 100644
--- a/isdb-t/br-sp-Pederneiras
+++ b/isdb-t/br-sp-Pederneiras
@@ -1,5 +1,5 @@
 # Channel table for Pederneiras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1425
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1425
 
 # Physical channel 17 (virtual 17.1)
 [Band Paulista]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 41.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Pedranopolis b/isdb-t/br-sp-Pedranopolis
index 35f3b1d0..155867ec 100644
--- a/isdb-t/br-sp-Pedranopolis
+++ b/isdb-t/br-sp-Pedranopolis
@@ -1,5 +1,5 @@
-# Channel table for Pedranópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3965
+# Channel table for Pedran�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3965
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Pedregulho b/isdb-t/br-sp-Pedregulho
index 761e8b0b..6cd3617a 100644
--- a/isdb-t/br-sp-Pedregulho
+++ b/isdb-t/br-sp-Pedregulho
@@ -1,5 +1,5 @@
 # Channel table for Pedregulho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2800
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2800
 
 # Physical channel 39 (virtual 5.1)
 [SBT Ribeirão Preto]
diff --git a/isdb-t/br-sp-Pedreira b/isdb-t/br-sp-Pedreira
index d3331419..3396fc05 100644
--- a/isdb-t/br-sp-Pedreira
+++ b/isdb-t/br-sp-Pedreira
@@ -1,5 +1,5 @@
 # Channel table for Pedreira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/141
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=141
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -175,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 39.1)
+# Physical channel 48 (virtual 14.1)
 [SRTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-PedrinhasPaulista b/isdb-t/br-sp-PedrinhasPaulista
index a3e0a518..9ce71e78 100644
--- a/isdb-t/br-sp-PedrinhasPaulista
+++ b/isdb-t/br-sp-PedrinhasPaulista
@@ -1,5 +1,5 @@
 # Channel table for Pedrinhas Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3842
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3842
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-PedroDeToledo b/isdb-t/br-sp-PedroDeToledo
index 8d0b78a4..d3b3b414 100644
--- a/isdb-t/br-sp-PedroDeToledo
+++ b/isdb-t/br-sp-PedroDeToledo
@@ -1,5 +1,5 @@
 # Channel table for Pedro De Toledo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/456
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=456
 
 # Physical channel 19 (virtual 18.1)
 [TV Tribuna]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Penapolis b/isdb-t/br-sp-Penapolis
index f7bd3d46..26916f39 100644
--- a/isdb-t/br-sp-Penapolis
+++ b/isdb-t/br-sp-Penapolis
@@ -1,5 +1,5 @@
-# Channel table for Penápolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1770
+# Channel table for Pen�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1770
 
 # Physical channel 20 (virtual 21.1)
 [RBI TV]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-PereiraBarreto b/isdb-t/br-sp-PereiraBarreto
index 6e0eb7be..33389f5b 100644
--- a/isdb-t/br-sp-PereiraBarreto
+++ b/isdb-t/br-sp-PereiraBarreto
@@ -1,5 +1,5 @@
 # Channel table for Pereira Barreto - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/701
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=701
 
 # Physical channel 17 (virtual 46.1)
 [TV Gazeta]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 26.1)
+# Physical channel 25 (virtual 25.1)
 [TV Tem Rio Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-Pereiras b/isdb-t/br-sp-Pereiras
index b8b7c4a7..61f71d35 100644
--- a/isdb-t/br-sp-Pereiras
+++ b/isdb-t/br-sp-Pereiras
@@ -1,5 +1,5 @@
 # Channel table for Pereiras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3405
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3405
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Itapetininga]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 20.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
diff --git a/isdb-t/br-sp-Peruibe b/isdb-t/br-sp-Peruibe
index f3e8ca07..a0501f52 100644
--- a/isdb-t/br-sp-Peruibe
+++ b/isdb-t/br-sp-Peruibe
@@ -1,5 +1,5 @@
-# Channel table for Peruíbe - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/384
+# Channel table for Peru�be - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=384
 
 # Physical channel 15 (virtual 33.1)
 [Rede Vida]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 24.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 8.1)
+# Physical channel 34 (virtual 34.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 43 (virtual 44.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 647142857
@@ -262,32 +262,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 19.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-sp-Piacatu b/isdb-t/br-sp-Piacatu
index fc79a9ea..ee27b973 100644
--- a/isdb-t/br-sp-Piacatu
+++ b/isdb-t/br-sp-Piacatu
@@ -1,5 +1,5 @@
 # Channel table for Piacatu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3848
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3848
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Piedade b/isdb-t/br-sp-Piedade
index f1493521..2d093f63 100644
--- a/isdb-t/br-sp-Piedade
+++ b/isdb-t/br-sp-Piedade
@@ -1,5 +1,5 @@
 # Channel table for Piedade - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2683
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2683
 
 # Physical channel 23 (virtual 58.1)
 [Band]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 52.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-sp-PilarDoSul b/isdb-t/br-sp-PilarDoSul
index 799ef6b9..5b009eaa 100644
--- a/isdb-t/br-sp-PilarDoSul
+++ b/isdb-t/br-sp-PilarDoSul
@@ -1,5 +1,5 @@
 # Channel table for Pilar Do Sul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2936
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2936
 
 # Physical channel 17 (virtual 17.1)
 [Band]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 4.1)
+# Physical channel 21 (virtual 22.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 20.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
diff --git a/isdb-t/br-sp-Pindamonhangaba b/isdb-t/br-sp-Pindamonhangaba
index b91deabb..aff4e303 100644
--- a/isdb-t/br-sp-Pindamonhangaba
+++ b/isdb-t/br-sp-Pindamonhangaba
@@ -1,11 +1,11 @@
 # Channel table for Pindamonhangaba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/272
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=272
 
-# Physical channel 23 (virtual 6.1)
-[Band Vale]
+# Physical channel 18 (virtual 18.1)
+[TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 497142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 26.1)
-[Boa Vontade TV]
+# Physical channel 23 (virtual 6.1)
+[Band Vale]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 527142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 3.1)
-[TV Vanguarda Taubaté]
+# Physical channel 26 (virtual 26.1)
+[Boa Vontade TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 15.1)
-[TV Setorial]
+# Physical channel 28 (virtual 3.1)
+[TV Vanguarda Taubaté]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 9.1)
-[Rede Vida]
+# Physical channel 30 (virtual 15.1)
+[TV Setorial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 10.1)
-[Record TV Litoral]
+# Physical channel 34 (virtual 34.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
+	FREQUENCY = 593142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 46.1)
-[SBT Vale]
+# Physical channel 43 (virtual 43.1)
+[Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 647142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 53.1)
-[RIT]
+# Physical channel 46 (virtual 46.1)
+[SBT Vale]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 677142857
+	FREQUENCY = 665142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 52 (virtual 59.1)
-[TV Aparecida]
+# Physical channel 48 (virtual 53.1)
+[RIT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 701142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Pindorama b/isdb-t/br-sp-Pindorama
index 3afedbfb..480c80e8 100644
--- a/isdb-t/br-sp-Pindorama
+++ b/isdb-t/br-sp-Pindorama
@@ -1,5 +1,5 @@
 # Channel table for Pindorama - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2913
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2913
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Pinhalzinho b/isdb-t/br-sp-Pinhalzinho
index 855fcfad..5e49b793 100644
--- a/isdb-t/br-sp-Pinhalzinho
+++ b/isdb-t/br-sp-Pinhalzinho
@@ -1,5 +1,5 @@
 # Channel table for Pinhalzinho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3865
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3865
 
 # Physical channel 26 (virtual 12.1)
 [EPTV Campinas]
diff --git a/isdb-t/br-sp-Piquerobi b/isdb-t/br-sp-Piquerobi
index f3c371fa..a02f0c98 100644
--- a/isdb-t/br-sp-Piquerobi
+++ b/isdb-t/br-sp-Piquerobi
@@ -1,5 +1,5 @@
 # Channel table for Piquerobi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3694
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3694
 
 # Physical channel 16 (virtual 17.1)
 [Rede Vida]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-Piquete b/isdb-t/br-sp-Piquete
index 40cda95a..bfc65a26 100644
--- a/isdb-t/br-sp-Piquete
+++ b/isdb-t/br-sp-Piquete
@@ -1,5 +1,5 @@
 # Channel table for Piquete - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/369
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=369
 
 # Physical channel 22 (virtual 54.1)
 [Band Vale]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 8.1)
+# Physical channel 42 (virtual 42.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Piracaia b/isdb-t/br-sp-Piracaia
index 99f8fabd..97a24c75 100644
--- a/isdb-t/br-sp-Piracaia
+++ b/isdb-t/br-sp-Piracaia
@@ -1,8 +1,8 @@
 # Channel table for Piracaia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/848
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=848
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 6.1)
-[TVB]
+[TV Brasil Sat]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
diff --git a/isdb-t/br-sp-Piracicaba b/isdb-t/br-sp-Piracicaba
index 3aa44930..b4612cd0 100644
--- a/isdb-t/br-sp-Piracicaba
+++ b/isdb-t/br-sp-Piracicaba
@@ -1,11 +1,11 @@
 # Channel table for Piracicaba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/47
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=47
 
-# Physical channel 16 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 21.1)
-[RBI TV]
+# Physical channel 18 (virtual 24.1)
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 497142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 24.1)
-[Ideal TV]
+# Physical channel 20 (virtual 21.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 60.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal]
+# Physical channel 31 (virtual 11.5)
+[TV Câmara, Rede ALESP, TV Câmara Municipal, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 40.1)
-[TV Jornal]
+[TV Jornal Limeira]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
diff --git a/isdb-t/br-sp-Piraju b/isdb-t/br-sp-Piraju
index 68f32a5a..d946aa41 100644
--- a/isdb-t/br-sp-Piraju
+++ b/isdb-t/br-sp-Piraju
@@ -1,5 +1,5 @@
 # Channel table for Piraju - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2912
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2912
 
 # Physical channel 20 (virtual 44.1)
 [Rede Vida]
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 38.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Pirajui b/isdb-t/br-sp-Pirajui
index f65d1111..edec397d 100644
--- a/isdb-t/br-sp-Pirajui
+++ b/isdb-t/br-sp-Pirajui
@@ -1,5 +1,5 @@
-# Channel table for Pirajuí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2938
+# Channel table for Piraju� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2938
 
 # Physical channel 18 (virtual 39.1)
 [Band Paulista]
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-Pirangi b/isdb-t/br-sp-Pirangi
index fa104d11..447df2ba 100644
--- a/isdb-t/br-sp-Pirangi
+++ b/isdb-t/br-sp-Pirangi
@@ -1,5 +1,5 @@
 # Channel table for Pirangi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2852
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2852
 
 # Physical channel 21 (virtual 53.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Pirapozinho b/isdb-t/br-sp-Pirapozinho
index db0c4103..302b13a9 100644
--- a/isdb-t/br-sp-Pirapozinho
+++ b/isdb-t/br-sp-Pirapozinho
@@ -1,5 +1,5 @@
 # Channel table for Pirapozinho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3502
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3502
 
 # Physical channel 15 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Pirassununga b/isdb-t/br-sp-Pirassununga
index 2732e79b..427e0d90 100644
--- a/isdb-t/br-sp-Pirassununga
+++ b/isdb-t/br-sp-Pirassununga
@@ -1,5 +1,5 @@
 # Channel table for Pirassununga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/957
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=957
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -30,36 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 19 (virtual 19.1)
-[TV Gazeta]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 503142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,35 +88,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 35 (virtual 35.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
@@ -175,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 58.1)
-[Mix TV Regional]
+# Physical channel 41 (virtual 41.1)
+[TV 41]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -233,37 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 52.1)
-[CNT Americana]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 50 (virtual 50.1)
-[Rede Vida]
+# Physical channel 50 (virtual 50.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Piratininga b/isdb-t/br-sp-Piratininga
index 11969cd6..050b98e4 100644
--- a/isdb-t/br-sp-Piratininga
+++ b/isdb-t/br-sp-Piratininga
@@ -1,5 +1,5 @@
 # Channel table for Piratininga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3684
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3684
 
 # Physical channel 14 (virtual 15.1)
 [RBI TV]
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 13.1)
+# Physical channel 23 (virtual 23.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 5.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.3)
-[TV Câmara, Rede ALESP, TV Câmara Municipal Bauru]
+# Physical channel 31 (virtual 31.5)
+[TV Câmara, Rede ALESP, TV Câmara Municipal Bauru, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 38.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 45.1)
-[TV Unesp]
+# Physical channel 46 (virtual 46.3)
+[TV Unesp, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-Pitangueiras b/isdb-t/br-sp-Pitangueiras
index 831dc283..3eb0a630 100644
--- a/isdb-t/br-sp-Pitangueiras
+++ b/isdb-t/br-sp-Pitangueiras
@@ -1,5 +1,5 @@
 # Channel table for Pitangueiras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2858
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2858
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
diff --git a/isdb-t/br-sp-Planalto b/isdb-t/br-sp-Planalto
index 5716777a..ba54bfb4 100644
--- a/isdb-t/br-sp-Planalto
+++ b/isdb-t/br-sp-Planalto
@@ -1,5 +1,5 @@
 # Channel table for Planalto - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3507
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3507
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Poa b/isdb-t/br-sp-Poa
index 2c76e3a6..bf098d9c 100644
--- a/isdb-t/br-sp-Poa
+++ b/isdb-t/br-sp-Poa
@@ -1,5 +1,5 @@
-# Channel table for Poá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/870
+# Channel table for Po� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=870
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Rede Globo]
+[TV Globo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -581,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -640,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -668,7 +668,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -697,8 +697,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -930,7 +930,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 47 (virtual 56.1)
-[TV Jovem Colinas]
+[Rede Mundial, TV Colinas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 671142857
@@ -987,8 +987,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Poloni b/isdb-t/br-sp-Poloni
index 816f4556..ac5e693d 100644
--- a/isdb-t/br-sp-Poloni
+++ b/isdb-t/br-sp-Poloni
@@ -1,5 +1,5 @@
 # Channel table for Poloni - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3881
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3881
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Pompeia b/isdb-t/br-sp-Pompeia
index fba22c0e..f6c0ac22 100644
--- a/isdb-t/br-sp-Pompeia
+++ b/isdb-t/br-sp-Pompeia
@@ -1,5 +1,5 @@
-# Channel table for Pompéia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3276
+# Channel table for Pomp�ia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3276
 
 # Physical channel 18 (virtual 3.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Pongai b/isdb-t/br-sp-Pongai
index 6c8e7140..8011d94d 100644
--- a/isdb-t/br-sp-Pongai
+++ b/isdb-t/br-sp-Pongai
@@ -1,5 +1,5 @@
-# Channel table for Pongaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3082
+# Channel table for Ponga� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3082
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Bauru]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 5.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Pontal b/isdb-t/br-sp-Pontal
index 6a49f07d..104d10bb 100644
--- a/isdb-t/br-sp-Pontal
+++ b/isdb-t/br-sp-Pontal
@@ -1,5 +1,5 @@
 # Channel table for Pontal - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2857
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2857
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 2.1)
+# Physical channel 33 (virtual 2.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Pontalinda b/isdb-t/br-sp-Pontalinda
index 705a9244..d853d636 100644
--- a/isdb-t/br-sp-Pontalinda
+++ b/isdb-t/br-sp-Pontalinda
@@ -1,5 +1,5 @@
 # Channel table for Pontalinda - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3966
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3966
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-PontesGestal b/isdb-t/br-sp-PontesGestal
index 759fe9ef..16a34901 100644
--- a/isdb-t/br-sp-PontesGestal
+++ b/isdb-t/br-sp-PontesGestal
@@ -1,5 +1,5 @@
 # Channel table for Pontes Gestal - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2811
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2811
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Populina b/isdb-t/br-sp-Populina
index eaa0bce1..46482f87 100644
--- a/isdb-t/br-sp-Populina
+++ b/isdb-t/br-sp-Populina
@@ -1,5 +1,5 @@
 # Channel table for Populina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3967
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3967
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Porangaba b/isdb-t/br-sp-Porangaba
index 78fb2adf..d5daccd1 100644
--- a/isdb-t/br-sp-Porangaba
+++ b/isdb-t/br-sp-Porangaba
@@ -1,5 +1,5 @@
 # Channel table for Porangaba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/887
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=887
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 20.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
diff --git a/isdb-t/br-sp-PortoFeliz b/isdb-t/br-sp-PortoFeliz
index f5fa2914..442932a4 100644
--- a/isdb-t/br-sp-PortoFeliz
+++ b/isdb-t/br-sp-PortoFeliz
@@ -1,5 +1,5 @@
 # Channel table for Porto Feliz - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/278
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=278
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 14.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-PortoFerreira b/isdb-t/br-sp-PortoFerreira
index 23327b64..742ac515 100644
--- a/isdb-t/br-sp-PortoFerreira
+++ b/isdb-t/br-sp-PortoFerreira
@@ -1,5 +1,5 @@
 # Channel table for Porto Ferreira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2509
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2509
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 30 (virtual 30.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[TV 41]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 42 (virtual 6.1)
 [EPTV Central]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Potim b/isdb-t/br-sp-Potim
index ecd8b6d9..e295a773 100644
--- a/isdb-t/br-sp-Potim
+++ b/isdb-t/br-sp-Potim
@@ -1,5 +1,5 @@
 # Channel table for Potim - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3653
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3653
 
 # Physical channel 28 (virtual 3.1)
 [TV Vanguarda Taubaté]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 9.1)
+# Physical channel 34 (virtual 34.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 42.1)
+[Record TV Litoral]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 46 (virtual 46.1)
 [SBT Vale]
 	DELIVERY_SYSTEM = ISDBT
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Potirendaba b/isdb-t/br-sp-Potirendaba
index 8b587625..c79e42f7 100644
--- a/isdb-t/br-sp-Potirendaba
+++ b/isdb-t/br-sp-Potirendaba
@@ -1,5 +1,5 @@
 # Channel table for Potirendaba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3709
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3709
 
 # Physical channel 24 (virtual 5.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Pracinha b/isdb-t/br-sp-Pracinha
index 2ab28422..5a5557c9 100644
--- a/isdb-t/br-sp-Pracinha
+++ b/isdb-t/br-sp-Pracinha
@@ -1,5 +1,5 @@
 # Channel table for Pracinha - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4018
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4018
 
 # Physical channel 30 (virtual 30.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-PraiaGrande b/isdb-t/br-sp-PraiaGrande
index 394dc49c..c34125b4 100644
--- a/isdb-t/br-sp-PraiaGrande
+++ b/isdb-t/br-sp-PraiaGrande
@@ -1,8 +1,8 @@
 # Channel table for Praia Grande - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/17
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=17
 
-# Physical channel 15 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 28.1)
-[TVB]
+# Physical channel 25 (virtual 25.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 27 (virtual 10.1)
+[Rede 21]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 551142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 29 (virtual 29.1)
 [VTV]
 	DELIVERY_SYSTEM = ISDBT
@@ -204,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 49.1)
+# Physical channel 35 (virtual 6.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -262,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 38.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 40.1)
 [TV Unisantos]
 	DELIVERY_SYSTEM = ISDBT
@@ -292,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 56.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -320,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 35.1)
-[NGT]
+# Physical channel 47 (virtual 14.1)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[VTV]
+# Physical channel 48 (virtual 48.3)
+[TV Cultura Litoral, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Pratania b/isdb-t/br-sp-Pratania
index 7649128e..29ec83d6 100644
--- a/isdb-t/br-sp-Pratania
+++ b/isdb-t/br-sp-Pratania
@@ -1,5 +1,5 @@
-# Channel table for Pratânia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3858
+# Channel table for Prat�nia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3858
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-PresidenteAlves b/isdb-t/br-sp-PresidenteAlves
index 4f642206..1f994376 100644
--- a/isdb-t/br-sp-PresidenteAlves
+++ b/isdb-t/br-sp-PresidenteAlves
@@ -1,5 +1,5 @@
 # Channel table for Presidente Alves - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3438
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3438
 
 # Physical channel 21 (virtual 20.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-PresidenteBernardes b/isdb-t/br-sp-PresidenteBernardes
index 968ee8ec..9a8aa9c6 100644
--- a/isdb-t/br-sp-PresidenteBernardes
+++ b/isdb-t/br-sp-PresidenteBernardes
@@ -1,5 +1,5 @@
 # Channel table for Presidente Bernardes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2520
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2520
 
 # Physical channel 19 (virtual 10.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-PresidenteEpitacio b/isdb-t/br-sp-PresidenteEpitacio
index 774d0001..5e7a57e5 100644
--- a/isdb-t/br-sp-PresidenteEpitacio
+++ b/isdb-t/br-sp-PresidenteEpitacio
@@ -1,8 +1,8 @@
-# Channel table for Presidente Epitácio - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/983
+# Channel table for Presidente Epit�cio - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=983
 
-# Physical channel 15 (virtual 18.1)
-[Rede Vida]
+# Physical channel 15 (virtual 18.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 21 (virtual 21.1)
+[Band Paulista]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30 (virtual 30.1)
 [TV Fronteira]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 21.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 38 (virtual 22.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-PresidentePrudente b/isdb-t/br-sp-PresidentePrudente
index f35ff2fc..41949e98 100644
--- a/isdb-t/br-sp-PresidentePrudente
+++ b/isdb-t/br-sp-PresidentePrudente
@@ -1,5 +1,5 @@
 # Channel table for Presidente Prudente - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/43
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=43
 
 # Physical channel 17 (virtual 46.1)
 [TV Gazeta]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 58.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 26.1)
-[Rede Vida]
+# Physical channel 26 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 4.1)
+# Physical channel 33 (virtual 4.2)
 [SBT Interior/SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 22.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 14.1)
-[RBI TV]
+# Physical channel 45 (virtual 56.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 20.1)
-[Rede TV!]
+# Physical channel 47 (virtual 14.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 55 (virtual 56.1)
-[CNT]
+# Physical channel 49 (virtual 20.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 719142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-PresidenteVenceslau b/isdb-t/br-sp-PresidenteVenceslau
index eec7733d..e3f80e57 100644
--- a/isdb-t/br-sp-PresidenteVenceslau
+++ b/isdb-t/br-sp-PresidenteVenceslau
@@ -1,8 +1,8 @@
 # Channel table for Presidente Venceslau - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/982
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=982
 
-# Physical channel 16 (virtual 17.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 39 (virtual 22.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-Promissao b/isdb-t/br-sp-Promissao
index ade82390..54b61449 100644
--- a/isdb-t/br-sp-Promissao
+++ b/isdb-t/br-sp-Promissao
@@ -1,5 +1,5 @@
-# Channel table for Promissão - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4024
+# Channel table for Promiss�o - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4024
 
 # Physical channel 16 (virtual 16.1)
 [Rede Vida]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 19 (virtual 19.1)
+[TV Tem Bauru]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 23 (virtual 23.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Quadra b/isdb-t/br-sp-Quadra
index 3830cc48..1e6f52bc 100644
--- a/isdb-t/br-sp-Quadra
+++ b/isdb-t/br-sp-Quadra
@@ -1,5 +1,5 @@
 # Channel table for Quadra - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3996
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3996
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Quata b/isdb-t/br-sp-Quata
index 9f997c4e..43cd6c09 100644
--- a/isdb-t/br-sp-Quata
+++ b/isdb-t/br-sp-Quata
@@ -1,5 +1,5 @@
-# Channel table for Quatá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3989
+# Channel table for Quat� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3989
 
 # Physical channel 36 (virtual 36.1)
 [TV Tem Bauru]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-Queluz b/isdb-t/br-sp-Queluz
index dfa2e003..22063736 100644
--- a/isdb-t/br-sp-Queluz
+++ b/isdb-t/br-sp-Queluz
@@ -1,7 +1,7 @@
 # Channel table for Queluz - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/399
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=399
 
-# Physical channel 19 (virtual 19.1)
+# Physical channel 19 (virtual 35.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Quintana b/isdb-t/br-sp-Quintana
index f1806d04..c1954067 100644
--- a/isdb-t/br-sp-Quintana
+++ b/isdb-t/br-sp-Quintana
@@ -1,5 +1,5 @@
 # Channel table for Quintana - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3895
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3895
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Rafard b/isdb-t/br-sp-Rafard
index 87072345..fb534bbe 100644
--- a/isdb-t/br-sp-Rafard
+++ b/isdb-t/br-sp-Rafard
@@ -1,7 +1,7 @@
 # Channel table for Rafard - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3403
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3403
 
-# Physical channel 15 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -30,8 +30,66 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 31.1)
-[Rede Vida]
+# Physical channel 28 (virtual 6.1)
+[TV Thathi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 30 (virtual 30.1)
+[VTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 31.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -60,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-Rancharia b/isdb-t/br-sp-Rancharia
index d7b43b6e..79a33f05 100644
--- a/isdb-t/br-sp-Rancharia
+++ b/isdb-t/br-sp-Rancharia
@@ -1,8 +1,8 @@
 # Channel table for Rancharia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1020
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1020
 
-# Physical channel 26 (virtual 27.1)
-[Rede Vida]
+# Physical channel 26 (virtual 27.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 545142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 22.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-RedencaoDaSerra b/isdb-t/br-sp-RedencaoDaSerra
index 2b55e1bb..6d01d51f 100644
--- a/isdb-t/br-sp-RedencaoDaSerra
+++ b/isdb-t/br-sp-RedencaoDaSerra
@@ -1,5 +1,5 @@
-# Channel table for Redenção Da Serra - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3270
+# Channel table for Reden��o Da Serra - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3270
 
 # Physical channel 17 (virtual 19.1)
 [TV Vanguarda São José]
diff --git a/isdb-t/br-sp-RegenteFeijo b/isdb-t/br-sp-RegenteFeijo
index ccf10ee0..d1d5ad52 100644
--- a/isdb-t/br-sp-RegenteFeijo
+++ b/isdb-t/br-sp-RegenteFeijo
@@ -1,5 +1,5 @@
-# Channel table for Regente Feijó - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3695
+# Channel table for Regente Feij� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3695
 
 # Physical channel 17 (virtual 46.1)
 [TV Gazeta]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 58.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 22.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 14.1)
-[RBI TV]
+# Physical channel 45 (virtual 56.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 55 (virtual 56.1)
-[CNT]
+# Physical channel 47 (virtual 14.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 719142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Reginopolis b/isdb-t/br-sp-Reginopolis
index 20ea66f1..fdcbf041 100644
--- a/isdb-t/br-sp-Reginopolis
+++ b/isdb-t/br-sp-Reginopolis
@@ -1,5 +1,5 @@
-# Channel table for Reginópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/769
+# Channel table for Regin�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=769
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 5.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Registro b/isdb-t/br-sp-Registro
index e27bf185..fa86cef9 100644
--- a/isdb-t/br-sp-Registro
+++ b/isdb-t/br-sp-Registro
@@ -1,8 +1,8 @@
 # Channel table for Registro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/444
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=444
 
-# Physical channel 15 (virtual 23.1)
-[Rede Vida]
+# Physical channel 15 (virtual 23.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -146,7 +146,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
+# Physical channel 28 (virtual 28.1)
+[SBT Vale]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 33.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,3 +204,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 39 (virtual 38.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Restinga b/isdb-t/br-sp-Restinga
index 957c8be0..fdbc9016 100644
--- a/isdb-t/br-sp-Restinga
+++ b/isdb-t/br-sp-Restinga
@@ -1,5 +1,5 @@
 # Channel table for Restinga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2794
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2794
 
 # Physical channel 14 (virtual 13.1)
 [Record TV Interior SP]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 55.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Câmara Municipal Franca, TV Senado]
+# Physical channel 31 (virtual 6.5)
+[TV Câmara, Rede ALESP, TV Câmara Municipal Franca, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -233,7 +233,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 40 (virtual 40.1)
+# Physical channel 40 (virtual 43.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Ribeira b/isdb-t/br-sp-Ribeira
index 6029c52a..76bdd292 100644
--- a/isdb-t/br-sp-Ribeira
+++ b/isdb-t/br-sp-Ribeira
@@ -1,5 +1,5 @@
 # Channel table for Ribeira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/447
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=447
 
 # Physical channel 19 (virtual 18.1)
 [TV Tribuna]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-RibeiraoBonito b/isdb-t/br-sp-RibeiraoBonito
index 0c49d2b0..bbc4c607 100644
--- a/isdb-t/br-sp-RibeiraoBonito
+++ b/isdb-t/br-sp-RibeiraoBonito
@@ -1,5 +1,121 @@
-# Channel table for Ribeirão Bonito - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2853
+# Channel table for Ribeir�o Bonito - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2853
+
+# Physical channel 15 (virtual 15.1)
+[TV Rio Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 18 (virtual 9.1)
+[TV Clube Ribeirão Preto]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 497142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 20 (virtual 8.1)
+[TV Morada do Sol]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 24.1)
+[SBT Central]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 26 (virtual 6.1)
 [EPTV Central]
@@ -30,8 +146,95 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 28 (virtual 13.1)
+[Record TV Interior SP]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 557142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 581142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 33 (virtual 43.1)
+[Rede Família]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 11.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -59,3 +262,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 35 (virtual 35.1)
+[Record News]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 599142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 48 (virtual 40.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-RibeiraoBranco b/isdb-t/br-sp-RibeiraoBranco
index 569a8a7f..6d650ef7 100644
--- a/isdb-t/br-sp-RibeiraoBranco
+++ b/isdb-t/br-sp-RibeiraoBranco
@@ -1,5 +1,5 @@
-# Channel table for Ribeirão Branco - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3680
+# Channel table for Ribeir�o Branco - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3680
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 30 (virtual 3.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-RibeiraoCorrente b/isdb-t/br-sp-RibeiraoCorrente
index b9faabc2..6aff3f2b 100644
--- a/isdb-t/br-sp-RibeiraoCorrente
+++ b/isdb-t/br-sp-RibeiraoCorrente
@@ -1,5 +1,5 @@
-# Channel table for Ribeirão Corrente - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2797
+# Channel table for Ribeir�o Corrente - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2797
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-RibeiraoDoSul b/isdb-t/br-sp-RibeiraoDoSul
index a961f427..7ffe5d1d 100644
--- a/isdb-t/br-sp-RibeiraoDoSul
+++ b/isdb-t/br-sp-RibeiraoDoSul
@@ -1,5 +1,5 @@
-# Channel table for Ribeirão Do Sul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3968
+# Channel table for Ribeir�o Do Sul - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3968
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-RibeiraoDosIndios b/isdb-t/br-sp-RibeiraoDosindios
index 9379bbfb..02828b65 100644
--- a/isdb-t/br-sp-RibeiraoDosIndios
+++ b/isdb-t/br-sp-RibeiraoDosindios
@@ -1,5 +1,5 @@
-# Channel table for Ribeirão Dos Índios - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3696
+# Channel table for Ribeir�o Dos �ndios - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3696
 
 # Physical channel 32 (virtual 32.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-RibeiraoGrande b/isdb-t/br-sp-RibeiraoGrande
index b5d46479..3823de9a 100644
--- a/isdb-t/br-sp-RibeiraoGrande
+++ b/isdb-t/br-sp-RibeiraoGrande
@@ -1,5 +1,5 @@
-# Channel table for Ribeirão Grande - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3969
+# Channel table for Ribeir�o Grande - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3969
 
 # Physical channel 17 (virtual 17.1)
 [Band]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 44.1)
+# Physical channel 45 (virtual 45.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-RibeiraoPreto b/isdb-t/br-sp-RibeiraoPreto
index f2e18618..d89fe3f9 100644
--- a/isdb-t/br-sp-RibeiraoPreto
+++ b/isdb-t/br-sp-RibeiraoPreto
@@ -1,5 +1,5 @@
-# Channel table for Ribeirão Preto - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/88
+# Channel table for Ribeir�o Preto - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=88
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -88,8 +88,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 21.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 55.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -291,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Ribeirão Preto]
+# Physical channel 31 (virtual 6.5)
+[TV Câmara, Rede ALESP, TV Câmara Ribeirão Preto, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -320,11 +349,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 35.1)
-[Record News]
+# Physical channel 33 (virtual 2.1)
+[Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,11 +378,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 2.1)
-[Rede Família]
+# Physical channel 35 (virtual 35.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -378,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 29.1)
-[NGT]
+# Physical channel 36 (virtual 26.1)
+[TV Morada do Sol]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -523,6 +552,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 44.2)
+[ISTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 51 (virtual 32.1)
 [TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Rifaina b/isdb-t/br-sp-Rifaina
index d86d9849..97a87ef9 100644
--- a/isdb-t/br-sp-Rifaina
+++ b/isdb-t/br-sp-Rifaina
@@ -1,5 +1,5 @@
 # Channel table for Rifaina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2816
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2816
 
 # Physical channel 26 (virtual 7.1)
 [EPTV Ribeirão]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Rincao b/isdb-t/br-sp-Rincao
index 77761b45..907160d2 100644
--- a/isdb-t/br-sp-Rincao
+++ b/isdb-t/br-sp-Rincao
@@ -1,5 +1,5 @@
-# Channel table for Rincão - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2817
+# Channel table for Rinc�o - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2817
 
 # Physical channel 25 (virtual 6.1)
 [EPTV Central]
diff --git a/isdb-t/br-sp-Rinopolis b/isdb-t/br-sp-Rinopolis
index ce7b6aa5..80200a5f 100644
--- a/isdb-t/br-sp-Rinopolis
+++ b/isdb-t/br-sp-Rinopolis
@@ -1,5 +1,5 @@
-# Channel table for Rinópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1014
+# Channel table for Rin�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1014
 
 # Physical channel 20 (virtual 20.1)
 [Rede Vida]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 34.1)
+# Physical channel 33 (virtual 33.1)
 [SBT Interior/SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 39 (virtual 39.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
-[Rede TV!]
+# Physical channel 48 (virtual 48.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-sp-RioClaro b/isdb-t/br-sp-RioClaro
index 41732e8c..9401b39b 100644
--- a/isdb-t/br-sp-RioClaro
+++ b/isdb-t/br-sp-RioClaro
@@ -1,5 +1,5 @@
 # Channel table for Rio Claro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/213
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=213
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 35.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -175,7 +175,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 5.1)
+# Physical channel 39 (virtual 39.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -262,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 27.1)
-[TVB]
+# Physical channel 46 (virtual 28.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-RioDasPedras b/isdb-t/br-sp-RioDasPedras
index b7eb9667..7139fc39 100644
--- a/isdb-t/br-sp-RioDasPedras
+++ b/isdb-t/br-sp-RioDasPedras
@@ -1,5 +1,5 @@
 # Channel table for Rio Das Pedras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3672
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3672
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
diff --git a/isdb-t/br-sp-Riolandia b/isdb-t/br-sp-Riolandia
index 1e0a994a..e8c72571 100644
--- a/isdb-t/br-sp-Riolandia
+++ b/isdb-t/br-sp-Riolandia
@@ -1,5 +1,5 @@
-# Channel table for Riolândia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3323
+# Channel table for Riol�ndia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3323
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Riversul b/isdb-t/br-sp-Riversul
index 3f3e78e2..b6b7de66 100644
--- a/isdb-t/br-sp-Riversul
+++ b/isdb-t/br-sp-Riversul
@@ -1,5 +1,5 @@
 # Channel table for Riversul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/890
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=890
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Rosana b/isdb-t/br-sp-Rosana
index 33ed2db8..e10b9b5d 100644
--- a/isdb-t/br-sp-Rosana
+++ b/isdb-t/br-sp-Rosana
@@ -1,5 +1,5 @@
 # Channel table for Rosana - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2810
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2810
 
 # Physical channel 19 (virtual 19.1)
 [Band Paulista]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 22.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-Rosana(primavera) b/isdb-t/br-sp-Rosana(primavera)
index bac5dcbf..b678b3b5 100644
--- a/isdb-t/br-sp-Rosana(primavera)
+++ b/isdb-t/br-sp-Rosana(primavera)
@@ -1,5 +1,5 @@
 # Channel table for Rosana (primavera) - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2878
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2878
 
 # Physical channel 32 (virtual 32.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Roseira b/isdb-t/br-sp-Roseira
index 5893ea92..19588a9d 100644
--- a/isdb-t/br-sp-Roseira
+++ b/isdb-t/br-sp-Roseira
@@ -1,5 +1,5 @@
 # Channel table for Roseira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/863
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=863
 
 # Physical channel 23 (virtual 6.1)
 [Band Vale]
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 9.1)
+# Physical channel 34 (virtual 34.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,6 +146,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 42 (virtual 42.1)
+[Record TV Litoral]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 46 (virtual 46.1)
 [SBT Vale]
 	DELIVERY_SYSTEM = ISDBT
@@ -176,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Rubiacea b/isdb-t/br-sp-Rubiacea
index 91d7e4d6..cfdfac9f 100644
--- a/isdb-t/br-sp-Rubiacea
+++ b/isdb-t/br-sp-Rubiacea
@@ -1,5 +1,5 @@
-# Channel table for Rubiácea - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3887
+# Channel table for Rubi�cea - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3887
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Rubineia b/isdb-t/br-sp-Rubineia
index 25c301d4..808c4aa6 100644
--- a/isdb-t/br-sp-Rubineia
+++ b/isdb-t/br-sp-Rubineia
@@ -1,5 +1,5 @@
-# Channel table for Rubinéia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3970
+# Channel table for Rubin�ia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3970
 
 # Physical channel 24 (virtual 18.1)
 [Band Paulista]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Sabino b/isdb-t/br-sp-Sabino
index a3039d1e..cbe3faaf 100644
--- a/isdb-t/br-sp-Sabino
+++ b/isdb-t/br-sp-Sabino
@@ -1,5 +1,5 @@
 # Channel table for Sabino - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3443
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3443
 
 # Physical channel 15 (virtual 16.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Sagres b/isdb-t/br-sp-Sagres
index 9d4892ec..819281b4 100644
--- a/isdb-t/br-sp-Sagres
+++ b/isdb-t/br-sp-Sagres
@@ -1,5 +1,5 @@
 # Channel table for Sagres - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4020
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4020
 
 # Physical channel 30 (virtual 30.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-Sales b/isdb-t/br-sp-Sales
index 2b1c6d73..14301a9e 100644
--- a/isdb-t/br-sp-Sales
+++ b/isdb-t/br-sp-Sales
@@ -1,5 +1,5 @@
 # Channel table for Sales - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3711
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3711
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-SalesOliveira b/isdb-t/br-sp-SalesOliveira
index cde2ef74..2826560c 100644
--- a/isdb-t/br-sp-SalesOliveira
+++ b/isdb-t/br-sp-SalesOliveira
@@ -1,5 +1,5 @@
 # Channel table for Sales Oliveira - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2828
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2828
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 29.1)
-[Record TV Rio Preto]
+[Record TV Interior SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
diff --git a/isdb-t/br-sp-Salesopolis b/isdb-t/br-sp-Salesopolis
index 1ac27fe9..4188cbf8 100644
--- a/isdb-t/br-sp-Salesopolis
+++ b/isdb-t/br-sp-Salesopolis
@@ -1,5 +1,5 @@
-# Channel table for Salesópolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3515
+# Channel table for Sales�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3515
 
 # Physical channel 19 (virtual 19.1)
 [TV Diário]
diff --git a/isdb-t/br-sp-Saltinho b/isdb-t/br-sp-Saltinho
index 5f7bfe7e..29a54bc3 100644
--- a/isdb-t/br-sp-Saltinho
+++ b/isdb-t/br-sp-Saltinho
@@ -1,5 +1,5 @@
 # Channel table for Saltinho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3673
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3673
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
diff --git a/isdb-t/br-sp-Salto b/isdb-t/br-sp-Salto
index 179ada3e..b25a1405 100644
--- a/isdb-t/br-sp-Salto
+++ b/isdb-t/br-sp-Salto
@@ -1,11 +1,11 @@
 # Channel table for Salto - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/22
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=22
 
-# Physical channel 16 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 47.1)
-[TV Canção Nova]
+# Physical channel 32 (virtual 32.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 35 (virtual 35.1)
+[TV Sorocaba]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 35.1)
-[TV Sorocaba]
+# Physical channel 36 (virtual 14.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 605142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 14.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 45 (virtual 45.1)
+[Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[Record TV Paulista]
+# Physical channel 46 (virtual 47.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 665142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-SaltoDePirapora b/isdb-t/br-sp-SaltoDePirapora
index 3b25db6d..2401d8a9 100644
--- a/isdb-t/br-sp-SaltoDePirapora
+++ b/isdb-t/br-sp-SaltoDePirapora
@@ -1,5 +1,5 @@
 # Channel table for Salto De Pirapora - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3406
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3406
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Sorocaba]
diff --git a/isdb-t/br-sp-SaltoGrande b/isdb-t/br-sp-SaltoGrande
index c103871d..4b04223b 100644
--- a/isdb-t/br-sp-SaltoGrande
+++ b/isdb-t/br-sp-SaltoGrande
@@ -1,5 +1,5 @@
 # Channel table for Salto Grande - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3971
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3971
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Sandovalina b/isdb-t/br-sp-Sandovalina
index e5dea8fe..aff63725 100644
--- a/isdb-t/br-sp-Sandovalina
+++ b/isdb-t/br-sp-Sandovalina
@@ -1,5 +1,5 @@
 # Channel table for Sandovalina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3524
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3524
 
 # Physical channel 30 (virtual 30.1)
 [TV Fronteira]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 39.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-SantaAdelia b/isdb-t/br-sp-SantaAdelia
index 620f6202..485a7f5a 100644
--- a/isdb-t/br-sp-SantaAdelia
+++ b/isdb-t/br-sp-SantaAdelia
@@ -1,5 +1,5 @@
-# Channel table for Santa Adélia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3882
+# Channel table for Santa Ad�lia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3882
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-SantaAlbertina b/isdb-t/br-sp-SantaAlbertina
index 5839c915..2bd51d52 100644
--- a/isdb-t/br-sp-SantaAlbertina
+++ b/isdb-t/br-sp-SantaAlbertina
@@ -1,5 +1,5 @@
 # Channel table for Santa Albertina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3509
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3509
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-SantaBarbaraD'Oeste b/isdb-t/br-sp-SantaBarbaraD'Oeste
index 985aab1a..46669407 100644
--- a/isdb-t/br-sp-SantaBarbaraD'Oeste
+++ b/isdb-t/br-sp-SantaBarbaraD'Oeste
@@ -1,7 +1,7 @@
-# Channel table for Santa Bárbara D´ Oeste - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/631
+# Channel table for Santa B�rbara D� Oeste - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=631
 
-# Physical channel 14 (virtual 46.1)
+# Physical channel 14 (virtual 14.1)
 [TV Todo Dia]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 24 (virtual 52.1)
+[CNT Americana]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 52.1)
-[CNT Americana]
+# Physical channel 28 (virtual 6.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 557142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 6.1)
-[TVB]
+# Physical channel 30 (virtual 30.1)
+[VTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 30.1)
-[VTV]
+# Physical channel 32 (virtual 32.1)
+[Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 569142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 38 (virtual 10.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 581142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,11 +204,40 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 39 (virtual 11.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 623142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 40 (virtual 33.1)
+[RIT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 629142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 55.1)
+# Physical channel 49 (virtual 48.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-SantaBranca b/isdb-t/br-sp-SantaBranca
index ac03fd18..073f82c7 100644
--- a/isdb-t/br-sp-SantaBranca
+++ b/isdb-t/br-sp-SantaBranca
@@ -1,5 +1,5 @@
 # Channel table for Santa Branca - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3910
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3910
 
 # Physical channel 17 (virtual 20.1)
 [TV Vanguarda São José]
diff --git a/isdb-t/br-sp-SantaCruzDaConceicao b/isdb-t/br-sp-SantaCruzDaConceicao
index b84a0cad..991aa2b1 100644
--- a/isdb-t/br-sp-SantaCruzDaConceicao
+++ b/isdb-t/br-sp-SantaCruzDaConceicao
@@ -1,5 +1,5 @@
-# Channel table for Santa Cruz Da Conceição - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2747
+# Channel table for Santa Cruz Da Concei��o - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2747
 
 # Physical channel 26 (virtual 6.1)
 [EPTV Central]
diff --git a/isdb-t/br-sp-SantaCruzDaEsperanca b/isdb-t/br-sp-SantaCruzDaEsperanca
index 8396d0fe..e39e7f4f 100644
--- a/isdb-t/br-sp-SantaCruzDaEsperanca
+++ b/isdb-t/br-sp-SantaCruzDaEsperanca
@@ -1,5 +1,5 @@
-# Channel table for Santa Cruz Da Esperança - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2829
+# Channel table for Santa Cruz Da Esperan�a - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2829
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
diff --git a/isdb-t/br-sp-SantaCruzDasPalmeiras b/isdb-t/br-sp-SantaCruzDasPalmeiras
index 13c248d5..ccb2b0c6 100644
--- a/isdb-t/br-sp-SantaCruzDasPalmeiras
+++ b/isdb-t/br-sp-SantaCruzDasPalmeiras
@@ -1,5 +1,5 @@
 # Channel table for Santa Cruz Das Palmeiras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2292
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2292
 
 # Physical channel 14 (virtual 13.1)
 [Record TV Interior SP]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 18 (virtual 18.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 497142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-SantaCruzDoRioPardo b/isdb-t/br-sp-SantaCruzDoRioPardo
index a8379c50..956e603d 100644
--- a/isdb-t/br-sp-SantaCruzDoRioPardo
+++ b/isdb-t/br-sp-SantaCruzDoRioPardo
@@ -1,8 +1,8 @@
 # Channel table for Santa Cruz Do Rio Pardo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2942
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2942
 
-# Physical channel 16 (virtual 29.1)
-[Rede Vida]
+# Physical channel 16 (virtual 29.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 46.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 31.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 38 (virtual 12.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
@@ -147,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 44 (virtual 13.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 653142857
diff --git a/isdb-t/br-sp-SantaErnestina b/isdb-t/br-sp-SantaErnestina
index c93f9d78..ca4626b5 100644
--- a/isdb-t/br-sp-SantaErnestina
+++ b/isdb-t/br-sp-SantaErnestina
@@ -1,5 +1,5 @@
 # Channel table for Santa Ernestina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2749
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2749
 
 # Physical channel 26 (virtual 7.1)
 [EPTV Ribeirão]
diff --git a/isdb-t/br-sp-SantaFeDoSul b/isdb-t/br-sp-SantaFeDoSul
index e314da8c..ff05205d 100644
--- a/isdb-t/br-sp-SantaFeDoSul
+++ b/isdb-t/br-sp-SantaFeDoSul
@@ -1,5 +1,34 @@
-# Channel table for Santa Fé Do Sul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2510
+# Channel table for Santa F� Do Sul - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2510
+
+# Physical channel 16 (virtual 16.1)
+[Rede Século 21]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 18.1)
 [Band Paulista]
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -117,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 23.1)
-[Rede Vida]
+# Physical channel 32 (virtual 23.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-SantaGertrudes b/isdb-t/br-sp-SantaGertrudes
index 34fcc0b4..50836262 100644
--- a/isdb-t/br-sp-SantaGertrudes
+++ b/isdb-t/br-sp-SantaGertrudes
@@ -1,5 +1,5 @@
 # Channel table for Santa Gertrudes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2524
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2524
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 13.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 5.1)
+# Physical channel 39 (virtual 39.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-SantaIsabel b/isdb-t/br-sp-SantaIsabel
index a6053d64..3f16d8e6 100644
--- a/isdb-t/br-sp-SantaIsabel
+++ b/isdb-t/br-sp-SantaIsabel
@@ -1,5 +1,5 @@
 # Channel table for Santa Isabel - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3514
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3514
 
 # Physical channel 19 (virtual 25.1)
 [TV Diário]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
diff --git a/isdb-t/br-sp-SantaLucia b/isdb-t/br-sp-SantaLucia
index f37b27a2..c11308aa 100644
--- a/isdb-t/br-sp-SantaLucia
+++ b/isdb-t/br-sp-SantaLucia
@@ -1,34 +1,5 @@
-# Channel table for Santa Lúcia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2838
-
-# Physical channel 17 (virtual 19.1)
-[TV Gazeta]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 491142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+# Channel table for Santa L�cia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2838
 
 # Physical channel 18 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -59,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 12.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-SantaMariaDaSerra b/isdb-t/br-sp-SantaMariaDaSerra
index 14206773..a945b771 100644
--- a/isdb-t/br-sp-SantaMariaDaSerra
+++ b/isdb-t/br-sp-SantaMariaDaSerra
@@ -1,5 +1,5 @@
 # Channel table for Santa Maria Da Serra - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3338
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3338
 
 # Physical channel 17 (virtual 4.1)
 [Band Mais]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-SantaMercedes b/isdb-t/br-sp-SantaMercedes
index 9f738d97..6089c96a 100644
--- a/isdb-t/br-sp-SantaMercedes
+++ b/isdb-t/br-sp-SantaMercedes
@@ -1,5 +1,5 @@
 # Channel table for Santa Mercedes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4015
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4015
 
 # Physical channel 32 (virtual 32.1)
 [TV Fronteira]
diff --git a/isdb-t/br-sp-SantaRitaD'Oeste b/isdb-t/br-sp-SantaRitaD'Oeste
index 3d635aa1..c371f519 100644
--- a/isdb-t/br-sp-SantaRitaD'Oeste
+++ b/isdb-t/br-sp-SantaRitaD'Oeste
@@ -1,5 +1,5 @@
-# Channel table for Santa Rita D´ Oeste - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3972
+# Channel table for Santa Rita D� Oeste - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3972
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-SantaRitaDoPassaQuatro b/isdb-t/br-sp-SantaRitaDoPassaQuatro
index 560d42bc..8e05997b 100644
--- a/isdb-t/br-sp-SantaRitaDoPassaQuatro
+++ b/isdb-t/br-sp-SantaRitaDoPassaQuatro
@@ -1,5 +1,5 @@
 # Channel table for Santa Rita Do Passa Quatro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2752
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2752
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 30 (virtual 30.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-SantaRosaDeViterbo b/isdb-t/br-sp-SantaRosaDeViterbo
index 2b04c22b..267107fc 100644
--- a/isdb-t/br-sp-SantaRosaDeViterbo
+++ b/isdb-t/br-sp-SantaRosaDeViterbo
@@ -1,5 +1,5 @@
 # Channel table for Santa Rosa De Viterbo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2748
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2748
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 30 (virtual 30.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-SantaSalete b/isdb-t/br-sp-SantaSalete
index 56fba383..7a8c2dc6 100644
--- a/isdb-t/br-sp-SantaSalete
+++ b/isdb-t/br-sp-SantaSalete
@@ -1,5 +1,5 @@
 # Channel table for Santa Salete - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3973
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3973
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-SantanaDaPontePensa b/isdb-t/br-sp-SantanaDaPontePensa
index a98b867e..b2eef18d 100644
--- a/isdb-t/br-sp-SantanaDaPontePensa
+++ b/isdb-t/br-sp-SantanaDaPontePensa
@@ -1,5 +1,5 @@
 # Channel table for Santana Da Ponte Pensa - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3974
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3974
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-SantanaDeParnaiba b/isdb-t/br-sp-SantanaDeParnaiba
index 6109bbbd..f51da642 100644
--- a/isdb-t/br-sp-SantanaDeParnaiba
+++ b/isdb-t/br-sp-SantanaDeParnaiba
@@ -1,8 +1,66 @@
-# Channel table for Santana De Parnaíba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1825
+# Channel table for Santana De Parna�ba - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1825
+
+# Physical channel 14 (virtual 14.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 15 (virtual 16.2)
+[Mega TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 479142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -59,6 +117,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 22 (virtual 21.1)
+[Rede 21]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 23 (virtual 13.1)
 [Band]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,6 +175,93 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 24 (virtual 2.3)
+[TV Cultura, Univesp, TV Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 25 (virtual 25.1)
+[TV Pai Eterno]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 26 (virtual 27.1)
+[CNT Americana]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 28 (virtual 4.1)
 [SBT SP]
 	DELIVERY_SYSTEM = ISDBT
@@ -117,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -146,3 +320,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 31 (virtual 32.1)
+[Loading TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 575142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 44.1)
+[TVT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-SantoAnastacio b/isdb-t/br-sp-SantoAnastacio
index 22a4fecf..4a076991 100644
--- a/isdb-t/br-sp-SantoAnastacio
+++ b/isdb-t/br-sp-SantoAnastacio
@@ -1,5 +1,5 @@
-# Channel table for Santo Anastácio - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/300
+# Channel table for Santo Anast�cio - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=300
 
 # Physical channel 16 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-SantoAndre b/isdb-t/br-sp-SantoAndre
index 9941d8b2..77b7bcb0 100644
--- a/isdb-t/br-sp-SantoAndre
+++ b/isdb-t/br-sp-SantoAndre
@@ -1,8 +1,8 @@
-# Channel table for Santo André - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/951
+# Channel table for Santo Andr� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=951
 
 # Physical channel 10 (virtual 50.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 195142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -553,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -610,8 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -640,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -669,7 +669,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -697,7 +697,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -726,8 +726,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -958,6 +958,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -987,8 +1016,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 49 (virtual 59.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-SantoAntonioDaAlegria b/isdb-t/br-sp-SantoAntonioDaAlegria
index 892f0574..c9e7281c 100644
--- a/isdb-t/br-sp-SantoAntonioDaAlegria
+++ b/isdb-t/br-sp-SantoAntonioDaAlegria
@@ -1,5 +1,5 @@
-# Channel table for Santo Antônio Da Alegria - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2818
+# Channel table for Santo Ant�nio Da Alegria - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2818
 
 # Physical channel 26 (virtual 7.1)
 [EPTV Ribeirão]
diff --git a/isdb-t/br-sp-SantoAntonioDoAracangua b/isdb-t/br-sp-SantoAntonioDoAracangua
index 047457d8..3224893d 100644
--- a/isdb-t/br-sp-SantoAntonioDoAracangua
+++ b/isdb-t/br-sp-SantoAntonioDoAracangua
@@ -1,5 +1,5 @@
-# Channel table for Santo Antônio Do Aracanguá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3975
+# Channel table for Santo Ant�nio Do Aracangu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3975
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-SantoAntonioDoJardim b/isdb-t/br-sp-SantoAntonioDoJardim
index 44822205..7bf1e533 100644
--- a/isdb-t/br-sp-SantoAntonioDoJardim
+++ b/isdb-t/br-sp-SantoAntonioDoJardim
@@ -1,11 +1,11 @@
-# Channel table for Santo Antônio Do Jardim - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2827
+# Channel table for Santo Ant�nio Do Jardim - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2827
 
-# Physical channel 16 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-SantoAntonioDoPinhal b/isdb-t/br-sp-SantoAntonioDoPinhal
index 7b87718b..9eaddc7f 100644
--- a/isdb-t/br-sp-SantoAntonioDoPinhal
+++ b/isdb-t/br-sp-SantoAntonioDoPinhal
@@ -1,5 +1,5 @@
-# Channel table for Santo Antônio Do Pinhal - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3915
+# Channel table for Santo Ant�nio Do Pinhal - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3915
 
 # Physical channel 25 (virtual 25.1)
 [Band Vale]
diff --git a/isdb-t/br-sp-SantoExpedito b/isdb-t/br-sp-SantoExpedito
index 91eb9d4d..4773493f 100644
--- a/isdb-t/br-sp-SantoExpedito
+++ b/isdb-t/br-sp-SantoExpedito
@@ -1,5 +1,5 @@
 # Channel table for Santo Expedito - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3697
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3697
 
 # Physical channel 19 (virtual 10.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-SantopolisDoAguapei b/isdb-t/br-sp-SantopolisDoAguapei
index 62ab5c1d..2b4d9ab5 100644
--- a/isdb-t/br-sp-SantopolisDoAguapei
+++ b/isdb-t/br-sp-SantopolisDoAguapei
@@ -1,5 +1,5 @@
-# Channel table for Santópolis Do Aguapeí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3976
+# Channel table for Sant�polis Do Aguape� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3976
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Santos b/isdb-t/br-sp-Santos
index 9e495966..b0552e8e 100644
--- a/isdb-t/br-sp-Santos
+++ b/isdb-t/br-sp-Santos
@@ -1,8 +1,8 @@
 # Channel table for Santos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/51
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=51
 
-# Physical channel 15 (virtual 16.1)
-[Rede Vida]
+# Physical channel 15 (virtual 15.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 12.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -262,6 +262,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 38 (virtual 19.1)
+[Mais Família]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 617142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 39 (virtual 38.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
@@ -350,7 +379,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 56.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -407,11 +436,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 43.1)
-[NGT]
+# Physical channel 47 (virtual 14.1)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 665142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -436,11 +465,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 14.1)
-[Rede TV!]
+# Physical channel 48 (virtual 48.3)
+[TV Cultura Litoral, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-SaoBentoDoSapucai b/isdb-t/br-sp-SaoBentoDoSapucai
index be6ed00a..b609b931 100644
--- a/isdb-t/br-sp-SaoBentoDoSapucai
+++ b/isdb-t/br-sp-SaoBentoDoSapucai
@@ -1,5 +1,5 @@
-# Channel table for São Bento Do Sapucaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2939
+# Channel table for S�o Bento Do Sapuca� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2939
 
 # Physical channel 21 (virtual 39.1)
 [Band Vale]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 55.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 36.1)
+# Physical channel 43 (virtual 43.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 50 (virtual 2.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-SaoBernardoDoCampo b/isdb-t/br-sp-SaoBernardoDoCampo
index 4c988fd6..6d15f902 100644
--- a/isdb-t/br-sp-SaoBernardoDoCampo
+++ b/isdb-t/br-sp-SaoBernardoDoCampo
@@ -1,8 +1,8 @@
-# Channel table for São Bernardo Do Campo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3663
+# Channel table for S�o Bernardo Do Campo - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3663
 
 # Physical channel 10 (virtual 50.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 195142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -204,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 21 (virtual 49.1)
+[Terra Viva]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede 21]
 	DELIVERY_SYSTEM = ISDBT
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -292,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -407,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -495,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -552,8 +581,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -582,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -611,7 +640,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -639,7 +668,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -668,8 +697,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -900,6 +929,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -929,8 +987,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 49 (virtual 59.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-SaoCaetanoDoSul b/isdb-t/br-sp-SaoCaetanoDoSul
index 0e28114a..8976fe1d 100644
--- a/isdb-t/br-sp-SaoCaetanoDoSul
+++ b/isdb-t/br-sp-SaoCaetanoDoSul
@@ -1,8 +1,8 @@
-# Channel table for São Caetano Do Sul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3665
+# Channel table for S�o Caetano Do Sul - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3665
 
 # Physical channel 10 (virtual 50.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 195142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -175,6 +175,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 21 (virtual 49.1)
+[Terra Viva]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 22 (virtual 21.1)
 [Rede 21]
 	DELIVERY_SYSTEM = ISDBT
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -378,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -437,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -466,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -523,8 +552,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -553,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -582,7 +611,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -610,7 +639,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -639,8 +668,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -871,6 +900,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -929,8 +987,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-SaoCarlos b/isdb-t/br-sp-SaoCarlos
index a6360626..ff8f9fe7 100644
--- a/isdb-t/br-sp-SaoCarlos
+++ b/isdb-t/br-sp-SaoCarlos
@@ -1,5 +1,5 @@
-# Channel table for São Carlos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/203
+# Channel table for S�o Carlos - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=203
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 34 (virtual 11.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura Paulista, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
diff --git a/isdb-t/br-sp-SaoFrancisco b/isdb-t/br-sp-SaoFrancisco
index 06430795..b22371d3 100644
--- a/isdb-t/br-sp-SaoFrancisco
+++ b/isdb-t/br-sp-SaoFrancisco
@@ -1,5 +1,5 @@
-# Channel table for São Francisco - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3977
+# Channel table for S�o Francisco - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3977
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-SaoJoaoDaBoaVista b/isdb-t/br-sp-SaoJoaoDaBoaVista
index d8d06a38..268f8261 100644
--- a/isdb-t/br-sp-SaoJoaoDaBoaVista
+++ b/isdb-t/br-sp-SaoJoaoDaBoaVista
@@ -1,5 +1,5 @@
-# Channel table for São João Da Boa Vista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/389
+# Channel table for S�o Jo�o Da Boa Vista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=389
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -88,7 +88,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -205,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
diff --git a/isdb-t/br-sp-SaoJoaoDasDuasPontes b/isdb-t/br-sp-SaoJoaoDasDuasPontes
index b8a306fc..00029c25 100644
--- a/isdb-t/br-sp-SaoJoaoDasDuasPontes
+++ b/isdb-t/br-sp-SaoJoaoDasDuasPontes
@@ -1,5 +1,5 @@
-# Channel table for São João Das Duas Pontes - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3978
+# Channel table for S�o Jo�o Das Duas Pontes - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3978
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-SaoJoaoDeIracema b/isdb-t/br-sp-SaoJoaoDeIracema
index 9b0ea44d..0d0e884f 100644
--- a/isdb-t/br-sp-SaoJoaoDeIracema
+++ b/isdb-t/br-sp-SaoJoaoDeIracema
@@ -1,5 +1,5 @@
-# Channel table for São João De Iracema - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3979
+# Channel table for S�o Jo�o De Iracema - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3979
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-SaoJoaoDoPauD'Alho b/isdb-t/br-sp-SaoJoaoDoPauD'Alho
index 92adc69a..cc19de98 100644
--- a/isdb-t/br-sp-SaoJoaoDoPauD'Alho
+++ b/isdb-t/br-sp-SaoJoaoDoPauD'Alho
@@ -1,5 +1,5 @@
-# Channel table for São João Do Pau D´ Alho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3454
+# Channel table for S�o Jo�o Do Pau D� Alho - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3454
 
 # Physical channel 25 (virtual 56.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-SaoJoaquimDaBarra b/isdb-t/br-sp-SaoJoaquimDaBarra
index e2d4b866..1063830f 100644
--- a/isdb-t/br-sp-SaoJoaquimDaBarra
+++ b/isdb-t/br-sp-SaoJoaquimDaBarra
@@ -1,11 +1,11 @@
-# Channel table for São Joaquim Da Barra - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2647
+# Channel table for S�o Joaquim Da Barra - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2647
 
-# Physical channel 18 (virtual 17.1)
+# Physical channel 15 (virtual 15.1)
 [TV Clube Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 497142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 47.1)
-[Rede Vida]
+# Physical channel 21 (virtual 21.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 5.1)
+# Physical channel 39 (virtual 39.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 40 (virtual 23.2)
-[Rede TV!]
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 629142857
diff --git a/isdb-t/br-sp-SaoJoseDaBelaVista b/isdb-t/br-sp-SaoJoseDaBelaVista
index ee7f2ec0..ed5c4b7b 100644
--- a/isdb-t/br-sp-SaoJoseDaBelaVista
+++ b/isdb-t/br-sp-SaoJoseDaBelaVista
@@ -1,5 +1,5 @@
-# Channel table for São José Da Bela Vista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2835
+# Channel table for S�o Jos� Da Bela Vista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2835
 
 # Physical channel 16 (virtual 17.1)
 [TV Clube Ribeirão Preto]
diff --git a/isdb-t/br-sp-SaoJoseDoBarreiro b/isdb-t/br-sp-SaoJoseDoBarreiro
index 2be668f0..ebe2857d 100644
--- a/isdb-t/br-sp-SaoJoseDoBarreiro
+++ b/isdb-t/br-sp-SaoJoseDoBarreiro
@@ -1,5 +1,5 @@
-# Channel table for São José Do Barreiro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2931
+# Channel table for S�o Jos� Do Barreiro - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2931
 
 # Physical channel 21 (virtual 5.1)
 [Band Vale]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-SaoJoseDoRioPardo b/isdb-t/br-sp-SaoJoseDoRioPardo
index 6537945b..4f4a4a37 100644
--- a/isdb-t/br-sp-SaoJoseDoRioPardo
+++ b/isdb-t/br-sp-SaoJoseDoRioPardo
@@ -1,5 +1,5 @@
-# Channel table for São José Do Rio Pardo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2791
+# Channel table for S�o Jos� Do Rio Pardo - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2791
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-SaoJoseDoRioPreto b/isdb-t/br-sp-SaoJoseDoRioPreto
index 558fdff6..c681a1aa 100644
--- a/isdb-t/br-sp-SaoJoseDoRioPreto
+++ b/isdb-t/br-sp-SaoJoseDoRioPreto
@@ -1,5 +1,5 @@
-# Channel table for São José Do Rio Preto - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/199
+# Channel table for S�o Jos� Do Rio Preto - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=199
 
 # Physical channel 14 (virtual 14.1)
 [TV Canção Nova]
@@ -30,6 +30,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 16 (virtual 16.1)
+[TV Rio Verde]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 17 (virtual 59.1)
 [TV Gazeta]
 	DELIVERY_SYSTEM = ISDBT
@@ -89,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 15.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.4)
-[TV Câmara, TV Câmara São José do Rio Preto, Rede ALESP, TV Senado]
+# Physical channel 28 (virtual 28.5)
+[TV Câmara, TV Câmara São José do Rio Preto, Rede ALESP, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -233,8 +262,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 11.1)
-[Rede Vida]
+# Physical channel 32 (virtual 11.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -291,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 36.1)
-[NGT]
+# Physical channel 38 (virtual 38.1)
+[TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 617142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -321,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -407,6 +436,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 43 (virtual 43.1)
+[TV Morada do Sol]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 44 (virtual 44.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
@@ -436,6 +494,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.1)
+[Rede América]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 47 (virtual 13.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-SaoJoseDosCampos b/isdb-t/br-sp-SaoJoseDosCampos
index 3d734643..4c4d4d4d 100644
--- a/isdb-t/br-sp-SaoJoseDosCampos
+++ b/isdb-t/br-sp-SaoJoseDosCampos
@@ -1,7 +1,7 @@
-# Channel table for São José Dos Campos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/223
+# Channel table for S�o Jos� Dos Campos - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=223
 
-# Physical channel 14 (virtual 25.1)
+# Physical channel 14 (virtual 14.1)
 [RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -263,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 9.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -291,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Câmara S. José dos Campos, TV Câmara Municipal Jacareí­]
+# Physical channel 39 (virtual 39.4)
+[TV Câmara, TV Câmara Municipal Jacareí­, Rede ALESP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -407,11 +407,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 38.1)
-[NGT]
+# Physical channel 48 (virtual 22.1)
+[TV Thathi SJC]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-SaoJoseDosCampos(s.FranciscoXavier) b/isdb-t/br-sp-SaoJoseDosCampos(s.FranciscoXavier)
index c227cfcf..436ac11f 100644
--- a/isdb-t/br-sp-SaoJoseDosCampos(s.FranciscoXavier)
+++ b/isdb-t/br-sp-SaoJoseDosCampos(s.FranciscoXavier)
@@ -1,5 +1,5 @@
-# Channel table for São José Dos Campos (s. Francisco Xavier) - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3846
+# Channel table for S�o Jos� Dos Campos (s. Francisco Xavier) - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3846
 
 # Physical channel 16 (virtual 17.1)
 [TV Vanguarda São José]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 8.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
diff --git a/isdb-t/br-sp-SaoLuisDoParaitinga b/isdb-t/br-sp-SaoLuisDoParaitinga
index 3965c2d4..100a3eb3 100644
--- a/isdb-t/br-sp-SaoLuisDoParaitinga
+++ b/isdb-t/br-sp-SaoLuisDoParaitinga
@@ -1,5 +1,5 @@
-# Channel table for São Luís Do Paraitinga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/663
+# Channel table for S�o Lu�s Do Paraitinga - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=663
 
 # Physical channel 23 (virtual 7.1)
 [Band Vale]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-SaoManuel b/isdb-t/br-sp-SaoManuel
index 3c7823d5..486a7508 100644
--- a/isdb-t/br-sp-SaoManuel
+++ b/isdb-t/br-sp-SaoManuel
@@ -1,5 +1,5 @@
-# Channel table for São Manuel - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1771
+# Channel table for S�o Manuel - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1771
 
 # Physical channel 16 (virtual 31.1)
 [TV Aparecida]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 17 (virtual 19.1)
+# Physical channel 17 (virtual 17.1)
 [Band Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 18.1)
+# Physical channel 21 (virtual 21.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,7 +88,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 12.1)
+# Physical channel 22 (virtual 40.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 23.1)
 [SBT Central]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -205,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -234,7 +263,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 39.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-SaoMiguelArcanjo b/isdb-t/br-sp-SaoMiguelArcanjo
index 36e3000e..4efd8758 100644
--- a/isdb-t/br-sp-SaoMiguelArcanjo
+++ b/isdb-t/br-sp-SaoMiguelArcanjo
@@ -1,7 +1,7 @@
-# Channel table for São Miguel Arcanjo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/457
+# Channel table for S�o Miguel Arcanjo - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=457
 
-# Physical channel 24 (virtual 4.1)
+# Physical channel 24 (virtual 18.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 20.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
diff --git a/isdb-t/br-sp-SaoPaulo b/isdb-t/br-sp-SaoPaulo
index 8e4452ff..08777990 100644
--- a/isdb-t/br-sp-SaoPaulo
+++ b/isdb-t/br-sp-SaoPaulo
@@ -1,8 +1,8 @@
-# Channel table for São Paulo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1
+# Channel table for S�o Paulo - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1
 
 # Physical channel 10 (virtual 50.1)
-[TV Metropolitana]
+[RBTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 195142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -350,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -465,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -524,7 +524,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -553,7 +553,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -610,8 +610,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
-[Rede Vida]
+# Physical channel 34 (virtual 34.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -639,8 +639,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+# Physical channel 35 (virtual 52.2)
+[Diário Popular IPTV, Top TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -669,7 +669,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 36.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
@@ -697,7 +697,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -726,8 +726,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -958,6 +958,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -1016,8 +1045,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-SaoPedro b/isdb-t/br-sp-SaoPedro
index e9ae833b..c6a1c2df 100644
--- a/isdb-t/br-sp-SaoPedro
+++ b/isdb-t/br-sp-SaoPedro
@@ -1,11 +1,11 @@
-# Channel table for São Pedro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/767
+# Channel table for S�o Pedro - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=767
 
-# Physical channel 16 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 485142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -117,8 +117,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 31.1)
-[Rede Vida]
+# Physical channel 30 (virtual 30.1)
+[VTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 32 (virtual 31.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -147,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 19.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-SaoPedroDoTurvo b/isdb-t/br-sp-SaoPedroDoTurvo
index 95b1a6e4..34f17e8e 100644
--- a/isdb-t/br-sp-SaoPedroDoTurvo
+++ b/isdb-t/br-sp-SaoPedroDoTurvo
@@ -1,5 +1,5 @@
-# Channel table for São Pedro Do Turvo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3812
+# Channel table for S�o Pedro Do Turvo - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3812
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-SaoRoque b/isdb-t/br-sp-SaoRoque
index 91f9069b..484f1018 100644
--- a/isdb-t/br-sp-SaoRoque
+++ b/isdb-t/br-sp-SaoRoque
@@ -1,5 +1,5 @@
-# Channel table for São Roque - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/865
+# Channel table for S�o Roque - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=865
 
 # Physical channel 23 (virtual 30.1)
 [Band]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 28.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -88,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 34.1)
+[TV Gazeta]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 35 (virtual 35.1)
 [TV Sorocaba]
 	DELIVERY_SYSTEM = ISDBT
@@ -118,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-sp-SaoSebastiao b/isdb-t/br-sp-SaoSebastiao
index 67f12f7a..3255048f 100644
--- a/isdb-t/br-sp-SaoSebastiao
+++ b/isdb-t/br-sp-SaoSebastiao
@@ -1,5 +1,5 @@
-# Channel table for São Sebastião - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/892
+# Channel table for S�o Sebasti�o - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=892
 
 # Physical channel 15 (virtual 16.1)
 [Rede Vida]
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 25 (virtual 26.1)
-[Band Vale]
+# Physical channel 20 (virtual 57.1)
+[TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 539142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 29.1)
-[VTV]
+# Physical channel 25 (virtual 26.1)
+[Band Vale]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 539142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
-[Record TV Litoral]
+# Physical channel 29 (virtual 29.1)
+[VTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 587142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 6.1)
-[Record News]
+# Physical channel 33 (virtual 33.1)
+[Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 44.1)
-[ISTV]
+# Physical channel 35 (virtual 6.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 47.1)
+# Physical channel 47 (virtual 54.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -233,32 +233,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 57 (virtual 57.1)
-[TV Canção Nova]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 731142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-sp-SaoSebastiao(boicucanga) b/isdb-t/br-sp-SaoSebastiao(boicucanga)
index 87c6f5f8..16397281 100644
--- a/isdb-t/br-sp-SaoSebastiao(boicucanga)
+++ b/isdb-t/br-sp-SaoSebastiao(boicucanga)
@@ -1,5 +1,5 @@
-# Channel table for São Sebastião (boiçucanga) - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/894
+# Channel table for S�o Sebasti�o (boi�ucanga) - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=894
 
 # Physical channel 25 (virtual 26.1)
 [Band Vale]
diff --git a/isdb-t/br-sp-SaoSebastiao(maresias) b/isdb-t/br-sp-SaoSebastiao(maresias)
index 107ecf75..b7098540 100644
--- a/isdb-t/br-sp-SaoSebastiao(maresias)
+++ b/isdb-t/br-sp-SaoSebastiao(maresias)
@@ -1,5 +1,5 @@
-# Channel table for São Sebastião (maresias) - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/893
+# Channel table for S�o Sebasti�o (maresias) - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=893
 
 # Physical channel 25 (virtual 26.1)
 [Band Vale]
@@ -59,3 +59,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 50 (virtual 50.1)
+[ISTV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 689142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-SaoSebastiaoDaGrama b/isdb-t/br-sp-SaoSebastiaoDaGrama
index f483aed5..3df5d1b5 100644
--- a/isdb-t/br-sp-SaoSebastiaoDaGrama
+++ b/isdb-t/br-sp-SaoSebastiaoDaGrama
@@ -1,5 +1,5 @@
-# Channel table for São Sebastião Da Grama - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2819
+# Channel table for S�o Sebasti�o Da Grama - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2819
 
 # Physical channel 26 (virtual 6.1)
 [EPTV Central]
diff --git a/isdb-t/br-sp-SaoSimao b/isdb-t/br-sp-SaoSimao
index aa614f16..6014a72c 100644
--- a/isdb-t/br-sp-SaoSimao
+++ b/isdb-t/br-sp-SaoSimao
@@ -1,5 +1,5 @@
-# Channel table for São Simão - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2753
+# Channel table for S�o Sim�o - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2753
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 30 (virtual 30.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-SaoVicente b/isdb-t/br-sp-SaoVicente
index c9351cf6..d8c20c5f 100644
--- a/isdb-t/br-sp-SaoVicente
+++ b/isdb-t/br-sp-SaoVicente
@@ -1,5 +1,5 @@
-# Channel table for São Vicente - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/214
+# Channel table for S�o Vicente - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=214
 
 # Physical channel 19 (virtual 18.1)
 [TV Tribuna]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 23 (virtual 12.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -234,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 42 (virtual 56.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 35.1)
-[NGT]
+# Physical channel 45 (virtual 46.1)
+[VTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 46.1)
-[VTV]
+# Physical channel 47 (virtual 14.1)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -320,11 +320,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 14.1)
-[Rede TV!]
+# Physical channel 48 (virtual 48.3)
+[TV Cultura Litoral, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 677142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Sarapui b/isdb-t/br-sp-Sarapui
index 71b288df..4bda897e 100644
--- a/isdb-t/br-sp-Sarapui
+++ b/isdb-t/br-sp-Sarapui
@@ -1,5 +1,5 @@
-# Channel table for Sarapuí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3851
+# Channel table for Sarapu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3851
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Sarutaia b/isdb-t/br-sp-Sarutaia
index d241bb1d..c4305529 100644
--- a/isdb-t/br-sp-Sarutaia
+++ b/isdb-t/br-sp-Sarutaia
@@ -1,5 +1,5 @@
-# Channel table for Sarutaiá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3489
+# Channel table for Sarutai� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3489
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-SebastianopolisDoSul b/isdb-t/br-sp-SebastianopolisDoSul
index 9fb3cf8c..4c46017e 100644
--- a/isdb-t/br-sp-SebastianopolisDoSul
+++ b/isdb-t/br-sp-SebastianopolisDoSul
@@ -1,5 +1,5 @@
-# Channel table for Sebastianópolis Do Sul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3980
+# Channel table for Sebastian�polis Do Sul - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3980
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-SerraAzul b/isdb-t/br-sp-SerraAzul
index 917e87c2..d522c54b 100644
--- a/isdb-t/br-sp-SerraAzul
+++ b/isdb-t/br-sp-SerraAzul
@@ -1,5 +1,5 @@
 # Channel table for Serra Azul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2751
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2751
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -117,11 +117,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 50.1)
-[TV Canção Nova]
+# Physical channel 33 (virtual 2.1)
+[Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -146,7 +146,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 14.1)
+# Physical channel 35 (virtual 35.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,64 +175,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 2.1)
-[Rede Família]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 38 (virtual 29.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 40 (virtual 43.1)
 [Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-SerraNegra b/isdb-t/br-sp-SerraNegra
index 5389d6e0..97e3820b 100644
--- a/isdb-t/br-sp-SerraNegra
+++ b/isdb-t/br-sp-SerraNegra
@@ -1,7 +1,7 @@
 # Channel table for Serra Negra - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/105
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=105
 
-# Physical channel 15 (virtual 4.1)
+# Physical channel 15 (virtual 15.1)
 [Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 26.1)
-[Rede Vida]
+# Physical channel 32 (virtual 26.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 45 (virtual 14.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
diff --git a/isdb-t/br-sp-Serrana b/isdb-t/br-sp-Serrana
index 55d3fca7..a130d142 100644
--- a/isdb-t/br-sp-Serrana
+++ b/isdb-t/br-sp-Serrana
@@ -1,5 +1,5 @@
 # Channel table for Serrana - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2750
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2750
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 55.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -175,37 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 27 (virtual 50.1)
-[TV Canção Nova]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 551142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -233,40 +204,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 14.1)
-[Record News]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 36 (virtual 2.1)
+# Physical channel 33 (virtual 2.1)
 [Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 29.1)
-[NGT]
+# Physical channel 35 (virtual 35.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 617142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -349,32 +291,3 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 39.1)
-[RIT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 647142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-sp-Sertaozinho b/isdb-t/br-sp-Sertaozinho
index 6ff98f74..ce16a19b 100644
--- a/isdb-t/br-sp-Sertaozinho
+++ b/isdb-t/br-sp-Sertaozinho
@@ -1,5 +1,5 @@
-# Channel table for Sertãozinho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/222
+# Channel table for Sert�ozinho - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=222
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 21 (virtual 21.1)
-[Rede Vida]
+# Physical channel 21 (virtual 21.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,11 +146,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 35 (virtual 35.1)
-[Record News]
+# Physical channel 33 (virtual 2.1)
+[Rede Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 599142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -175,11 +175,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 36 (virtual 2.1)
-[Rede Família]
+# Physical channel 35 (virtual 35.1)
+[Record News]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 605142857
+	FREQUENCY = 599142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,3 +291,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 46.4)
+[TV Câmara, TV Câmara Municipal, Rede ALESP, TV Senado]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-SeteBarras b/isdb-t/br-sp-SeteBarras
index 3fc5907a..07a0dd5d 100644
--- a/isdb-t/br-sp-SeteBarras
+++ b/isdb-t/br-sp-SeteBarras
@@ -1,5 +1,5 @@
 # Channel table for Sete Barras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/452
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=452
 
 # Physical channel 19 (virtual 18.1)
 [TV Tribuna]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
diff --git a/isdb-t/br-sp-Severinia b/isdb-t/br-sp-Severinia
index 31ab9514..030cec35 100644
--- a/isdb-t/br-sp-Severinia
+++ b/isdb-t/br-sp-Severinia
@@ -1,5 +1,5 @@
-# Channel table for Severínia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3481
+# Channel table for Sever�nia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3481
 
 # Physical channel 24 (virtual 58.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Silveiras b/isdb-t/br-sp-Silveiras
index 6e7dcd54..7bfd1e22 100644
--- a/isdb-t/br-sp-Silveiras
+++ b/isdb-t/br-sp-Silveiras
@@ -1,5 +1,5 @@
 # Channel table for Silveiras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/679
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=679
 
 # Physical channel 22 (virtual 13.1)
 [Band Vale]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 50 (virtual 27.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Socorro b/isdb-t/br-sp-Socorro
index 68975826..d095298c 100644
--- a/isdb-t/br-sp-Socorro
+++ b/isdb-t/br-sp-Socorro
@@ -1,5 +1,5 @@
 # Channel table for Socorro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/768
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=768
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 55.1)
-[Rede Vida]
+# Physical channel 32 (virtual 55.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 46 (virtual 23.1)
-[TVB]
+# Physical channel 46 (virtual 6.1)
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-Sorocaba b/isdb-t/br-sp-Sorocaba
index 490adc3e..6d571229 100644
--- a/isdb-t/br-sp-Sorocaba
+++ b/isdb-t/br-sp-Sorocaba
@@ -1,5 +1,5 @@
 # Channel table for Sorocaba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/16
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=16
 
 # Physical channel 17 (virtual 57.1)
 [TV Gazeta]
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 31 (virtual 31.4)
-[TV Câmara, Rede ALESP, TV Câmara Municipal Sorocaba, TV Senado]
+# Physical channel 31 (virtual 31.5)
+[TV Câmara, Rede ALESP, TV Câmara Municipal Sorocaba, TV Senado, Rádio Câmara]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -204,8 +204,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 49.1)
-[Rede TV!]
+# Physical channel 48 (virtual 49.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-sp-SudMenucci b/isdb-t/br-sp-SudMenucci
index 3fb2c977..51f64126 100644
--- a/isdb-t/br-sp-SudMenucci
+++ b/isdb-t/br-sp-SudMenucci
@@ -1,5 +1,5 @@
 # Channel table for Sud Menucci - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3861
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3861
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Sumare b/isdb-t/br-sp-Sumare
index c9217937..28d79a6e 100644
--- a/isdb-t/br-sp-Sumare
+++ b/isdb-t/br-sp-Sumare
@@ -1,5 +1,5 @@
-# Channel table for Sumaré - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/281
+# Channel table for Sumar� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=281
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -88,37 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 55.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -234,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -263,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 26.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -320,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -379,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -407,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
+# Physical channel 39 (virtual 11.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -494,8 +465,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
-[Rede TV!]
+# Physical channel 49 (virtual 48.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -524,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 50.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-Suzanapolis b/isdb-t/br-sp-Suzanapolis
index ff827157..5b9209ad 100644
--- a/isdb-t/br-sp-Suzanapolis
+++ b/isdb-t/br-sp-Suzanapolis
@@ -1,5 +1,5 @@
-# Channel table for Suzanápolis - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3796
+# Channel table for Suzan�polis - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3796
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Suzano b/isdb-t/br-sp-Suzano
index 6cc0ac15..0c0a374d 100644
--- a/isdb-t/br-sp-Suzano
+++ b/isdb-t/br-sp-Suzano
@@ -1,5 +1,5 @@
 # Channel table for Suzano - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/404
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=404
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 18 (virtual 5.1)
-[Globo SP]
+[TV Globo SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 497142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -321,7 +321,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 25 (virtual 25.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 539142857
@@ -436,8 +436,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 9.1)
-[Rede TV!]
+# Physical channel 29 (virtual 9.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -466,7 +466,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 31 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 575142857
@@ -495,7 +495,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 10.1)
-[Rede Brasil]
+[TV Templo]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -582,7 +582,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 35 (virtual 52.1)
-[TVC São Paulo]
+[Diário Popular IPTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 599142857
@@ -610,7 +610,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 62.4)
+# Physical channel 38 (virtual 1.4)
 [TV Brasil SP, TV Brasil 2, TV Escola, Canal Saúde]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -639,8 +639,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 61.4)
-[TV Câmara, Rede ALESP, TV Senado, TV Câmara Municipal SP]
+# Physical channel 39 (virtual 8.4)
+[TV Câmara, Rede ALESP, TV Câmara Municipal SP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -871,6 +871,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 47 (virtual 47.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 671142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 48 (virtual 55.1)
 [TV8]
 	DELIVERY_SYSTEM = ISDBT
@@ -900,8 +929,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 50 (virtual 57.1)
-[Rede 10]
+# Physical channel 50 (virtual 12.1)
+[Rede Brasil de Televisão]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 689142857
diff --git a/isdb-t/br-sp-Tabapua b/isdb-t/br-sp-Tabapua
index 381512e9..92785c61 100644
--- a/isdb-t/br-sp-Tabapua
+++ b/isdb-t/br-sp-Tabapua
@@ -1,5 +1,5 @@
-# Channel table for Tabapuã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2161
+# Channel table for Tabapu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2161
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Tabatinga b/isdb-t/br-sp-Tabatinga
index 81a46f61..14122b6b 100644
--- a/isdb-t/br-sp-Tabatinga
+++ b/isdb-t/br-sp-Tabatinga
@@ -1,5 +1,5 @@
 # Channel table for Tabatinga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3991
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3991
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Taciba b/isdb-t/br-sp-Taciba
index ab2abc79..fb021242 100644
--- a/isdb-t/br-sp-Taciba
+++ b/isdb-t/br-sp-Taciba
@@ -1,5 +1,5 @@
 # Channel table for Taciba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3449
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3449
 
 # Physical channel 16 (virtual 18.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Taguai b/isdb-t/br-sp-Taguai
index 1d665146..1290af20 100644
--- a/isdb-t/br-sp-Taguai
+++ b/isdb-t/br-sp-Taguai
@@ -1,5 +1,5 @@
-# Channel table for Taguaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3981
+# Channel table for Tagua� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3981
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Taiacu b/isdb-t/br-sp-Taiacu
index f5202ce5..5d908044 100644
--- a/isdb-t/br-sp-Taiacu
+++ b/isdb-t/br-sp-Taiacu
@@ -1,5 +1,5 @@
-# Channel table for Taiaçu - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2744
+# Channel table for Taia�u - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2744
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
diff --git a/isdb-t/br-sp-Taiuva b/isdb-t/br-sp-Taiuva
index 2906cc70..fe447d90 100644
--- a/isdb-t/br-sp-Taiuva
+++ b/isdb-t/br-sp-Taiuva
@@ -1,5 +1,5 @@
-# Channel table for Taiúva - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2745
+# Channel table for Tai�va - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2745
 
 # Physical channel 16 (virtual 9.1)
 [TV Clube Ribeirão Preto]
diff --git a/isdb-t/br-sp-Tambau b/isdb-t/br-sp-Tambau
index 0b317f50..73b67602 100644
--- a/isdb-t/br-sp-Tambau
+++ b/isdb-t/br-sp-Tambau
@@ -1,5 +1,5 @@
-# Channel table for Tambaú - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2755
+# Channel table for Tamba� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2755
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 5.1)
+# Physical channel 24 (virtual 24.1)
 [SBT Ribeirão Preto]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 30 (virtual 30.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -146,8 +146,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-Tanabi b/isdb-t/br-sp-Tanabi
index 2ff02447..b6a01843 100644
--- a/isdb-t/br-sp-Tanabi
+++ b/isdb-t/br-sp-Tanabi
@@ -1,5 +1,34 @@
 # Channel table for Tanabi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2357
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2357
+
+# Physical channel 20 (virtual 20.1)
+[RBI TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
@@ -60,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Tapirai b/isdb-t/br-sp-Tapirai
index eb1fea07..71f681f1 100644
--- a/isdb-t/br-sp-Tapirai
+++ b/isdb-t/br-sp-Tapirai
@@ -1,11 +1,11 @@
-# Channel table for Tapiraí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2951
+# Channel table for Tapira� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2951
 
-# Physical channel 24 (virtual 33.1)
-[Record TV Paulista]
+# Physical channel 26 (virtual 26.1)
+[TV Tem Itapetininga]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 545142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 26 (virtual 26.1)
-[TV Tem Itapetininga]
+# Physical channel 42 (virtual 20.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 545142857
+	FREQUENCY = 641142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 42 (virtual 20.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 44 (virtual 38.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 641142857
+	FREQUENCY = 653142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 38.1)
-[RBI TV]
+# Physical channel 45 (virtual 45.1)
+[Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 653142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-Tapiratiba b/isdb-t/br-sp-Tapiratiba
index b64fa3cd..e50d31a4 100644
--- a/isdb-t/br-sp-Tapiratiba
+++ b/isdb-t/br-sp-Tapiratiba
@@ -1,5 +1,5 @@
 # Channel table for Tapiratiba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2741
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2741
 
 # Physical channel 26 (virtual 6.1)
 [EPTV Central]
diff --git a/isdb-t/br-sp-Taquaral b/isdb-t/br-sp-Taquaral
index ccd524d2..f8967f15 100644
--- a/isdb-t/br-sp-Taquaral
+++ b/isdb-t/br-sp-Taquaral
@@ -1,5 +1,5 @@
 # Channel table for Taquaral - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3649
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3649
 
 # Physical channel 26 (virtual 7.1)
 [EPTV Ribeirão]
diff --git a/isdb-t/br-sp-Taquaritinga b/isdb-t/br-sp-Taquaritinga
index bafd38b4..5a7d482d 100644
--- a/isdb-t/br-sp-Taquaritinga
+++ b/isdb-t/br-sp-Taquaritinga
@@ -1,5 +1,5 @@
 # Channel table for Taquaritinga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/714
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=714
 
 # Physical channel 18 (virtual 17.1)
 [TV Clube Ribeirão Preto]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Taquarituba b/isdb-t/br-sp-Taquarituba
index 5f17834f..3292a4dd 100644
--- a/isdb-t/br-sp-Taquarituba
+++ b/isdb-t/br-sp-Taquarituba
@@ -1,5 +1,5 @@
 # Channel table for Taquarituba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2890
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2890
 
 # Physical channel 24 (virtual 24.1)
 [SBT Central]
@@ -59,7 +59,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 41.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Taquarivai b/isdb-t/br-sp-Taquarivai
index d1fe65c0..2e3efbc3 100644
--- a/isdb-t/br-sp-Taquarivai
+++ b/isdb-t/br-sp-Taquarivai
@@ -1,5 +1,5 @@
-# Channel table for Taquarivaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3830
+# Channel table for Taquariva� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3830
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Tarabai b/isdb-t/br-sp-Tarabai
index ad9a40ca..cf573e2b 100644
--- a/isdb-t/br-sp-Tarabai
+++ b/isdb-t/br-sp-Tarabai
@@ -1,5 +1,5 @@
-# Channel table for Tarabaí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3698
+# Channel table for Taraba� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3698
 
 # Physical channel 19 (virtual 10.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Taruma b/isdb-t/br-sp-Taruma
index 7f331fe3..86da1b96 100644
--- a/isdb-t/br-sp-Taruma
+++ b/isdb-t/br-sp-Taruma
@@ -1,5 +1,5 @@
-# Channel table for Tarumã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3660
+# Channel table for Tarum� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3660
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
@@ -30,7 +30,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 48.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Tatui b/isdb-t/br-sp-Tatui
index f7fe21d5..589e47dc 100644
--- a/isdb-t/br-sp-Tatui
+++ b/isdb-t/br-sp-Tatui
@@ -1,7 +1,7 @@
-# Channel table for Tatuí - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/499
+# Channel table for Tatu� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=499
 
-# Physical channel 22 (virtual 59.1)
+# Physical channel 22 (virtual 25.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Taubate b/isdb-t/br-sp-Taubate
index ee637a90..b2f157d3 100644
--- a/isdb-t/br-sp-Taubate
+++ b/isdb-t/br-sp-Taubate
@@ -1,5 +1,5 @@
-# Channel table for Taubaté - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/386
+# Channel table for Taubat� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=386
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 8.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -291,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 10.1)
+# Physical channel 43 (virtual 43.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-Tejupa b/isdb-t/br-sp-Tejupa
index 34dccf8d..42bc725c 100644
--- a/isdb-t/br-sp-Tejupa
+++ b/isdb-t/br-sp-Tejupa
@@ -1,5 +1,5 @@
-# Channel table for Tejupá - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2919
+# Channel table for Tejup� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2919
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-TeodoroSampaio b/isdb-t/br-sp-TeodoroSampaio
index 9df3c328..940fa277 100644
--- a/isdb-t/br-sp-TeodoroSampaio
+++ b/isdb-t/br-sp-TeodoroSampaio
@@ -1,8 +1,8 @@
 # Channel table for Teodoro Sampaio - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/981
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=981
 
-# Physical channel 16 (virtual 16.1)
-[Rede Vida]
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 22.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
diff --git a/isdb-t/br-sp-TerraRoxa b/isdb-t/br-sp-TerraRoxa
index db2dfcdf..33f810f4 100644
--- a/isdb-t/br-sp-TerraRoxa
+++ b/isdb-t/br-sp-TerraRoxa
@@ -1,8 +1,8 @@
 # Channel table for Terra Roxa - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2742
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2742
 
-# Physical channel 21 (virtual 53.1)
-[Rede Vida]
+# Physical channel 21 (virtual 53.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Tiete b/isdb-t/br-sp-Tiete
index 5de78eb2..3dee9934 100644
--- a/isdb-t/br-sp-Tiete
+++ b/isdb-t/br-sp-Tiete
@@ -1,5 +1,5 @@
-# Channel table for Tietê - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/952
+# Channel table for Tiet� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=952
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
diff --git a/isdb-t/br-sp-Timburi b/isdb-t/br-sp-Timburi
index f606ab6a..58df81b0 100644
--- a/isdb-t/br-sp-Timburi
+++ b/isdb-t/br-sp-Timburi
@@ -1,5 +1,5 @@
 # Channel table for Timburi - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/4003
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4003
 
 # Physical channel 31 (virtual 31.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-TorreDePedra b/isdb-t/br-sp-TorreDePedra
index 3b0746a5..ee42ae26 100644
--- a/isdb-t/br-sp-TorreDePedra
+++ b/isdb-t/br-sp-TorreDePedra
@@ -1,5 +1,5 @@
 # Channel table for Torre De Pedra - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3888
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3888
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-sp-Torrinha b/isdb-t/br-sp-Torrinha
index b0e2e628..084cbf65 100644
--- a/isdb-t/br-sp-Torrinha
+++ b/isdb-t/br-sp-Torrinha
@@ -1,5 +1,5 @@
 # Channel table for Torrinha - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1443
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1443
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Bauru]
diff --git a/isdb-t/br-sp-Tremembe b/isdb-t/br-sp-Tremembe
index 21194ebf..c451fc1c 100644
--- a/isdb-t/br-sp-Tremembe
+++ b/isdb-t/br-sp-Tremembe
@@ -1,5 +1,5 @@
-# Channel table for Tremembé - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3654
+# Channel table for Trememb� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3654
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 8.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -291,7 +291,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 43 (virtual 10.1)
+# Physical channel 43 (virtual 43.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-TresFronteiras b/isdb-t/br-sp-TresFronteiras
index e917972f..da6866bd 100644
--- a/isdb-t/br-sp-TresFronteiras
+++ b/isdb-t/br-sp-TresFronteiras
@@ -1,5 +1,5 @@
-# Channel table for Três Fronteiras - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3990
+# Channel table for Tr�s Fronteiras - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3990
 
 # Physical channel 24 (virtual 18.1)
 [Band Paulista]
@@ -89,7 +89,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -117,8 +117,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 23.1)
-[Rede Vida]
+# Physical channel 32 (virtual 23.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
diff --git a/isdb-t/br-sp-Tuiuti b/isdb-t/br-sp-Tuiuti
index 1ae4ae30..367e05d9 100644
--- a/isdb-t/br-sp-Tuiuti
+++ b/isdb-t/br-sp-Tuiuti
@@ -1,5 +1,5 @@
 # Channel table for Tuiuti - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3284
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3284
 
 # Physical channel 25 (virtual 25.1)
 [EPTV Campinas]
diff --git a/isdb-t/br-sp-Tupa b/isdb-t/br-sp-Tupa
index 618a72c1..8c2ea802 100644
--- a/isdb-t/br-sp-Tupa
+++ b/isdb-t/br-sp-Tupa
@@ -1,5 +1,5 @@
-# Channel table for Tupã - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/461
+# Channel table for Tup� - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=461
 
 # Physical channel 18 (virtual 9.1)
 [Band Paulista]
@@ -30,8 +30,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 20 (virtual 20.1)
-[Rede Vida]
+# Physical channel 20 (virtual 20.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 509142857
@@ -117,7 +117,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 5.1)
+# Physical channel 28 (virtual 4.1)
 [Record TV Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 38 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+# Physical channel 38 (virtual 38.3)
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
-[Rede TV!]
+# Physical channel 48 (virtual 48.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 677142857
diff --git a/isdb-t/br-sp-TupiPaulista b/isdb-t/br-sp-TupiPaulista
index f4fa018c..63aad47e 100644
--- a/isdb-t/br-sp-TupiPaulista
+++ b/isdb-t/br-sp-TupiPaulista
@@ -1,7 +1,36 @@
 # Channel table for Tupi Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1021
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1021
 
-# Physical channel 27 (virtual 59.1)
+# Physical channel 25 (virtual 25.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 539142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 27 (virtual 54.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -59,6 +88,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 34 (virtual 34.1)
+[SBT Interior/SP]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 41 (virtual 41.1)
 [Band Paulista]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sp-Turmalina b/isdb-t/br-sp-Turmalina
index a0d3cbc3..f0c11379 100644
--- a/isdb-t/br-sp-Turmalina
+++ b/isdb-t/br-sp-Turmalina
@@ -1,5 +1,5 @@
 # Channel table for Turmalina - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3982
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3982
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Ubarana b/isdb-t/br-sp-Ubarana
index d8f7ad44..abd5ef61 100644
--- a/isdb-t/br-sp-Ubarana
+++ b/isdb-t/br-sp-Ubarana
@@ -1,5 +1,5 @@
 # Channel table for Ubarana - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3710
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3710
 
 # Physical channel 24 (virtual 25.1)
 [Band Paulista]
diff --git a/isdb-t/br-sp-Ubatuba b/isdb-t/br-sp-Ubatuba
index de611d64..288b412e 100644
--- a/isdb-t/br-sp-Ubatuba
+++ b/isdb-t/br-sp-Ubatuba
@@ -1,5 +1,5 @@
 # Channel table for Ubatuba - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/473
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=473
 
 # Physical channel 17 (virtual 58.1)
 [TV Vanguarda Taubaté]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 21 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 33 (virtual 8.1)
+# Physical channel 33 (virtual 33.1)
 [Record TV Litoral]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 45.1)
-[NGT]
+# Physical channel 41 (virtual 41.1)
+[TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 659142857
+	FREQUENCY = 635142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-UniaoPaulista b/isdb-t/br-sp-UniaoPaulista
index 6795ba2f..a9fa5be0 100644
--- a/isdb-t/br-sp-UniaoPaulista
+++ b/isdb-t/br-sp-UniaoPaulista
@@ -1,5 +1,5 @@
-# Channel table for União Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3983
+# Channel table for Uni�o Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3983
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-Urania b/isdb-t/br-sp-Urania
index 717ede73..cafe5787 100644
--- a/isdb-t/br-sp-Urania
+++ b/isdb-t/br-sp-Urania
@@ -1,5 +1,5 @@
-# Channel table for Urânia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3984
+# Channel table for Ur�nia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3984
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Urupes b/isdb-t/br-sp-Urupes
index 3c31f4c8..3e1632d0 100644
--- a/isdb-t/br-sp-Urupes
+++ b/isdb-t/br-sp-Urupes
@@ -1,5 +1,5 @@
-# Channel table for Urupês - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2826
+# Channel table for Urup�s - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2826
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-ValentimGentil b/isdb-t/br-sp-ValentimGentil
index 196dcde5..9352d5e3 100644
--- a/isdb-t/br-sp-ValentimGentil
+++ b/isdb-t/br-sp-ValentimGentil
@@ -1,5 +1,5 @@
 # Channel table for Valentim Gentil - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3802
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3802
 
 # Physical channel 17 (virtual 14.1)
 [TV Gazeta]
diff --git a/isdb-t/br-sp-Valinhos b/isdb-t/br-sp-Valinhos
index 3aea849b..7823b77b 100644
--- a/isdb-t/br-sp-Valinhos
+++ b/isdb-t/br-sp-Valinhos
@@ -1,5 +1,5 @@
 # Channel table for Valinhos - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/79
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=79
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -88,37 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 22 (virtual 55.1)
-[NGT]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 521142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -234,7 +205,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -263,7 +234,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 29 (virtual 26.1)
-[TV Eldorado]
+[Mais Família]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 563142857
@@ -320,8 +291,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -379,7 +350,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -407,7 +378,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
+# Physical channel 39 (virtual 11.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -523,8 +494,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
-[Rede TV!]
+# Physical channel 49 (virtual 48.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
diff --git a/isdb-t/br-sp-Valparaiso b/isdb-t/br-sp-Valparaiso
index 47cc0bce..b64b795c 100644
--- a/isdb-t/br-sp-Valparaiso
+++ b/isdb-t/br-sp-Valparaiso
@@ -1,5 +1,5 @@
-# Channel table for Valparaíso - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/702
+# Channel table for Valpara�so - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=702
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Rio Preto]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Vargem b/isdb-t/br-sp-Vargem
index 20c0a218..fdc5fcd0 100644
--- a/isdb-t/br-sp-Vargem
+++ b/isdb-t/br-sp-Vargem
@@ -1,5 +1,5 @@
 # Channel table for Vargem - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3494
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3494
 
 # Physical channel 17 (virtual 17.1)
 [TV Vanguarda São José]
diff --git a/isdb-t/br-sp-VargemGrandeDoSul b/isdb-t/br-sp-VargemGrandeDoSul
index b28af4a4..f5036b33 100644
--- a/isdb-t/br-sp-VargemGrandeDoSul
+++ b/isdb-t/br-sp-VargemGrandeDoSul
@@ -1,5 +1,5 @@
 # Channel table for Vargem Grande Do Sul - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/774
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=774
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-VarzeaPaulista b/isdb-t/br-sp-VarzeaPaulista
index 9e6f7352..debe41d7 100644
--- a/isdb-t/br-sp-VarzeaPaulista
+++ b/isdb-t/br-sp-VarzeaPaulista
@@ -1,5 +1,5 @@
-# Channel table for Várzea Paulista - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2944
+# Channel table for V�rzea Paulista - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2944
 
 # Physical channel 14 (virtual 14.1)
 [RBI TV]
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 2.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 533142857
@@ -204,6 +204,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 33 (virtual 33.1)
+[TV Cachoeira]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 587142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 34 (virtual 34.1)
 [Rede Vida]
 	DELIVERY_SYSTEM = ISDBT
@@ -262,6 +291,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 41 (virtual 41.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 43 (virtual 42.1)
 [Record News]
 	DELIVERY_SYSTEM = ISDBT
@@ -320,8 +378,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 45 (virtual 60.4)
-[TV Câmara, TV Câmara Municipal Jundiaí, TV Senado, Rede ALESP]
+# Physical channel 45 (virtual 12.4)
+[TV Câmara, TV Câmara Municipal Jundiaí, Rede ALESP, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 659142857
@@ -350,7 +408,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
@@ -378,7 +436,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 48 (virtual 48.1)
+# Physical channel 48 (virtual 15.1)
 [TV Rede Paulista]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-sp-VeraCruz b/isdb-t/br-sp-VeraCruz
index 4ea55fcf..f34a21e7 100644
--- a/isdb-t/br-sp-VeraCruz
+++ b/isdb-t/br-sp-VeraCruz
@@ -1,5 +1,5 @@
 # Channel table for Vera Cruz - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3985
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3985
 
 # Physical channel 16 (virtual 15.1)
 [Rede Vida]
@@ -204,3 +204,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 48 (virtual 36.1)
+[Rede TV!]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 677142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Vinhedo b/isdb-t/br-sp-Vinhedo
index a5f285bc..f8a8ad22 100644
--- a/isdb-t/br-sp-Vinhedo
+++ b/isdb-t/br-sp-Vinhedo
@@ -1,5 +1,5 @@
 # Channel table for Vinhedo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3676
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3676
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -88,8 +88,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 53.1)
-[Rede Século 21]
+# Physical channel 23 (virtual 23.2)
+[Rede Século 21, Rede Século 21 Educa]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 527142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 28 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 557142857
@@ -233,8 +233,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 32.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -292,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -320,7 +320,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 39 (virtual 39.4)
+# Physical channel 39 (virtual 11.4)
 [TV Câmara, Rede ALESP, TV Câmara Municipal Campinas, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -407,8 +407,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 49.1)
-[Rede TV!]
+# Physical channel 49 (virtual 48.2)
+[Rede TV!, Universo EADTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 683142857
@@ -437,7 +437,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 51 (virtual 51.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 695142857
diff --git a/isdb-t/br-sp-Viradouro b/isdb-t/br-sp-Viradouro
index 535b891c..f576d8bb 100644
--- a/isdb-t/br-sp-Viradouro
+++ b/isdb-t/br-sp-Viradouro
@@ -1,5 +1,5 @@
 # Channel table for Viradouro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2743
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2743
 
 # Physical channel 21 (virtual 21.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-VistaAlegreDoAlto b/isdb-t/br-sp-VistaAlegreDoAlto
index f13383a0..82b27c28 100644
--- a/isdb-t/br-sp-VistaAlegreDoAlto
+++ b/isdb-t/br-sp-VistaAlegreDoAlto
@@ -1,5 +1,5 @@
 # Channel table for Vista Alegre Do Alto - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3889
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3889
 
 # Physical channel 26 (virtual 7.1)
 [EPTV Ribeirão]
diff --git a/isdb-t/br-sp-VitoriaBrasil b/isdb-t/br-sp-VitoriaBrasil
index 00a67c2f..bf3d8c87 100644
--- a/isdb-t/br-sp-VitoriaBrasil
+++ b/isdb-t/br-sp-VitoriaBrasil
@@ -1,5 +1,5 @@
-# Channel table for Vitória Brasil - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3986
+# Channel table for Vit�ria Brasil - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3986
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-Votorantim b/isdb-t/br-sp-Votorantim
index 6ccf6905..9bed6842 100644
--- a/isdb-t/br-sp-Votorantim
+++ b/isdb-t/br-sp-Votorantim
@@ -1,8 +1,8 @@
 # Channel table for Votorantim - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/41
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=41
 
 # Physical channel 15 (virtual 15.1)
-[Rede Brasil]
+[Rede Brasil de TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 41 (virtual 41.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 635142857
diff --git a/isdb-t/br-sp-Votuporanga b/isdb-t/br-sp-Votuporanga
index b7d53611..a593491d 100644
--- a/isdb-t/br-sp-Votuporanga
+++ b/isdb-t/br-sp-Votuporanga
@@ -1,5 +1,5 @@
 # Channel table for Votuporanga - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/58
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=58
 
 # Physical channel 14 (virtual 53.1)
 [TV Unifev]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 4.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
@@ -175,8 +175,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 32.1)
-[Rede Vida]
+# Physical channel 32 (virtual 47.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -204,7 +204,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 34.1)
+# Physical channel 34 (virtual 34.2)
 [SBT Interior/SP]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -262,3 +262,32 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 49 (virtual 49.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 683142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-sp-Zacarias b/isdb-t/br-sp-Zacarias
index 004a47cc..0657b6f5 100644
--- a/isdb-t/br-sp-Zacarias
+++ b/isdb-t/br-sp-Zacarias
@@ -1,5 +1,5 @@
 # Channel table for Zacarias - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3987
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3987
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Rio Preto]
diff --git a/isdb-t/br-sp-AguasDaPrata b/isdb-t/br-sp-aguasDaPrata
index c377518f..9a72bc63 100644
--- a/isdb-t/br-sp-AguasDaPrata
+++ b/isdb-t/br-sp-aguasDaPrata
@@ -1,5 +1,5 @@
-# Channel table for Águas Da Prata - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/855
+# Channel table for �guas Da Prata - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=855
 
 # Physical channel 16 (virtual 4.1)
 [Band Mais]
@@ -147,7 +147,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 36 (virtual 39.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 605142857
diff --git a/isdb-t/br-sp-AguasDeLindoia b/isdb-t/br-sp-aguasDeLindoia
index 48291b6b..2bea5315 100644
--- a/isdb-t/br-sp-AguasDeLindoia
+++ b/isdb-t/br-sp-aguasDeLindoia
@@ -1,11 +1,11 @@
-# Channel table for Águas De Lindóia - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/851
+# Channel table for �guas De Lind�ia - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=851
 
-# Physical channel 20 (virtual 21.1)
-[RBI TV]
+# Physical channel 15 (virtual 24.1)
+[Band Mais]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 509142857
+	FREQUENCY = 479142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 24 (virtual 24.1)
-[Band Mais]
+# Physical channel 20 (virtual 21.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 509142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 28 (virtual 28.1)
-[VTV]
+# Physical channel 29 (virtual 29.1)
+[TV Evangelizar]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 557142857
+	FREQUENCY = 563142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -88,11 +88,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 29 (virtual 29.1)
-[TV Evangelizar]
+# Physical channel 30 (virtual 30.1)
+[VTV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 563142857
+	FREQUENCY = 569142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 38 (virtual 10.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 617142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-AguasDeSantaBarbara b/isdb-t/br-sp-aguasDeSantaBarbara
index a630c49c..b4779fee 100644
--- a/isdb-t/br-sp-AguasDeSantaBarbara
+++ b/isdb-t/br-sp-aguasDeSantaBarbara
@@ -1,5 +1,5 @@
-# Channel table for Águas De Santa Bárbara - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/885
+# Channel table for �guas De Santa B�rbara - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=885
 
 # Physical channel 26 (virtual 26.1)
 [TV Tem Itapetininga]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 30 (virtual 3.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 569142857
diff --git a/isdb-t/br-sp-AguasDeSaoPedro b/isdb-t/br-sp-aguasDeSaoPedro
index 170a8620..fcf5db17 100644
--- a/isdb-t/br-sp-AguasDeSaoPedro
+++ b/isdb-t/br-sp-aguasDeSaoPedro
@@ -1,5 +1,5 @@
-# Channel table for Águas De São Pedro - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/766
+# Channel table for �guas De S�o Pedro - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=766
 
 # Physical channel 25 (virtual 12.1)
 [EPTV Campinas]
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 32 (virtual 31.1)
-[Rede Vida]
+# Physical channel 32 (virtual 31.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -118,7 +118,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 46 (virtual 6.1)
-[TVB]
+[TV Thathi]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-sp-AlvaresFlorence b/isdb-t/br-sp-alvaresFlorence
index daa8d9c2..c390346d 100644
--- a/isdb-t/br-sp-AlvaresFlorence
+++ b/isdb-t/br-sp-alvaresFlorence
@@ -1,5 +1,5 @@
-# Channel table for Álvares Florence - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3738
+# Channel table for �lvares Florence - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3738
 
 # Physical channel 17 (virtual 14.1)
 [TV Gazeta]
diff --git a/isdb-t/br-sp-AlvaresMachado b/isdb-t/br-sp-alvaresMachado
index f26046ef..52a1647d 100644
--- a/isdb-t/br-sp-AlvaresMachado
+++ b/isdb-t/br-sp-alvaresMachado
@@ -1,5 +1,5 @@
-# Channel table for Álvares Machado - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3686
+# Channel table for �lvares Machado - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3686
 
 # Physical channel 17 (virtual 46.1)
 [TV Gazeta]
@@ -60,7 +60,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 22 (virtual 58.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 521142857
@@ -176,7 +176,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 39 (virtual 22.3)
-[TV Cultura, Univesp, Multicultura]
+[TV Cultura, Univesp, TV Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 623142857
@@ -233,11 +233,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 47 (virtual 14.1)
-[RBI TV]
+# Physical channel 45 (virtual 56.1)
+[CNT]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 671142857
+	FREQUENCY = 659142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -262,11 +262,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 49 (virtual 20.1)
-[Rede TV!]
+# Physical channel 47 (virtual 14.1)
+[RBI TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 683142857
+	FREQUENCY = 671142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
@@ -291,11 +291,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 55 (virtual 56.1)
-[CNT]
+# Physical channel 49 (virtual 20.1)
+[Rede TV!]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 719142857
+	FREQUENCY = 683142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-sp-AlvaroDeCarvalho b/isdb-t/br-sp-alvaroDeCarvalho
index 297403d5..de5f1ffa 100644
--- a/isdb-t/br-sp-AlvaroDeCarvalho
+++ b/isdb-t/br-sp-alvaroDeCarvalho
@@ -1,5 +1,5 @@
-# Channel table for Álvaro De Carvalho - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3923
+# Channel table for �lvaro De Carvalho - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3923
 
 # Physical channel 16 (virtual 15.1)
 [Rede Vida]
diff --git a/isdb-t/br-sp-Oleo b/isdb-t/br-sp-oleo
index d16b49be..567b4709 100644
--- a/isdb-t/br-sp-Oleo
+++ b/isdb-t/br-sp-oleo
@@ -1,5 +1,5 @@
-# Channel table for Óleo - SP - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3847
+# Channel table for �leo - SP - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3847
 
 # Physical channel 25 (virtual 25.1)
 [TV Tem Itapetininga]
diff --git a/isdb-t/br-to-Aragominas b/isdb-t/br-to-Aragominas
index caccc7b8..022d9e8b 100644
--- a/isdb-t/br-to-Aragominas
+++ b/isdb-t/br-to-Aragominas
@@ -1,5 +1,63 @@
 # Channel table for Aragominas - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2514
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2514
+
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 485142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 21 (virtual 20.1)
+[Rede Líder]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 24 (virtual 11.1)
 [TV Anhanguera Araguaína]
@@ -30,3 +88,177 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 30 (virtual 7.1)
+[TV Araguaína]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 569142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 34 (virtual 9.1)
+[TV Norte Tocantins]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 10.1)
+[TV Amazônia]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 8.1)
+[TV Aratins]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 44 (virtual 2.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 46 (virtual 6.1)
+[TV Jovem Araguaína]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-to-Araguaina b/isdb-t/br-to-Araguaina
index d7871294..f4634f55 100644
--- a/isdb-t/br-to-Araguaina
+++ b/isdb-t/br-to-Araguaina
@@ -1,8 +1,37 @@
-# Channel table for Araguaína - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/249
+# Channel table for Aragua�na - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=249
 
-# Physical channel 16 (virtual 15.1)
-[Rede Vida]
+# Physical channel 14 (virtual 14.1)
+[TV O Norte]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 16 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -30,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 21 (virtual 20.2)
+[Rede Líder, TV Assembleia TO]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 515142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 24 (virtual 11.1)
 [TV Anhanguera Araguaína]
 	DELIVERY_SYSTEM = ISDBT
@@ -88,7 +146,36 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 41 (virtual 32.1)
+# Physical channel 34 (virtual 9.1)
+[TV Norte Tocantins]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 593142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 34.1)
 [TV Canção Nova]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
@@ -175,8 +262,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 44 (virtual 2.1)
+[Rede Mundial]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 653142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 46 (virtual 6.1)
-[TV Jovem]
+[TV Jovem Araguaína]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 665142857
diff --git a/isdb-t/br-to-AxixaDoTocantins b/isdb-t/br-to-AxixaDoTocantins
index dac9af3c..db3e6b01 100644
--- a/isdb-t/br-to-AxixaDoTocantins
+++ b/isdb-t/br-to-AxixaDoTocantins
@@ -1,5 +1,5 @@
-# Channel table for Axixá Do Tocantins - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/611
+# Channel table for Axix� Do Tocantins - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=611
 
 # Physical channel 18 (virtual 4.1)
 [TV Imperatriz]
diff --git a/isdb-t/br-to-BomJesusDoTocantins b/isdb-t/br-to-BomJesusDoTocantins
new file mode 100644
index 00000000..bea26fcd
--- /dev/null
+++ b/isdb-t/br-to-BomJesusDoTocantins
@@ -0,0 +1,32 @@
+# Channel table for Bom Jesus Do Tocantins - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4293
+
+# Physical channel 22 (virtual 12.1)
+[TV Anhanguera Araguaína]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-to-BrejinhoDeNazare b/isdb-t/br-to-BrejinhoDeNazare
deleted file mode 100644
index b0347e70..00000000
--- a/isdb-t/br-to-BrejinhoDeNazare
+++ /dev/null
@@ -1,32 +0,0 @@
-# Channel table for Brejinho De Nazaré - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2359
-
-# Physical channel 23 (virtual 11.1)
-[TV Anhanguera Palmas]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-to-CaririDoTocantins b/isdb-t/br-to-CaririDoTocantins
new file mode 100644
index 00000000..27fd32af
--- /dev/null
+++ b/isdb-t/br-to-CaririDoTocantins
@@ -0,0 +1,148 @@
+# Channel table for Cariri Do Tocantins - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4294
+
+# Physical channel 14 (virtual 14.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 11.1)
+[TV Anhanguera Gurupi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 41.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 3.1)
+[TV Jovem]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 8.1)
+[TV Gurupi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-to-Babaculandia b/isdb-t/br-to-Carmolandia
index af42feba..3cf0119e 100644
--- a/isdb-t/br-to-Babaculandia
+++ b/isdb-t/br-to-Carmolandia
@@ -1,5 +1,5 @@
-# Channel table for Babaçulândia - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/522
+# Channel table for Carmol�ndia - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4295
 
 # Physical channel 24 (virtual 11.1)
 [TV Anhanguera Araguaína]
diff --git a/isdb-t/br-to-ColinasDoTocantins b/isdb-t/br-to-ColinasDoTocantins
index 580efcfd..a10693b3 100644
--- a/isdb-t/br-to-ColinasDoTocantins
+++ b/isdb-t/br-to-ColinasDoTocantins
@@ -1,8 +1,8 @@
 # Channel table for Colinas Do Tocantins - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/610
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=610
 
 # Physical channel 42 (virtual 7.1)
-[TV Jovem Colinas]
+[TV Jovem]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 641142857
@@ -30,3 +30,61 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 46 (virtual 10.1)
+[TV Colinas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 665142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 7
+[TV Colinas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 177142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-to-Gurupi b/isdb-t/br-to-Gurupi
new file mode 100644
index 00000000..ec72865c
--- /dev/null
+++ b/isdb-t/br-to-Gurupi
@@ -0,0 +1,148 @@
+# Channel table for Gurupi - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=161
+
+# Physical channel 14 (virtual 14.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 11.1)
+[TV Anhanguera Gurupi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 41.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 3.1)
+[TV Jovem]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 8.1)
+[TV Gurupi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-to-MiracemaDoTocantins b/isdb-t/br-to-MiracemaDoTocantins
index ba7ac230..dcaf0160 100644
--- a/isdb-t/br-to-MiracemaDoTocantins
+++ b/isdb-t/br-to-MiracemaDoTocantins
@@ -1,8 +1,8 @@
 # Channel table for Miracema Do Tocantins - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/526
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=526
 
-# Physical channel 17 (virtual 16.1)
-[Rede Vida]
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 491142857
@@ -59,11 +59,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 23 (virtual 11.1)
+# Physical channel 24 (virtual 4.1)
 [TV Anhanguera Palmas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 533142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-to-MonteSantoDoTocantins b/isdb-t/br-to-MonteSantoDoTocantins
deleted file mode 100644
index f07591f8..00000000
--- a/isdb-t/br-to-MonteSantoDoTocantins
+++ /dev/null
@@ -1,32 +0,0 @@
-# Channel table for Monte Santo Do Tocantins - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2362
-
-# Physical channel 23 (virtual 11.1)
-[TV Anhanguera Palmas]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-to-OliveiraDeFatima b/isdb-t/br-to-OliveiraDeFatima
deleted file mode 100644
index 150bb1f1..00000000
--- a/isdb-t/br-to-OliveiraDeFatima
+++ /dev/null
@@ -1,32 +0,0 @@
-# Channel table for Oliveira De Fátima - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2363
-
-# Physical channel 23 (virtual 11.1)
-[TV Anhanguera Palmas]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
diff --git a/isdb-t/br-to-Palmas b/isdb-t/br-to-Palmas
index 97eef0cf..c60a5cf5 100644
--- a/isdb-t/br-to-Palmas
+++ b/isdb-t/br-to-Palmas
@@ -1,5 +1,5 @@
 # Channel table for Palmas - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/160
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=160
 
 # Physical channel 14 (virtual 14.1)
 [TV Mundial]
@@ -31,7 +31,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 15 (virtual 15.1)
-[RCI]
+[TV Pai Eterno]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 479142857
@@ -59,8 +59,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 16 (virtual 5.1)
-[Record News]
+# Physical channel 16 (virtual 5.2)
+[Record News TO, Palmas Home School]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
@@ -146,8 +146,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 20 (virtual 20.1)
+[Rede Brasil de TV]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 509142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 21 (virtual 9.1)
-[SBT Tocantins]
+[TV Norte Tocantins]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 515142857
@@ -263,7 +292,7 @@
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
 # Physical channel 32 (virtual 32.1)
-[Ideal TV]
+[Loading TV]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 581142857
@@ -291,8 +320,8 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34 (virtual 33.1)
-[Rede Vida]
+# Physical channel 34 (virtual 33.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 593142857
@@ -436,7 +465,7 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 44 (virtual 44.4)
+# Physical channel 44 (virtual 10.4)
 [TV Câmara, TV Assembleia TO, Canal sem transmissão, TV Senado]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-to-Fatima b/isdb-t/br-to-Palmas(taquaracu)
index 5bac3f2c..c3bdc50f 100644
--- a/isdb-t/br-to-Fatima
+++ b/isdb-t/br-to-Palmas(taquaracu)
@@ -1,7 +1,7 @@
-# Channel table for Fátima - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2361
+# Channel table for Palmas (taquara�u) - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4330
 
-# Physical channel 23 (virtual 11.1)
+# Physical channel 23 (virtual 23.1)
 [TV Anhanguera Palmas]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
diff --git a/isdb-t/br-to-ParaisoDoTocantins b/isdb-t/br-to-ParaisoDoTocantins
index 1d319dd8..37076483 100644
--- a/isdb-t/br-to-ParaisoDoTocantins
+++ b/isdb-t/br-to-ParaisoDoTocantins
@@ -1,11 +1,11 @@
-# Channel table for Paraíso Do Tocantins - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2352
+# Channel table for Para�so Do Tocantins - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=2352
 
-# Physical channel 23 (virtual 11.1)
-[TV Anhanguera Palmas]
+# Physical channel 32 (virtual 6.1)
+[Rede Mundial]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 527142857
+	FREQUENCY = 581142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO
diff --git a/isdb-t/br-to-PedroAfonso b/isdb-t/br-to-PedroAfonso
new file mode 100644
index 00000000..f3a825f5
--- /dev/null
+++ b/isdb-t/br-to-PedroAfonso
@@ -0,0 +1,32 @@
+# Channel table for Pedro Afonso - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3357
+
+# Physical channel 22 (virtual 12.1)
+[TV Anhanguera Araguaína]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 521142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-to-PortoNacional b/isdb-t/br-to-PortoNacional
index 173c9e3e..b7f64484 100644
--- a/isdb-t/br-to-PortoNacional
+++ b/isdb-t/br-to-PortoNacional
@@ -1,5 +1,5 @@
 # Channel table for Porto Nacional - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/1405
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=1405
 
 # Physical channel 17 (virtual 10.1)
 [TV Porto]
diff --git a/isdb-t/br-to-SaoMiguelDoTocantins b/isdb-t/br-to-SaoMiguelDoTocantins
index 5557331d..c2dfba57 100644
--- a/isdb-t/br-to-SaoMiguelDoTocantins
+++ b/isdb-t/br-to-SaoMiguelDoTocantins
@@ -1,5 +1,5 @@
-# Channel table for São Miguel Do Tocantins - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3455
+# Channel table for S�o Miguel Do Tocantins - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3455
 
 # Physical channel 18 (virtual 4.1)
 [TV Imperatriz]
diff --git a/isdb-t/br-to-SitioNovoDoTocantins b/isdb-t/br-to-SitioNovoDoTocantins
index ae823dfb..8ee3484d 100644
--- a/isdb-t/br-to-SitioNovoDoTocantins
+++ b/isdb-t/br-to-SitioNovoDoTocantins
@@ -1,5 +1,5 @@
-# Channel table for Sítio Novo Do Tocantins - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/3456
+# Channel table for S�tio Novo Do Tocantins - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=3456
 
 # Physical channel 18 (virtual 4.1)
 [TV Imperatriz]
diff --git a/isdb-t/br-to-Sucupira b/isdb-t/br-to-Sucupira
new file mode 100644
index 00000000..66173dec
--- /dev/null
+++ b/isdb-t/br-to-Sucupira
@@ -0,0 +1,148 @@
+# Channel table for Sucupira - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4301
+
+# Physical channel 14 (virtual 14.1)
+[TV Aparecida]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 473142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 23 (virtual 11.1)
+[TV Anhanguera Gurupi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 527142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 41 (virtual 41.1)
+[TV Canção Nova]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 635142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 42 (virtual 3.1)
+[TV Jovem]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 641142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 43 (virtual 8.1)
+[TV Gurupi]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 647142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-to-Tocantinia b/isdb-t/br-to-Tocantinia
new file mode 100644
index 00000000..5779ce51
--- /dev/null
+++ b/isdb-t/br-to-Tocantinia
@@ -0,0 +1,90 @@
+# Channel table for Tocant�nia - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4297
+
+# Physical channel 17 (virtual 16.3)
+[Rede Vida, Rede Vida Educação]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 491142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 19 (virtual 19.1)
+[TV Miracema]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 503142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
+# Physical channel 24 (virtual 4.1)
+[TV Anhanguera Palmas]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 533142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
diff --git a/isdb-t/br-to-Tocantinopolis b/isdb-t/br-to-Tocantinopolis
index 22f52a4d..0867d29b 100644
--- a/isdb-t/br-to-Tocantinopolis
+++ b/isdb-t/br-to-Tocantinopolis
@@ -1,8 +1,8 @@
-# Channel table for Tocantinópolis - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/405
+# Channel table for Tocantin�polis - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=405
 
-# Physical channel 16 (virtual 17.1)
-[Rede Vida]
+# Physical channel 16 (virtual 17.3)
+[Rede Vida, Rede Vida Educação]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 485142857
diff --git a/isdb-t/br-to-Darcinopolis b/isdb-t/br-to-Tupirama
index 70df6e5d..456ed966 100644
--- a/isdb-t/br-to-Darcinopolis
+++ b/isdb-t/br-to-Tupirama
@@ -1,11 +1,11 @@
-# Channel table for Darcinópolis - TO - Brazil
-# Source: http://www.portalbsd.com.br/tvterrestre/cidade/2516
+# Channel table for Tupirama - TO - Brazil
+# Source: https://portalbsd.com.br/terrestres_channels.php?cidade=4299
 
-# Physical channel 24 (virtual 11.1)
+# Physical channel 22 (virtual 12.1)
 [TV Anhanguera Araguaína]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 533142857
+	FREQUENCY = 521142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO