diff --git a/sites/tvgid.ua.channels.xml b/sites/tvgid.ua.channels.xml
index 87801679..d124fccc 100755
--- a/sites/tvgid.ua.channels.xml
+++ b/sites/tvgid.ua.channels.xml
@@ -3,17 +3,16 @@
   <channels>
     <channel site_id="1plus1" xmltv_id="1Plus1.ua">1+1</channel>
     <channel site_id="2plus2" xmltv_id="2Plus2.ua">2+2</channel>
-    <channel site_id="telekanal_novostej_24" xmltv_id="24Kanal.ua">24 Kanal</channel>
-    <channel site_id="34kanal" xmltv_id="34Telekanal.ua">34 Telekanal</channel>
-    <channel site_id="tv_4" xmltv_id="4Kanal.ua">4 Kanal</channel>
     <channel site_id="5kanal" xmltv_id="5Kanal.ua">5 Kanal</channel>
     <channel site_id="8_kanal" xmltv_id="8Kanal.ua">8 Kanal</channel>
+    <channel site_id="34kanal" xmltv_id="34Telekanal.ua">34 Telekanal</channel>
     <channel site_id="ajara_tv" xmltv_id="AjaraTV.ge">Ajara TV</channel>
     <channel site_id="amc" xmltv_id="AMCRussia.us">AMC Russia</channel>
     <channel site_id="animal_planet" xmltv_id="AnimalPlanetEurope.us">Animal Planet Europe</channel>
     <channel site_id="bbc_world" xmltv_id="BBCWorldNewsEurope.uk">BBC World News Europe</channel>
     <channel site_id="belarus_24" xmltv_id="Belarus24.by">Belarus 24</channel>
     <channel site_id="bigudi" xmltv_id="Bigudi.ua">Bigudi</channel>
+    <channel site_id="bolt" xmltv_id="TVBolt.ua">TV Bolt</channel>
     <channel site_id="cartoon_network" xmltv_id="CartoonNetworkRussiaSouthEastEurope.us">Cartoon Network Russia &amp; South East Europe</channel>
     <channel site_id="cbs_reality" xmltv_id="CBSRealityEurope.us">CBS Reality Europe</channel>
     <channel site_id="che" xmltv_id="Che.ru">Che!</channel>
@@ -32,84 +31,86 @@
     <channel site_id="eurosport_2_rossiya" xmltv_id="Eurosport2Rossiya.fr">Eurosport 2 Rossiya</channel>
     <channel site_id="evrokino" xmltv_id="Evrokino.ru">Evrokino</channel>
     <channel site_id="extreme_sport" xmltv_id="ExtremeSportsChannel.nl">Extreme Sports Channel</channel>
-    <channel site_id="fox_life" xmltv_id="FoxLifeRussia.us">Fox Life Russia</channel>
     <channel site_id="fox" xmltv_id="FoxRussia.us">Fox Russia</channel>
+    <channel site_id="fox_life" xmltv_id="FoxLifeRussia.us">Fox Life Russia</channel>
     <channel site_id="futbol_1" xmltv_id="Futbol1.ua">Futbol 1</channel>
     <channel site_id="futbol_2" xmltv_id="Futbol2.ua">Futbol 2</channel>
+    <channel site_id="galicsina_otb" xmltv_id="OTBGalychyna.ua">OTB Galychyna</channel>
     <channel site_id="glas" xmltv_id="Glas.ua">Glas</channel>
+    <channel site_id="gtrk_kultura" xmltv_id="UAKultura.ua">UA: Kultura</channel>
     <channel site_id="ictv" xmltv_id="ICTV.ua">ICTV</channel>
+    <channel site_id="id_investigation_discovery_yevropa" xmltv_id="InvestigationDiscoveryEurope.us">Investigation Discovery Europe</channel>
     <channel site_id="indigo_tv" xmltv_id="IndigoTV.ua">Indigo TV</channel>
     <channel site_id="inter" xmltv_id="Inter.ua">Inter</channel>
     <channel site_id="inter_plus" xmltv_id="InterPlus.ua">Inter +</channel>
-    <channel site_id="id_investigation_discovery_yevropa" xmltv_id="InvestigationDiscoveryEurope.us">Investigation Discovery Europe</channel>
+    <channel site_id="jivi" xmltv_id="Zhivi.ru">Zhivi!</channel>
     <channel site_id="k1" xmltv_id="K1.ua">K1</channel>
     <channel site_id="k2" xmltv_id="K2.ua">K2</channel>
-    <channel site_id="kinoxit" xmltv_id="Kinohit.ru">Kinohit</channel>
+    <channel site_id="kiev_tv" xmltv_id="KyivTV.ua">Kyïv TV</channel>
     <channel site_id="kinomiks" xmltv_id="Kinomiks.ru">Kinomiks</channel>
     <channel site_id="kinopremera_hd" xmltv_id="Kinopremyera.ru">Kinopremyera</channel>
+    <channel site_id="kinoxit" xmltv_id="Kinohit.ru">Kinohit</channel>
+    <channel site_id="kultura_rossiya_k" xmltv_id="RossiyaK.ru">Rossiya K</channel>
     <channel site_id="kvartal_tv" xmltv_id="KvartalTV.ua">Kvartal TV</channel>
-    <channel site_id="kiev_tv" xmltv_id="KyivTV.ua">Kyïv TV</channel>
     <channel site_id="m1" xmltv_id="M1.ua">M1</channel>
     <channel site_id="malyatko_tv" xmltv_id="MalyatkoTV.ua">Malyatko TV</channel>
-    <channel site_id="match_tv" xmltv_id="Match.ru">Match!</channel>
     <channel site_id="match_arena" xmltv_id="MatchArena.ru">Match! Arena</channel>
     <channel site_id="match_boets" xmltv_id="MatchBoets.ru">Match! Boets</channel>
     <channel site_id="match_igra" xmltv_id="MatchIgra.ru">Match! Igra</channel>
+    <channel site_id="match_tv" xmltv_id="Match.ru">Match!</channel>
     <channel site_id="mega" xmltv_id="Mega.ua">Mega</channel>
     <channel site_id="mir" xmltv_id="Mir.ru">Mir</channel>
     <channel site_id="multilandiya" xmltv_id="Multilandia.ru">Multilandia</channel>
     <channel site_id="music_box_ua" xmltv_id="MusicBoxUkraina.ua">Music Box Ukraina</channel>
     <channel site_id="muz_tv" xmltv_id="MuzTV.ru">Muz TV</channel>
     <channel site_id="muzhskoe_kino" xmltv_id="MuzhskoeKino.ru">Muzhskoe Kino</channel>
+    <channel site_id="nadia" xmltv_id="TelekanalNadiya.us">Telekanal Nadiya</channel>
     <channel site_id="nash" xmltv_id="Nash.ua">Nash</channel>
     <channel site_id="nashe_novoe-kino" xmltv_id="NasheNovoeKino.ru">Nashe Novoe Kino</channel>
-    <channel site_id="national_geographic" xmltv_id="NationalGeographicRussia.us">National Geographic Russia</channel>
     <channel site_id="nat_geo_wild" xmltv_id="NationalGeographicWildRussia.us">National Geographic Wild Russia</channel>
+    <channel site_id="national_geographic" xmltv_id="NationalGeographicRussia.us">National Geographic Russia</channel>
     <channel site_id="nickelodeon_sng" xmltv_id="NickelodeonCIS.us">Nickelodeon CIS</channel>
     <channel site_id="nlo_tv" xmltv_id="NLOTV.ua">NLO TV</channel>
     <channel site_id="noviy_kanal" xmltv_id="NovyKanal.ua">Novy Kanal</channel>
     <channel site_id="ntn" xmltv_id="NTN.ua">NTN</channel>
     <channel site_id="obozrevatel" xmltv_id="ObozrevatelTV.ua">Obozrevatel TV</channel>
-    <channel site_id="otse" xmltv_id="Oce.ua">Oce</channel>
     <channel site_id="ohotnik_rybolov" xmltv_id="OhotnikiRybolov.ru">Ohotnik i Rybolov</channel>
-    <channel site_id="galicsina_otb" xmltv_id="OTBGalychyna.ua">OTB Galychyna</channel>
+    <channel site_id="otse" xmltv_id="Oce.ua">Oce</channel>
     <channel site_id="otv" xmltv_id="OTV.ua">OTV</channel>
     <channel site_id="paramount_comedy" xmltv_id="ParamountComedyUkraina.us">Paramount Comedy Ukraina</channel>
     <channel site_id="pervyj-delovoj" xmltv_id="PershiyDiloviy.ua">Pershiy Diloviy</channel>
     <channel site_id="pixel" xmltv_id="PikselTV.ua">Piksel TV</channel>
     <channel site_id="plus_plus" xmltv_id="PlusPlus.ua">Plus Plus</channel>
+    <channel site_id="polonia" xmltv_id="TVPPolonia.pl">TVP Polonia</channel>
     <channel site_id="polsat" xmltv_id="Polsat.pl">Polsat</channel>
     <channel site_id="pryamoj" xmltv_id="Pryamyy.ua">Pryamyy</channel>
     <channel site_id="pyatnitsa" xmltv_id="Pyatnitsa.ru">Pyatnitsa!</channel>
-    <channel site_id="kultura_rossiya_k" xmltv_id="RossiyaK.ru">Rossiya K</channel>
-    <channel site_id="rtvi" xmltv_id="RTViEurope.ru">RTVi Europe</channel>
     <channel site_id="riziy" xmltv_id="Ryzhiy.ru">Ryzhiy</channel>
+    <channel site_id="rtvi" xmltv_id="RTViEurope.ru">RTVi Europe</channel>
     <channel site_id="setanta_sports_ukraine" xmltv_id="SetantaSportsUkraine.ie">Setanta Sports Ukraine</channel>
     <channel site_id="solnce" xmltv_id="Sonce.ua">Sonce</channel>
     <channel site_id="sony_sci_fi" xmltv_id="SonySciFiRussia.us">Sony Sci-Fi Russia</channel>
+    <channel site_id="spas" xmltv_id="TelekanalSpas.ru">Telekanal Spas</channel>
     <channel site_id="star_cinema" xmltv_id="StarCinema.ua">Star Cinema</channel>
     <channel site_id="star_family" xmltv_id="StarFamily.ua">Star Family</channel>
-    <channel site_id="sts" xmltv_id="STS.ru">STS</channel>
-    <channel site_id="nadia" xmltv_id="TelekanalNadiya.us">Telekanal Nadiya</channel>
-    <channel site_id="spas" xmltv_id="TelekanalSpas.ru">Telekanal Spas</channel>
     <channel site_id="stb" xmltv_id="TelekanalSTB.ua">Telekanal STB</channel>
-    <channel site_id="ukraina" xmltv_id="TelekanalUkraina.ua">Telekanal Ukraina</channel>
+    <channel site_id="sts" xmltv_id="STS.ru">STS</channel>
+    <channel site_id="telekanal_novostej_24" xmltv_id="24Kanal.ua">24 Kanal</channel>
     <channel site_id="tet" xmltv_id="TET.ua">TET</channel>
     <channel site_id="travel_channel" xmltv_id="TravelChannelEurope.us">Travel Channel Europe</channel>
-    <channel site_id="tv_1000_action_east" xmltv_id="TV1000Action.se">TV 1000 Action</channel>
+    <channel site_id="tv3" xmltv_id="TV3.ru">TV 3</channel>
     <channel site_id="tv1000_east" xmltv_id="TV1000East.se">TV 1000 East</channel>
     <channel site_id="tv1000_world_kino" xmltv_id="TV1000WorldKino.se">TV 1000 World Kino</channel>
-    <channel site_id="tv3" xmltv_id="TV3.ru">TV 3</channel>
+    <channel site_id="tv_4" xmltv_id="TV4.ua">TV-4</channel>
     <channel site_id="tv_5" xmltv_id="TV5.ua">TV 5</channel>
-    <channel site_id="bolt" xmltv_id="TVBolt.ua">TV Bolt</channel>
+    <channel site_id="tv_1000_action_east" xmltv_id="TV1000Action.se">TV 1000 Action</channel>
     <channel site_id="tv_xxi" xmltv_id="TVXXI.lv">TV XXI</channel>
     <channel site_id="tvp1" xmltv_id="TVP1.pl">TVP 1</channel>
     <channel site_id="tvp2" xmltv_id="TVP2.pl">TVP 2</channel>
-    <channel site_id="polonia" xmltv_id="TVPPolonia.pl">TVP Polonia</channel>
     <channel site_id="u" xmltv_id="U.ru">U</channel>
-    <channel site_id="gtrk_kultura" xmltv_id="UAKultura.ua">UA: Kultura</channel>
     <channel site_id="ua_pervyj" xmltv_id="UAPershiy.ua">UA: Pershiy</channel>
     <channel site_id="ua_zakarpattya" xmltv_id="UAZakarpattya.ua">UA: Zakarpattya</channel>
+    <channel site_id="ukraina" xmltv_id="TelekanalUkraina.ua">Telekanal Ukraina</channel>
     <channel site_id="unian_tb" xmltv_id="UnianTV.ua">Unian TV</channel>
     <channel site_id="viasat_explore" xmltv_id="ViasatExploreEast.se">Viasat Explore East</channel>
     <channel site_id="viasat_history" xmltv_id="ViasatHistory.se">Viasat History</channel>
@@ -118,9 +119,8 @@
     <channel site_id="vip_comedy" xmltv_id="VIPComedy.se">VIP Comedy</channel>
     <channel site_id="vip_premiere_cee" xmltv_id="VIPPremiere.se">VIP Premiere</channel>
     <channel site_id="xsport" xmltv_id="XSport.ua">X Sport</channel>
-    <channel site_id="jivi" xmltv_id="Zhivi.ru">Zhivi!</channel>
-    <channel site_id="zoopark" xmltv_id="ZooPark.ru">Zoo Park</channel>
     <channel site_id="zoo_tv" xmltv_id="ZooTV.ru">Zoo TV</channel>
     <channel site_id="zoom" xmltv_id="Zoom.ua">Zoom</channel>
+    <channel site_id="zoopark" xmltv_id="ZooPark.ru">Zoo Park</channel>
   </channels>
 </site>
\ No newline at end of file
diff --git a/sites/tvgid.ua.config.js b/sites/tvgid.ua.config.js
index b54fca8a..11e3262b 100644
--- a/sites/tvgid.ua.config.js
+++ b/sites/tvgid.ua.config.js
@@ -10,9 +10,9 @@ dayjs.extend(utc)
 dayjs.extend(timezone)
 dayjs.extend(customParseFormat)
 
-let PM = false
 module.exports = {
   lang: 'uk',
+  days: 3,
   site: 'tvgid.ua',
   channels: 'tvgid.ua.channels.xml',
   output: '.gh-pages/guides/tvgid.ua.guide.xml',
@@ -20,6 +20,7 @@ module.exports = {
     return `https://tvgid.ua/channels/${channel.site_id}/${date.format('DDMMYYYY')}/tmall/`
   },
   parser: function ({ buffer, date }) {
+    let PM = false
     const programs = []
     const items = parseItems(buffer)
     items.forEach(item => {
@@ -28,7 +29,7 @@ module.exports = {
       if (!start) return
       if (start.hour() > 11) PM = true
       if (start.hour() < 12 && PM) start = start.add(1, 'd')
-      const stop = parseStop(item, start)
+      const stop = start.add(1, 'h')
       if (programs.length) {
         programs[programs.length - 1].stop = start
       }
@@ -40,10 +41,6 @@ module.exports = {
   }
 }
 
-function parseStop(item, date) {
-  return date.hour(7)
-}
-
 function parseStart(item, date) {
   let time = (item.querySelector('td > table > tbody > tr > td.time') || { textContent: '' })
     .textContent