From bdf12c5d51ccdd1ea12398e8b5214a9b1df1b049 Mon Sep 17 00:00:00 2001
From: freearhey <7253922+freearhey@users.noreply.github.com>
Date: Tue, 28 Nov 2023 15:03:19 +0300
Subject: [PATCH] Update teliatv.ee

---
 sites/teliatv.ee/readme.md                  | 53 +++++++++++++++
 sites/teliatv.ee/teliatv.ee.config.js       |  2 +-
 sites/teliatv.ee/teliatv.ee.test.js         |  3 -
 sites/teliatv.ee/teliatv.ee_en.channels.xml | 55 +++++++++++-----
 sites/teliatv.ee/teliatv.ee_et.channels.xml | 72 +++++++++++++++++----
 sites/teliatv.ee/teliatv.ee_ru.channels.xml | 65 ++++++++++++++-----
 6 files changed, 198 insertions(+), 52 deletions(-)
 create mode 100644 sites/teliatv.ee/readme.md

diff --git a/sites/teliatv.ee/readme.md b/sites/teliatv.ee/readme.md
new file mode 100644
index 00000000..087ab8bd
--- /dev/null
+++ b/sites/teliatv.ee/readme.md
@@ -0,0 +1,53 @@
+# teliatv.ee
+
+https://www.teliatv.ee/kava/ (Estonian)
+
+https://www.teliatv.ee/en/kava/ (English)
+
+https://www.teliatv.ee/ru/kava/ (Russian)
+
+### Download the guide
+
+Estonian:
+
+```sh
+npm run grab -- --channels=sites/teliatv.ee/teliatv.ee_et.channels.xml
+```
+
+English:
+
+```sh
+npm run grab -- --channels=sites/teliatv.ee/teliatv.ee_en.channels.xml
+```
+
+Russian:
+
+```sh
+npm run grab -- --channels=sites/teliatv.ee/teliatv.ee_ru.channels.xml
+```
+
+### Update channel list
+
+Estonian:
+
+```sh
+npm run channels:parse -- --config=./sites/teliatv.ee/teliatv.ee.config.js --output=./sites/teliatv.ee/teliatv.ee_et.channels.xml --set=lang:et
+```
+
+English:
+
+```sh
+npm run channels:parse -- --config=./sites/teliatv.ee/teliatv.ee.config.js --output=./sites/teliatv.ee/teliatv.ee_en.channels.xml --set=lang:en
+```
+
+Russian:
+
+```sh
+npm run channels:parse -- --config=./sites/teliatv.ee/teliatv.ee.config.js --output=./sites/teliatv.ee/teliatv.ee_ru.channels.xml --set=lang:ru
+```
+
+### Test
+
+```sh
+npm test -- teliatv.ee
+```
diff --git a/sites/teliatv.ee/teliatv.ee.config.js b/sites/teliatv.ee/teliatv.ee.config.js
index 426b7fd3..a77a596a 100644
--- a/sites/teliatv.ee/teliatv.ee.config.js
+++ b/sites/teliatv.ee/teliatv.ee.config.js
@@ -35,7 +35,7 @@ module.exports = {
     return Object.values(data.channels).map(item => {
       return {
         lang,
-        site_id: item.id,
+        site_id: `${lang}#${item.id}`,
         name: item.title
       }
     })
diff --git a/sites/teliatv.ee/teliatv.ee.test.js b/sites/teliatv.ee/teliatv.ee.test.js
index a41622ef..8bc58e7d 100644
--- a/sites/teliatv.ee/teliatv.ee.test.js
+++ b/sites/teliatv.ee/teliatv.ee.test.js
@@ -1,6 +1,3 @@
-// npm run channels:parse -- --config=./sites/teliatv.ee/teliatv.ee.config.js --output=./sites/teliatv.ee/teliatv.ee.channels.xml --set=lang:et
-// npm run grab -- --site=teliatv.ee
-
 const { parser, url } = require('./teliatv.ee.config.js')
 const dayjs = require('dayjs')
 const utc = require('dayjs/plugin/utc')
diff --git a/sites/teliatv.ee/teliatv.ee_en.channels.xml b/sites/teliatv.ee/teliatv.ee_en.channels.xml
index 68d403ef..2f882e43 100644
--- a/sites/teliatv.ee/teliatv.ee_en.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_en.channels.xml
@@ -1,21 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <!-- <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1224">Food Network</channel> -->
-  <!-- <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#243">Fireplace</channel> -->
-  <!-- <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#829">AMC</channel> -->
   <channel site="teliatv.ee" lang="de" xmltv_id="arte.fr" site_id="en#24">Arte</channel>
   <channel site="teliatv.ee" lang="de" xmltv_id="ntv.de" site_id="en#145">n-tv</channel>
   <channel site="teliatv.ee" lang="de" xmltv_id="RTL.de" site_id="en#20">RTL</channel>
   <channel site="teliatv.ee" lang="de" xmltv_id="RTLZwei.de" site_id="en#1229">RTL2</channel>
   <channel site="teliatv.ee" lang="de" xmltv_id="SAT1.de" site_id="en#11">SAT 1</channel>
   <channel site="teliatv.ee" lang="de" xmltv_id="ZDF.de" site_id="en#1230">ZDF</channel>
+  <!-- <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1">ETV</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#2">TV3</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#3">Kanal 2</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#8">TVXXI</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#111">ETV 2</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#140">TVN</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#141">Orsent TV</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#220">LIFE TV</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#223">TV6</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#248">TAEVAS TV7</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#261">TBN Baltia</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#728">Duo 5</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#829">AMC</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1224">Food Network</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1252">ETV+</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1297">НЕБЕСА ТВ7</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1333">Eesti Kanal</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1343">Kanal 7</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1347">Ukraine 24</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1348">Current Time</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1349">3+</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1352">Kanal 7+</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1353">Kino 7</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="en#1354">Semejka</channel> -->
   <channel site="teliatv.ee" lang="en" xmltv_id="AlJazeeraEnglish.qa" site_id="en#89">Al Jazeera</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="AloTV.ee" site_id="en#157">ALO-TV</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="AnimalPlanet.ru" site_id="en#31">Animal Planet</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="BBCEarthAsia.uk" site_id="en#1264">BBC Earth</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="BBCNewsEurope.uk" site_id="en#52">BBC World</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="BloombergTVEurope.uk" site_id="en#81">Bloomberg TV</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="BoomerangCEE.us" site_id="en#57">Boomerang</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="BoomerangCEE.us" site_id="en#57">Cartoonito</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="CartoonNetwork.ru" site_id="en#55">Cartoon Network</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="ClubMTVEurope.uk" site_id="en#70">MTV Club</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="CNBCEurope.uk" site_id="en#82">CNBC Europe</channel>
@@ -32,23 +53,23 @@
   <channel site="teliatv.ee" lang="en" xmltv_id="EpicDrama.se" site_id="en#1292">Epic Drama</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="EuronewsEnglish.fr" site_id="en#59">Euronews</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="EuronewsRussian.fr" site_id="en#1286">Euronews Rus</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="Eurosport1.ru" site_id="en#35">Eurosport 1</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="Eurosport1.ru" site_id="en#35">Eurosport</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="Eurosport2.ru" site_id="en#51">Eurosport 2</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="FashionTV.ru" site_id="en#54">Fashion TV</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="FightSports.us" site_id="en#1268">Fight Sports</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="Filmzone.ee" site_id="en#1238">Filmzone</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="FilmzonePlus.ee" site_id="en#1239">Filmzone+</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="FoxLife.ru" site_id="en#105">Fox Life</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="Fox.ru" site_id="en#77">Fox</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="FoxLife.ru" site_id="en#105">Fox Life</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="France24English.fr" site_id="en#143">France 24</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="Go3Films.lv" site_id="en#226">TV3 Film</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="Go3Films.lv" site_id="en#226">Go3 Films</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="HGTV.ru" site_id="en#1346">HGTV</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="History2Asia.us" site_id="en#1236">HISTORY2</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="History.ru" site_id="en#251">History Channel</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="Inspira.ee" site_id="en#1338">Inspira</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="InvestigationDiscovery.ru" site_id="en#32">ID</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="KidZoneMax.ee" site_id="en#1086">Kidzone Max</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="KidZoneMini.ee" site_id="en#1293">Kidzone Mini</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="KidZoneMax.ee" site_id="en#1086">Kidzone</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="MCMTop.ru" site_id="en#84">MCM TOP</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="Mezzo.fr" site_id="en#36">Mezzo</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="MezzoLive.fr" site_id="en#789">Mezzo Live HD</channel>
@@ -57,7 +78,7 @@
   <channel site="teliatv.ee" lang="en" xmltv_id="MTV90s.uk" site_id="en#69">MTV 90s</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="MTVGlobal.uk" site_id="en#39">MTV Europe</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="MTVHitsEurope.uk" site_id="en#71">MTV Hits</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="MTVLive.uk" site_id="en#1302">MTV Live HD</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="MTVLive.uk" site_id="en#1302">MTV Live</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="MyHits.ee" site_id="en#76">MyHits</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="NationalGeographic.ru" site_id="en#19">National Geographic</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="NationalGeographicWild.ru" site_id="en#79">Nat Geo Wild</channel>
@@ -66,25 +87,25 @@
   <channel site="teliatv.ee" lang="en" xmltv_id="NicktoonsScandinavia.nl" site_id="en#1301">nicktoons</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="ProSieben.de" site_id="en#60">PRO 7</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="RFMTV.fr" site_id="en#83">RFM TV</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="RTLSuper.de" site_id="en#17">Super RTL</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="SetantaSports1Evraziya.ie" site_id="en#1206">Setanta Sports</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="SkyNewsInternational.uk" site_id="en#91">SKY News</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="Smartzone.ee" site_id="en#1344">Smartzone</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="StingrayClassica.ca" site_id="en#790">Classica</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="StingrayDJAZZ.ca" site_id="en#1129">DJAZZ.tv</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="StingrayiConcerts.ca" site_id="en#731">iConcerts</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="RTLSuper.de" site_id="en#17">Super RTL</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="TLC.ru" site_id="en#823">TLC</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="TravelChannelEMEA.uk" site_id="en#1222">Travel Channel</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="vijuTV1000action.ru" site_id="en#227">TV1000 Action</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="vijuTV1000.ru" site_id="en#224">TV1000 East</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="vijuTV1000russkoe.ru" site_id="en#225">TV1000 World Kino</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="TV3Life.ee" site_id="en#221">TV3 Life</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="TV3Sport.uk" site_id="en#228">TV3 Sport</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="TV3Sport2.uk" site_id="en#229">TV3 Sport2</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="TV3Sport2.uk" site_id="en#229">Go3 Sport 2</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="TV3Sport.uk" site_id="en#228">Go3 Sport 1</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="ViasatExplore.se" site_id="en#230">Viasat Explore</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="ViasatHistory.se" site_id="en#231">Viasat History</channel>
   <channel site="teliatv.ee" lang="en" xmltv_id="ViasatNature.se" site_id="en#716">Viasat Nature</channel>
-  <channel site="teliatv.ee" lang="en" xmltv_id="vijuPlusComedy.ru" site_id="en#1303">VIP Comedy</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="vijuPlusComedy.ru" site_id="en#1303">Viasat Kino Comedy</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="vijuTV1000.ru" site_id="en#224">Viasat Kino</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="vijuTV1000action.ru" site_id="en#227">Viasat Kino Action</channel>
+  <channel site="teliatv.ee" lang="en" xmltv_id="vijuTV1000russkoe.ru" site_id="en#225">Viasat Kino World</channel>
   <channel site="teliatv.ee" lang="es" xmltv_id="TVEInternacionalEuropeAsia.es" site_id="en#255">TVEi</channel>
   <channel site="teliatv.ee" lang="fi" xmltv_id="YleTV1.fi" site_id="en#12">YLE TV1</channel>
   <channel site="teliatv.ee" lang="fi" xmltv_id="YleTV2.fi" site_id="en#13">YLE TV2</channel>
@@ -92,5 +113,5 @@
   <channel site="teliatv.ee" lang="fr" xmltv_id="TV5MondeEurope.fr" site_id="en#85">TV5MONDE Europe</channel>
   <channel site="teliatv.ee" lang="it" xmltv_id="Rai1.it" site_id="en#86">RAI 1</channel>
   <channel site="teliatv.ee" lang="sv" xmltv_id="SVT1.se" site_id="en#1259">SVT1</channel>
-  <channel site="teliatv.ee" lang="sv" xmltv_id="SVT2.se" site_id="en#1260">SVT2</channel>  
+  <channel site="teliatv.ee" lang="sv" xmltv_id="SVT2.se" site_id="en#1260">SVT2</channel>
 </channels>
diff --git a/sites/teliatv.ee/teliatv.ee_et.channels.xml b/sites/teliatv.ee/teliatv.ee_et.channels.xml
index d81070b7..bd615032 100644
--- a/sites/teliatv.ee/teliatv.ee_et.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_et.channels.xml
@@ -1,13 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <!-- <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="et#1224">Food Network</channel> -->
-  <!-- <channel site="teliatv.ee" lang="en" xmltv_id="" site_id="et#829">AMC</channel> -->
-  <!-- <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#243">Kamin</channel> -->
+  <!-- <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#38">MTV 00s</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#39">MTV Europe</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#50">CNN International</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#52">BBC World</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#54">Fashion TV</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#55">Cartoon Network</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#59">Euronews</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#69">MTV 90s</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#70">MTV Club</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#71">MTV Hits</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#72">MTV 80s</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#79">Nat Geo Wild</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#85">TV5MONDE Europe</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#86">RAI 1</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#89">Al Jazeera</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#91">SKY News</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#102">Disney Channel</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#103">Disney Junior</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#140">TVN</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#141">Orsent TV</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#143">France 24</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#228">Go3 Sport 1</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#229">Go3 Sport 2</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#255">TVEi</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#256">France 2</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#261">TBN Baltia</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#731">iConcerts</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#790">Classica</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#829">AMC</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1129">DJAZZ.tv</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1224">Food Network</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1229">RTL2</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1230">ZDF</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1236">HISTORY2</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1259">SVT1</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1260">SVT2</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1264">BBC Earth</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1268">Fight Sports</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1286">Euronews Rus</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1297">НЕБЕСА ТВ7</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1302">MTV Live</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1343">Kanal 7</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1347">Ukraina 24</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1348">Current Time</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1352">Kanal 7+</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1353">Kino 7</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="" site_id="et#1354">Semejka</channel> -->
   <channel site="teliatv.ee" lang="et" xmltv_id="AloTV.ee" site_id="et#157">ALO-TV</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="AnimalPlanet.ru" site_id="et#31">Animal Planet</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="arte.fr" site_id="et#24">Arte</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="BloombergTVEurope.uk" site_id="et#81">Bloomberg TV</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="BoomerangCEE.us" site_id="et#57">Boomerang</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="BoomerangCEE.us" site_id="et#57">Cartoonito</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="CNBCEurope.uk" site_id="et#82">CNBC Europe</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="DiscoveryChannel.ru" site_id="et#26">Discovery Channel</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="DiscoveryScience.ru" site_id="et#33">Discovery Science</channel>
@@ -19,23 +63,23 @@
   <channel site="teliatv.ee" lang="et" xmltv_id="DWEnglish.de" site_id="et#73">Deutsche Welle</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="EestiKanal.ee" site_id="et#1333">Eesti Kanal</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="EpicDrama.se" site_id="et#1292">Epic Drama</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="ETV.ee" site_id="et#1">ETV</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="ETV2.ee" site_id="et#111">ETV 2</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="ETV.ee" site_id="et#1">ETV</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="ETVPlus.ee" site_id="et#1252">ETV+</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="Eurosport1.ru" site_id="et#35">Eurosport 1</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="Eurosport1.ru" site_id="et#35">Eurosport</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="Eurosport2.ru" site_id="et#51">Eurosport 2</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="Filmzone.ee" site_id="et#1238">Filmzone</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="FilmzonePlus.ee" site_id="et#1239">Filmzone+</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="FoxLife.ru" site_id="et#105">Fox Life</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="Fox.ru" site_id="et#77">Fox</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="Go3Films.lv" site_id="et#226">TV3 Film</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="FoxLife.ru" site_id="et#105">Fox Life</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="Go3Films.lv" site_id="et#226">Go3 Films</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="HGTV.ru" site_id="et#1346">HGTV</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="History.ru" site_id="et#251">History Channel</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="Inspira.ee" site_id="et#1338">Inspira</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="InvestigationDiscovery.ru" site_id="et#32">ID</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="Kanal2.ee" site_id="et#3">Kanal 2</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="KidZoneMax.ee" site_id="et#1086">Kidzone Max</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="KidZoneMini.ee" site_id="et#1293">Kidzone Mini</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="KidZoneMax.ee" site_id="et#1086">Kidzone</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="LifeTV.ee" site_id="et#220">LIFE TV</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="MCMTop.ru" site_id="et#84">MCM TOP</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="Mezzo.fr" site_id="et#36">Mezzo</channel>
@@ -47,16 +91,13 @@
   <channel site="teliatv.ee" lang="et" xmltv_id="ntv.de" site_id="et#145">n-tv</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="ProSieben.de" site_id="et#60">PRO 7</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="RTL.de" site_id="et#20">RTL</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="RTLSuper.de" site_id="et#17">Super RTL</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="SAT1.de" site_id="et#11">SAT 1</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="SetantaSports1Evraziya.ie" site_id="et#1206">Setanta Sports</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="Smartzone.ee" site_id="et#1344">Smartzone</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="RTLSuper.de" site_id="et#17">Super RTL</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="TaevasTV7.fi" site_id="et#248">TAEVAS TV7</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="TLC.ru" site_id="et#823">TLC</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="TravelChannelEMEA.uk" site_id="et#1222">Travel Channel</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="vijuTV1000action.ru" site_id="et#227">TV1000 Action</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="vijuTV1000.ru" site_id="et#224">TV1000 East</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="vijuTV1000russkoe.ru" site_id="et#225">TV1000 World Kino</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="TV3.ee" site_id="et#2">TV3</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="TV3Life.ee" site_id="et#221">TV3 Life</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="TV3Plus.lv" site_id="et#1349">3+</channel>
@@ -65,7 +106,10 @@
   <channel site="teliatv.ee" lang="et" xmltv_id="ViasatExplore.se" site_id="et#230">Viasat Explore</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="ViasatHistory.se" site_id="et#231">Viasat History</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="ViasatNature.se" site_id="et#716">Viasat Nature</channel>
-  <channel site="teliatv.ee" lang="et" xmltv_id="vijuPlusComedy.ru" site_id="et#1303">VIP Comedy</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="vijuPlusComedy.ru" site_id="et#1303">Viasat Kino Comedy</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="vijuTV1000.ru" site_id="et#224">Viasat Kino</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="vijuTV1000action.ru" site_id="et#227">Viasat Kino Action</channel>
+  <channel site="teliatv.ee" lang="et" xmltv_id="vijuTV1000russkoe.ru" site_id="et#225">Viasat Kino World</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="YleTV1.fi" site_id="et#12">YLE TV1</channel>
   <channel site="teliatv.ee" lang="et" xmltv_id="YleTV2.fi" site_id="et#13">YLE TV2</channel>
   <channel site="teliatv.ee" lang="fr" xmltv_id="MezzoLive.fr" site_id="et#789">Mezzo Live HD</channel>
diff --git a/sites/teliatv.ee/teliatv.ee_ru.channels.xml b/sites/teliatv.ee/teliatv.ee_ru.channels.xml
index 34f9ba0e..2ee61674 100644
--- a/sites/teliatv.ee/teliatv.ee_ru.channels.xml
+++ b/sites/teliatv.ee/teliatv.ee_ru.channels.xml
@@ -1,12 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <!-- <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1224">Food Network</channel> -->
-  <!-- <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#243">Камин</channel> -->
-  <!-- <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#829">AMC</channel> -->
-  <channel site="teliatv.ee" lang="ru" xmltv_id="Eurosport2.ru" site_id="ru#51">Eurosport 2</channel>
+  <!-- <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#20">RTL</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#38">MTV 00s</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#39">MTV Europe</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#52">BBC World</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#69">MTV 90s</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#70">MTV Club</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#71">MTV Hits</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#72">MTV 80s</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#76">MyHits</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#81">Bloomberg TV</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#82">CNBC Europe</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#83">RFM TV</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#84">MCM TOP</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#89">Al Jazeera</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#91">SKY News</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#102">Disney Channel</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#103">Disney Junior</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#157">ALO-TV</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#248">TAEVAS TV7</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#255">TVEi</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#731">iConcerts</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#790">Classica</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#829">AMC</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1129">DJAZZ.tv</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1224">Food Network</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1229">RTL2</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1259">SVT1</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1260">SVT2</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1264">BBC Earth</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1268">Fight Sports</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1302">MTV Live</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1352">Канал 7+</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1353">Кино 7</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="" site_id="ru#1354">Семейка</channel> -->
   <channel site="teliatv.ee" lang="ru" xmltv_id="AnimalPlanet.ru" site_id="ru#31">Animal Planet</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="arte.fr" site_id="ru#24">Arte</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="BoomerangCEE.us" site_id="ru#57">Boomerang</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="BoomerangCEE.us" site_id="ru#57">Cartoonito</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="CartoonNetwork.ru" site_id="ru#55">Cartoon Network</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="CNNInternationalEurope.us" site_id="ru#50">CNN International</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="CurrentTimeTV.cz" site_id="ru#1348">Настоящее время</channel>
@@ -17,32 +47,33 @@
   <channel site="teliatv.ee" lang="ru" xmltv_id="Duo4.ee" site_id="ru#101">Duo 4</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Duo5.ee" site_id="ru#728">Duo 5</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Duo6.ee" site_id="ru#1080">Duo 6</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="Kanal7.ee" site_id="ru#1343">Kanal 7</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="DWEnglish.de" site_id="ru#73">Deutsche Welle</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="EestiKanal.ee" site_id="ru#1333">Eesti Kanal</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="EpicDrama.se" site_id="ru#1292">Epic Drama</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="ETV.ee" site_id="ru#1">ETV</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="ETV2.ee" site_id="ru#111">ETV 2</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="ETV.ee" site_id="ru#1">ETV</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="ETVPlus.ee" site_id="ru#1252">ETV+</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="EuronewsEnglish.fr" site_id="ru#59">Euronews</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="EuronewsRussian.fr" site_id="ru#1286">Euronews Rus</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Eurosport1.ru" site_id="ru#35">Eurosport</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="Eurosport2.ru" site_id="ru#51">Eurosport 2</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="FashionTV.ru" site_id="ru#54">Fashion TV</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Filmzone.ee" site_id="ru#1238">Filmzone</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="FilmzonePlus.ee" site_id="ru#1239">Filmzone+</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="FoxLife.ru" site_id="ru#105">Fox Life</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Fox.ru" site_id="ru#77">Fox</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="FoxLife.ru" site_id="ru#105">Fox Life</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="France2.fr" site_id="ru#256">France 2</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="France24English.fr" site_id="ru#143">France 24</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="Go3Films.lv" site_id="ru#226">TV3 Film</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="Go3Films.lv" site_id="ru#226">Go3 Films</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="HGTV.ru" site_id="ru#1346">HGTV</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="History2Asia.us" site_id="ru#1236">HISTORY2</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="History.ru" site_id="ru#251">History Channel</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Inspira.ee" site_id="ru#1338">Inspira</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="InvestigationDiscovery.ru" site_id="ru#32">ID</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Kanal2.ee" site_id="ru#3">Kanal 2</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="Kanal7.ee" site_id="ru#1343">Kanal 7</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="KidZoneMax.ee" site_id="ru#1086">Kidzone Max</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="KidZoneMini.ee" site_id="ru#1293">Kidzone Mini</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="KidZoneMax.ee" site_id="ru#1086">Kidzone</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="LifeTV.ee" site_id="ru#220">LIFE TV</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Mezzo.fr" site_id="ru#36">Mezzo</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="MezzoLive.fr" site_id="ru#789">Mezzo Live HD</channel>
@@ -56,21 +87,18 @@
   <channel site="teliatv.ee" lang="ru" xmltv_id="OrsentTV.ee" site_id="ru#141">Orsent TV</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="ProSieben.de" site_id="ru#60">PRO 7</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Rai1.it" site_id="ru#86">RAI 1</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="RTLSuper.de" site_id="ru#17">Super RTL</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="SAT1.de" site_id="ru#11">SAT 1</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="SetantaSports1Evraziya.ie" site_id="ru#1206">Setanta Sports</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="Smartzone.ee" site_id="ru#1344">Smartzone</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="RTLSuper.de" site_id="ru#17">Super RTL</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TBNBaltia.ee" site_id="ru#261">TBN Baltia</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TLC.ru" site_id="ru#823">TLC</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TravelChannelEMEA.uk" site_id="ru#1222">Travel Channel</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="vijuTV1000action.ru" site_id="ru#227">TV1000 Action</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="vijuTV1000.ru" site_id="ru#224">TV1000 East</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="vijuTV1000russkoe.ru" site_id="ru#225">TV1000 World Kino</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TV3.ee" site_id="ru#2">TV3</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Life.ee" site_id="ru#221">TV3 Life</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Plus.lv" site_id="ru#1349">3+</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Sport.uk" site_id="ru#228">TV3 Sport</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Sport2.uk" site_id="ru#229">TV3 Sport2</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Sport2.uk" site_id="ru#229">Go3 Sport 2</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="TV3Sport.uk" site_id="ru#228">Go3 Sport 1</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TV5MondeEurope.fr" site_id="ru#85">TV5MONDE Europe</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TV6.ee" site_id="ru#223">TV6</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="TVN.ee" site_id="ru#140">TVN</channel>
@@ -79,7 +107,10 @@
   <channel site="teliatv.ee" lang="ru" xmltv_id="ViasatExplore.se" site_id="ru#230">Viasat Explore</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="ViasatHistory.se" site_id="ru#231">Viasat History</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="ViasatNature.se" site_id="ru#716">Viasat Nature</channel>
-  <channel site="teliatv.ee" lang="ru" xmltv_id="vijuPlusComedy.ru" site_id="ru#1303">VIP Comedy</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="vijuPlusComedy.ru" site_id="ru#1303">Viasat Kino Comedy</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="vijuTV1000.ru" site_id="ru#224">Viasat Kino</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="vijuTV1000action.ru" site_id="ru#227">Viasat Kino Action</channel>
+  <channel site="teliatv.ee" lang="ru" xmltv_id="vijuTV1000russkoe.ru" site_id="ru#225">Viasat Kino World</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="YleTV1.fi" site_id="ru#12">YLE TV1</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="YleTV2.fi" site_id="ru#13">YLE TV2</channel>
   <channel site="teliatv.ee" lang="ru" xmltv_id="ZDF.de" site_id="ru#1230">ZDF</channel>