diff --git a/README.md b/README.md
index ddf6c8a0..977d4342 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ To load a program guide, all you need to do is copy the link to one or more of t
 		<tr><td align="right" nowrap>98</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/td/osn.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap rowspan="2">🇨🇱&nbsp;Chile</td><td align="right" nowrap>79</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/cl/mi.tv.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>52</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/cl/gatotv.com.epg.xml</code></td><td align="center">🟢</td></tr>
-		<tr><td align="left" valign="top" nowrap>🇨🇳&nbsp;China</td><td align="right" nowrap>111</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/cn/tv.cctv.com.epg.xml</code></td><td align="center">🟢</td></tr>
+		<tr><td align="left" valign="top" nowrap>🇨🇳&nbsp;China</td><td align="right" nowrap>110</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/cn/tv.cctv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap rowspan="3">🇨🇴&nbsp;Colombia</td><td align="right" nowrap>103</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/co/siba.com.co.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>56</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/co/gatotv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>42</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/co/mi.tv.epg.xml</code></td><td align="center">🟢</td></tr>
@@ -109,6 +109,7 @@ To load a program guide, all you need to do is copy the link to one or more of t
 		<tr><td align="left" valign="top" nowrap>🇮🇳&nbsp;India</td><td align="right" nowrap>364</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/in/dishtv.in.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap rowspan="2">🇮🇩&nbsp;Indonesia</td><td align="right" nowrap>90</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/id/mncvision.id.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>29</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/id/vidio.com.epg.xml</code></td><td align="center">🟢</td></tr>
+		<tr><td align="left" valign="top" nowrap>🇮🇷&nbsp;Iran</td><td align="right" nowrap>29</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/ir/tva.tv.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇮🇶&nbsp;Iraq</td><td align="right" nowrap>99</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/iq/osn.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇮🇪&nbsp;Ireland</td><td align="right" nowrap>3</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/ie/ontvtonight.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap rowspan="2">🇮🇹&nbsp;Italy</td><td align="right" nowrap>145</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/it/guidatv.sky.it.epg.xml</code></td><td align="center">🟢</td></tr>
@@ -151,8 +152,8 @@ To load a program guide, all you need to do is copy the link to one or more of t
 		<tr><td align="left" valign="top" nowrap>🇵🇾&nbsp;Paraguay</td><td align="right" nowrap>39</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/py/gatotv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap rowspan="2">🇵🇪&nbsp;Peru</td><td align="right" nowrap>48</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/pe/gatotv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>21</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/pe/mi.tv.epg.xml</code></td><td align="center">🟢</td></tr>
-		<tr><td align="left" valign="top" nowrap>🇵🇱&nbsp;Poland</td><td align="right" nowrap>341</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/pl/programtv.onet.pl.epg.xml</code></td><td align="center">🟡</td></tr>
-		<tr><td align="left" valign="top" nowrap>🇵🇹&nbsp;Portugal</td><td align="right" nowrap>110</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/pt/meo.pt.epg.xml</code></td><td align="center">🟢</td></tr>
+		<tr><td align="left" valign="top" nowrap>🇵🇱&nbsp;Poland</td><td align="right" nowrap>341</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/pl/programtv.onet.pl.epg.xml</code></td><td align="center">🟢</td></tr>
+		<tr><td align="left" valign="top" nowrap>🇵🇹&nbsp;Portugal</td><td align="right" nowrap>110</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/pt/meo.pt.epg.xml</code></td><td align="center">🟡</td></tr>
 		<tr><td align="left" valign="top" nowrap rowspan="2">🇶🇦&nbsp;Qatar</td><td align="right" nowrap>99</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/qa/osn.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>22</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/qa/beinsports.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇷🇴&nbsp;Romania</td><td align="right" nowrap>224</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/ro/programetv.ro.epg.xml</code></td><td align="center">🟢</td></tr>
@@ -162,7 +163,7 @@ To load a program guide, all you need to do is copy the link to one or more of t
 		<tr><td align="left" valign="top" nowrap rowspan="2">🇸🇦&nbsp;Saudi Arabia</td><td align="right" nowrap>98</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/sa/osn.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>11</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/sa/rotana.net.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇸🇳&nbsp;Senegal</td><td align="right" nowrap>125</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/sn/dstv.com.epg.xml</code></td><td align="center">🟢</td></tr>
-		<tr><td align="left" valign="top" nowrap rowspan="2">🇷🇸&nbsp;Serbia</td><td align="right" nowrap>357</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/rs/mts.rs.epg.xml</code></td><td align="center">🟢</td></tr>
+		<tr><td align="left" valign="top" nowrap rowspan="2">🇷🇸&nbsp;Serbia</td><td align="right" nowrap>357</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/rs/mts.rs.epg.xml</code></td><td align="center">🟡</td></tr>
 		<tr><td align="right" nowrap>12</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/rs/tvarenasport.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇸🇨&nbsp;Seychelles</td><td align="right" nowrap>124</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/sc/dstv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇸🇱&nbsp;Sierra Leone</td><td align="right" nowrap>125</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/sl/dstv.com.epg.xml</code></td><td align="center">🟢</td></tr>
@@ -177,7 +178,7 @@ To load a program guide, all you need to do is copy the link to one or more of t
 		<tr><td align="left" valign="top" nowrap>🇸🇪&nbsp;Sweden</td><td align="right" nowrap>87</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/se/allente.se.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇸🇹&nbsp;São Tomé & Príncipe</td><td align="right" nowrap>128</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/st/dstv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇹🇿&nbsp;Tanzania</td><td align="right" nowrap>30</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/tz/dstv.com.epg.xml</code></td><td align="center">🟢</td></tr>
-		<tr><td align="left" valign="top" nowrap>🇹🇭&nbsp;Thailand</td><td align="right" nowrap>81</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/th/tv.trueid.net.epg.xml</code></td><td align="center">🟢</td></tr>
+		<tr><td align="left" valign="top" nowrap>🇹🇭&nbsp;Thailand</td><td align="right" nowrap>81</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/th/tv.trueid.net.epg.xml</code></td><td align="center">🟡</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇹🇬&nbsp;Togo</td><td align="right" nowrap>137</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/tg/dstv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap rowspan="4">🇹🇷&nbsp;Turkey</td><td align="right" nowrap>149</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/tr/turksatkablo.com.tr.epg.xml</code></td><td align="center">🔴</td></tr>
 		<tr><td align="right" nowrap>145</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/tr/tvplus.com.tr.epg.xml</code></td><td align="center">🟢</td></tr>
@@ -188,15 +189,15 @@ To load a program guide, all you need to do is copy the link to one or more of t
 		<tr><td align="left" valign="top" nowrap rowspan="2">🇦🇪&nbsp;United Arab Emirates</td><td align="right" nowrap>99</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/ae/osn.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>17</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/ae/mbc.net.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇬🇧&nbsp;United Kingdom</td><td align="right" nowrap>97</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/uk/ontvtonight.com.epg.xml</code></td><td align="center">🟢</td></tr>
-		<tr><td align="left" valign="top" nowrap rowspan="5">🇺🇸&nbsp;United States</td><td align="right" nowrap>880</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
+		<tr><td align="left" valign="top" nowrap rowspan="4">🇺🇸&nbsp;United States</td><td align="right" nowrap>880</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>374</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us/directv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>88</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us/tvguide.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>15</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us/gatotv.com.epg.xml</code></td><td align="center">🟢</td></tr>
-		<tr><td align="right" nowrap>6</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us/ontvtonight.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇺🇾&nbsp;Uruguay</td><td align="right" nowrap>32</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/uy/gatotv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇻🇪&nbsp;Venezuela</td><td align="right" nowrap>37</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/ve/gatotv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇾🇪&nbsp;Yemen</td><td align="right" nowrap>99</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/ye/osn.com.epg.xml</code></td><td align="center">🟢</td></tr>
-		<tr><td align="left" valign="top" nowrap>🇿🇲&nbsp;Zambia</td><td align="right" nowrap>136</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/zm/dstv.com.epg.xml</code></td><td align="center">🟢</td></tr>
+		<tr><td align="left" valign="top" nowrap rowspan="2">🇿🇲&nbsp;Zambia</td><td align="right" nowrap>136</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/zm/dstv.com.epg.xml</code></td><td align="center">🟢</td></tr>
+		<tr><td align="right" nowrap>4</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/zm/znbc.co.zm.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>🇿🇼&nbsp;Zimbabwe</td><td align="right" nowrap>130</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/zw/dstv.com.epg.xml</code></td><td align="center">🟢</td></tr>
 	</tbody>
 </table>
@@ -231,7 +232,7 @@ To load a program guide, all you need to do is copy the link to one or more of t
 		<tr><td align="left" valign="top" nowrap>&nbsp;Maine</td><td align="right" nowrap>44</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-me/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>&nbsp;Maryland</td><td align="right" nowrap>59</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-md/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>&nbsp;Massachusetts</td><td align="right" nowrap>71</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-ma/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
-		<tr><td align="left" valign="top" nowrap>&nbsp;Michigan</td><td align="right" nowrap>269</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-mi/tvtv.us.epg.xml</code></td><td align="center">🟡</td></tr>
+		<tr><td align="left" valign="top" nowrap>&nbsp;Michigan</td><td align="right" nowrap>269</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-mi/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>&nbsp;Minnesota</td><td align="right" nowrap>175</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-mn/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>&nbsp;Mississippi</td><td align="right" nowrap>130</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-ms/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>&nbsp;Missouri</td><td align="right" nowrap>230</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-mo/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
@@ -246,7 +247,7 @@ To load a program guide, all you need to do is copy the link to one or more of t
 		<tr><td align="left" valign="top" nowrap>&nbsp;North Dakota</td><td align="right" nowrap>107</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-nd/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>&nbsp;Ohio</td><td align="right" nowrap>306</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-oh/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>&nbsp;Oklahoma</td><td align="right" nowrap>173</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-ok/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
-		<tr><td align="left" valign="top" nowrap>&nbsp;Oregon</td><td align="right" nowrap>187</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-or/tvtv.us.epg.xml</code></td><td align="center">🟡</td></tr>
+		<tr><td align="left" valign="top" nowrap>&nbsp;Oregon</td><td align="right" nowrap>187</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-or/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap>&nbsp;Pennsylvania</td><td align="right" nowrap>284</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-pa/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="left" valign="top" nowrap rowspan="3">&nbsp;Puerto Rico</td><td align="right" nowrap>14</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-pr/tvtv.us.epg.xml</code></td><td align="center">🟢</td></tr>
 		<tr><td align="right" nowrap>7</td><td align="left" nowrap><code>https://iptv-org.github.io/epg/guides/us-pr/gatotv.com.epg.xml</code></td><td align="center">🟢</td></tr>