diff -Nru kodi-pvr-vdr-vnsi-2.6.11/debian/changelog kodi-pvr-vdr-vnsi-2.6.17/debian/changelog
--- kodi-pvr-vdr-vnsi-2.6.11/debian/changelog	2016-12-19 12:55:51.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/debian/changelog	2017-01-19 16:31:38.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-pvr-vdr-vnsi (2.6.11-1~xenial) xenial; urgency=low
+kodi-pvr-vdr-vnsi (2.6.17-3~xenial) xenial; urgency=low
 
   [ xbmc ]
   * autogenerated dummy changelog
@@ -6,4 +6,4 @@
   [ wsnipex ]
   * no upstream changelog available
 
- -- wsnipex <wsnipex@a1.net>  Mon, 19 Dec 2016 13:55:51 +0100
+ -- wsnipex <wsnipex@a1.net>  Thu, 19 Jan 2017 17:31:38 +0100
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/debian/changelog.tmp kodi-pvr-vdr-vnsi-2.6.17/debian/changelog.tmp
--- kodi-pvr-vdr-vnsi-2.6.11/debian/changelog.tmp	2016-12-19 12:55:30.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/debian/changelog.tmp	2017-01-19 16:31:16.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-pvr-vdr-vnsi (2.6.11-1~#DIST#) #DIST#; urgency=low
+kodi-pvr-vdr-vnsi (2.6.17-3~#DIST#) #DIST#; urgency=low
 
   [ xbmc ]
   * autogenerated dummy changelog
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/addon.xml.in kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/addon.xml.in
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/addon.xml.in	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/addon.xml.in	2017-01-14 14:03:27.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vdr.vnsi"
-  version="2.6.11"
+  version="2.6.17"
   name="VDR VNSI Client"
   provider-name="FernetMenta, Team Kodi">
   <requires>
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.af_za/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.af_za/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.af_za/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.af_za/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -272,6 +272,26 @@
 msgid "Provider Unknown"
 msgstr "Verskaffer onbekend"
 
+msgctxt "#30200"
+msgid "Single"
+msgstr "Enkel"
+
 msgctxt "#30201"
 msgid "Repeating"
 msgstr "Herhaal"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "EGP"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Deursoek EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Herhalend Kind"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -299,3 +299,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr ""
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr ""
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.en_nz/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_nz/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.en_nz/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_nz/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -287,3 +287,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Search EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Repeating Child"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.es_es/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.es_es/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.es_es/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.es_es/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -238,7 +238,7 @@
 
 msgctxt "#30106"
 msgid "Timeshift Buffer (File) x1 GB"
-msgstr "Buffer Timeshift Buffer (Archivo) x1 GB"
+msgstr "Buffer Timeshift (Archivo) x1 GB"
 
 msgctxt "#30107"
 msgid "VDR Admin"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.es_mx/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.es_mx/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.es_mx/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.es_mx/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -228,6 +228,18 @@
 msgid "Select to control OSD"
 msgstr "Seleccionar para controlar OSD"
 
+msgctxt "#30104"
+msgid "Timeshift Mode"
+msgstr "Modo Timeshift"
+
+msgctxt "#30105"
+msgid "Timeshift Buffer (RAM) x100 MB"
+msgstr "Buffer Timeshift (RAM) x100 MB"
+
+msgctxt "#30106"
+msgid "Timeshift Buffer (File) x1 GB"
+msgstr "Buffer Timeshift (Archivo) x1 GB"
+
 msgctxt "#30107"
 msgid "VDR Admin"
 msgstr "VDR Admin"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.fi_fi/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fi_fi/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.fi_fi/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fi_fi/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Etsi ohjelmaoppaasta"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Toistuva (lapsi)"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.fr_ca/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fr_ca/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.fr_ca/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fr_ca/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Rechercher dans le GÉP"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Répétition de l'enfant"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.fr_fr/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fr_fr/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.fr_fr/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fr_fr/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Rechercher dans le guide"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Répétition de l'enfant"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.it_it/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.it_it/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.it_it/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.it_it/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Cerca EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Ripetizione Bambini"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.lt_lt/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.lt_lt/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.lt_lt/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.lt_lt/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Ieškoti EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Pasikartojantis vaikas"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.nb_no/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.nb_no/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.nb_no/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.nb_no/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Søk EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Gjentagende Underelement"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.pl_pl/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.pl_pl/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.pl_pl/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.pl_pl/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Wyszukaj w przewodniku"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Cyklicznie potomka"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.pt_br/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.pt_br/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.pt_br/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.pt_br/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Procurar EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Repetindo Criança"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.sk_sk/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sk_sk/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.sk_sk/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sk_sk/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Hľadať EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Opakovacie dieťa"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.sv_se/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sv_se/strings.po
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/language/resource.language.sv_se/strings.po	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sv_se/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -278,7 +278,7 @@
 
 msgctxt "#30201"
 msgid "Repeating"
-msgstr "Upprepat"
+msgstr "Repeterande"
 
 msgctxt "#30202"
 msgid "EGP"
@@ -287,3 +287,11 @@
 msgctxt "#30203"
 msgid "VPS"
 msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Sök EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Repeterande Barn"
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/skins/skin.estuary/1080i/Admin.xml kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/skins/skin.estuary/1080i/Admin.xml
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/skins/skin.estuary/1080i/Admin.xml	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/skins/skin.estuary/1080i/Admin.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-  <defaultcontrol always="true">10</defaultcontrol>
-  <backgroundcolor>background</backgroundcolor>
-  <allowoverlay>no</allowoverlay>
-  <views>36</views>
-  <controls>
-    <include>DefaultBackground</include>
-    <control type="group">
-      <left>110</left>
-      <top>0</top>
-      <control type="group">
-        <include>OpenClose_Left</include>
-        <control type="image">
-          <description>Menu Panel</description>
-          <left>-20</left>
-          <top>138</top>
-          <width>440</width>
-          <height>792</height>
-          <texture border="22">dialogs/dialog-bg.png</texture>
-        </control>
-        <control type="list" id="10">
-          <description>button area</description>
-          <left>0</left>
-          <top>160</top>
-          <width>400</width>
-          <height>700</height>
-          <onleft>10</onleft>
-          <onright>11</onright>
-          <onup>10</onup>
-          <ondown>10</ondown>
-          <include content="DefaultSimpleListLayout">
-            <param name="align" value="center" />
-            <param name="width" value="400" />
-            <param name="height" value="120" />
-            <param name="list_id" value="10" />
-          </include>
-          <content>
-            <item id="1">
-              <label>$ADDON[pvr.vdr.vnsi 30100]</label>
-              <onclick>noop</onclick>
-            </item>
-            <item id="2">
-              <label>$ADDON[pvr.vdr.vnsi 30101]</label>
-              <onclick>noop</onclick>
-            </item>
-            <item id="3">
-              <label>$ADDON[pvr.vdr.vnsi 30108]</label>
-              <onclick>noop</onclick>
-            </item>
-          </content>
-        </control>
-      </control>
-      <control type="group" id="11">
-        <include>OpenClose_Right</include>
-        <control type="image">
-          <left>420</left>
-          <top>138</top>
-          <width>1300</width>
-          <height>792</height>
-          <texture border="22">dialogs/dialog-bg.png</texture>
-        </control>
-        <control type="group" id="12">
-          <visible>Container(10).HasFocus(1)</visible>
-          <control type="button" id="13">
-            <left>472</left>
-            <top>172</top>
-            <width>1216</width>
-            <height>686</height>
-            <aligny>top</aligny>
-            <align>center</align>
-            <textoffsety>690</textoffsety>
-            <texturenofocus>-</texturenofocus>
-            <texturefocus border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texturefocus>
-          </control>
-          <control type="renderaddon" id="9">
-            <left>480</left>
-            <top>180</top>
-            <width>1200</width>
-            <height>670</height>
-          </control>
-        </control>
-        <control type="grouplist" id="20">
-          <left>442</left>
-          <top>160</top>
-          <width>1256</width>
-          <height>610</height>
-          <visible>Container(10).HasFocus(2)</visible>
-          <onleft>10</onleft>
-          <control type="spincontrolex" id="21">
-            <label>$ADDON[pvr.vdr.vnsi 30104]</label>
-            <width>1256</width>
-            <include>DefaultSettingButton</include>
-          </control>
-          <control type="spincontrolex" id="22">
-            <label>$ADDON[pvr.vdr.vnsi 30105]</label>
-            <width>1256</width>
-            <include>DefaultSettingButton</include>
-          </control>
-          <control type="spincontrolex" id="23">
-            <label>$ADDON[pvr.vdr.vnsi 30106]</label>
-            <width>1256</width>
-            <include>DefaultSettingButton</include>
-          </control>
-        </control>
-        <control type="group" id="30">
-          <visible>Container(10).HasFocus(3)</visible>
-          <defaultcontrol always="true">33</defaultcontrol>
-          <control type="label" id="31">
-            <description>Channels label</description>
-            <left>480</left>
-            <top>165</top>
-            <width>1000</width>
-            <height>60</height>
-            <font>font30_title</font>
-            <label>$ADDON[pvr.vdr.vnsi 30111]</label>
-            <align>left</align>
-            <aligny>center</aligny>
-            <textcolor>white</textcolor>
-            <shadowcolor>black</shadowcolor>
-          </control>
-          <control type="image">
-            <left>1550</left>
-            <top>180</top>
-            <width>40</width>
-            <height>40</height>
-            <colordiffuse>FFCC0000</colordiffuse>
-            <texture>overlays/circle.png</texture>
-            <visible>StringCompare(Window.Property(IsDirty),1)</visible>
-          </control>
-          <control type="image">
-            <left>1550</left>
-            <top>180</top>
-            <width>40</width>
-            <height>40</height>
-            <colordiffuse>FF00FF00</colordiffuse>
-            <texture>overlays/circle.png</texture>
-            <visible>!StringCompare(Window.Property(IsDirty),1)</visible>
-          </control>
-          <control type="grouplist" id="200">
-            <left>442</left>
-            <top>230</top>
-            <width>520</width>
-            <height>610</height>
-            <onleft>10</onleft>
-            <onright>36</onright>
-            <control type="radiobutton" id="32">
-              <description>Is Radio</description>
-              <width>520</width>
-              <include>DefaultSettingButton</include>
-              <label>$ADDON[pvr.vdr.vnsi 30112]</label>
-            </control>
-            <control type="button" id="33">
-              <description>providers</description>
-              <width>520</width>
-              <label>$ADDON[pvr.vdr.vnsi 30109]</label>
-              <include>DefaultSettingButton</include>
-              <onfocus>Select</onfocus>
-            </control>
-            <control type="button" id="34">
-              <description>channels</description>
-              <width>520</width>
-              <label>$ADDON[pvr.vdr.vnsi 30110]</label>
-              <include>DefaultSettingButton</include>
-              <onfocus>Select</onfocus>
-            </control>
-            <control type="button" id="35">
-              <description>save</description>
-              <width>520</width>
-              <label>$ADDON[pvr.vdr.vnsi 30113]</label>
-              <include>DefaultSettingButton</include>
-            </control>
-          </control>
-          <control type="image">
-            <left>980</left>
-            <top>230</top>
-            <width>640</width>
-            <height>640</height>
-            <texture border="40">buttons/dialogbutton-nofo.png</texture>
-          </control>
-          <control type="list" id="36">
-            <left>1000</left>
-            <top>250</top>
-            <width>600</width>
-            <height>600</height>
-            <onup>36</onup>
-            <onleft>35</onleft>
-            <onright>37</onright>
-            <ondown>36</ondown>
-            <pagecontrol>37</pagecontrol>
-            <scrolltime>200</scrolltime>
-            <itemlayout height="40" width="600">
-              <control type="image">
-                <left>0</left>
-                <top>0</top>
-                <width>6000</width>
-                <height>40</height>
-                <texture border="5">lists/separator.png</texture>
-              </control>
-              <control type="label">
-                <left>40</left>
-                <top>0</top>
-                <width>6000</width>
-                <height>40</height>
-                <align>left</align>
-                <info>ListItem.Label</info>
-              </control>
-              <control type="image">
-                <left>2</left>
-                <top>2</top>
-                <width>36</width>
-                <height>36</height>
-                <aspectratio>stretch</aspectratio>
-                <colordiffuse>7790EE90</colordiffuse>
-                <texture>overlays/arrowright.png</texture>
-                <visible>ListItem.Property(IsWhitelist)</visible>
-              </control>
-              <control type="image">
-                <left>2</left>
-                <top>2</top>
-                <width>36</width>
-                <height>36</height>
-                <aspectratio>stretch</aspectratio>
-                <colordiffuse>77FF0000</colordiffuse>
-                <texture>overlays/arrowright.png</texture>
-                <visible>ListItem.Property(IsBlacklist)</visible>
-              </control>
-            </itemlayout>
-            <focusedlayout height="40" width="600">
-              <control type="image">
-                <left>0</left>
-                <top>0</top>
-                <width>600</width>
-                <height>40</height>
-                <texture border="5">lists/separator.png</texture>
-              </control>
-              <control type="image">
-                <left>0</left>
-                <top>0</top>
-                <width>600</width>
-                <height>40</height>
-                <texture>lists/focus.png</texture>
-              </control>
-              <control type="label">
-                <left>40</left>
-                <top>0</top>
-                <width>600</width>
-                <height>40</height>
-                <align>left</align>
-                <info>ListItem.Label</info>
-              </control>
-              <control type="image">
-                <left>2</left>
-                <top>2</top>
-                <width>36</width>
-                <height>36</height>
-                <aspectratio>stretch</aspectratio>
-                <colordiffuse>7790EE90</colordiffuse>
-                <texture>overlays/arrowright.png</texture>
-                <visible>ListItem.Property(IsWhitelist)</visible>
-              </control>
-              <control type="image">
-                <left>2</left>
-                <top>2</top>
-                <width>36</width>
-                <height>36</height>
-                <aspectratio>stretch</aspectratio>
-                <colordiffuse>77FF0000</colordiffuse>
-                <texture>overlays/arrowright.png</texture>
-                <visible>ListItem.Property(IsBlacklist)</visible>
-              </control>
-            </focusedlayout>
-          </control>
-          <control type="scrollbar" id="37">
-            <left>1620</left>
-            <top>250</top>
-            <width>13</width>
-            <height>600</height>
-            <onleft>36</onleft>
-            <showonepage>false</showonepage>
-            <orientation>vertical</orientation>
-          </control>
-        </control>
-      </control>
-    </control>
-    <include content="TopBar">
-      <param name="breadcrumbs_label" value="$LOCALIZE[5] / VDR VNSI Client" />
-      <param name="breadcrumbs_icon" value="icons/settings/skin.png" />
-    </include>
-    <include>BottomBar</include>
-  </controls>
-</window>
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/skins/skin.estuary/xml/Admin.xml kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/skins/skin.estuary/xml/Admin.xml
--- kodi-pvr-vdr-vnsi-2.6.11/pvr.vdr.vnsi/resources/skins/skin.estuary/xml/Admin.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/skins/skin.estuary/xml/Admin.xml	2017-01-14 14:03:27.000000000 +0000
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+  <defaultcontrol always="true">10</defaultcontrol>
+  <backgroundcolor>background</backgroundcolor>
+  <allowoverlay>no</allowoverlay>
+  <views>36</views>
+  <controls>
+    <include>DefaultBackground</include>
+    <control type="group">
+      <left>110</left>
+      <top>0</top>
+      <control type="group">
+        <include>OpenClose_Left</include>
+        <control type="image">
+          <description>Menu Panel</description>
+          <left>-20</left>
+          <top>138</top>
+          <width>440</width>
+          <height>792</height>
+          <texture border="22">dialogs/dialog-bg.png</texture>
+        </control>
+        <control type="list" id="10">
+          <description>button area</description>
+          <left>0</left>
+          <top>160</top>
+          <width>400</width>
+          <height>700</height>
+          <onleft>10</onleft>
+          <onright>11</onright>
+          <onup>10</onup>
+          <ondown>10</ondown>
+          <include content="DefaultSimpleListLayout">
+            <param name="align" value="center" />
+            <param name="width" value="400" />
+            <param name="height" value="120" />
+            <param name="list_id" value="10" />
+          </include>
+          <content>
+            <item id="1">
+              <label>$ADDON[pvr.vdr.vnsi 30100]</label>
+              <onclick>noop</onclick>
+            </item>
+            <item id="2">
+              <label>$ADDON[pvr.vdr.vnsi 30101]</label>
+              <onclick>noop</onclick>
+            </item>
+            <item id="3">
+              <label>$ADDON[pvr.vdr.vnsi 30108]</label>
+              <onclick>noop</onclick>
+            </item>
+          </content>
+        </control>
+      </control>
+      <control type="group" id="11">
+        <include>OpenClose_Right</include>
+        <control type="image">
+          <left>420</left>
+          <top>138</top>
+          <width>1300</width>
+          <height>792</height>
+          <texture border="22">dialogs/dialog-bg.png</texture>
+        </control>
+        <control type="group" id="12">
+          <visible>Container(10).HasFocus(1)</visible>
+          <control type="button" id="13">
+            <left>472</left>
+            <top>172</top>
+            <width>1216</width>
+            <height>686</height>
+            <aligny>top</aligny>
+            <align>center</align>
+            <textoffsety>690</textoffsety>
+            <texturenofocus>-</texturenofocus>
+            <texturefocus border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texturefocus>
+          </control>
+          <control type="renderaddon" id="9">
+            <left>480</left>
+            <top>180</top>
+            <width>1200</width>
+            <height>670</height>
+          </control>
+        </control>
+        <control type="grouplist" id="20">
+          <left>442</left>
+          <top>160</top>
+          <width>1256</width>
+          <height>610</height>
+          <visible>Container(10).HasFocus(2)</visible>
+          <onleft>10</onleft>
+          <control type="spincontrolex" id="21">
+            <label>$ADDON[pvr.vdr.vnsi 30104]</label>
+            <width>1256</width>
+            <include>DefaultSettingButton</include>
+          </control>
+          <control type="spincontrolex" id="22">
+            <label>$ADDON[pvr.vdr.vnsi 30105]</label>
+            <width>1256</width>
+            <include>DefaultSettingButton</include>
+          </control>
+          <control type="spincontrolex" id="23">
+            <label>$ADDON[pvr.vdr.vnsi 30106]</label>
+            <width>1256</width>
+            <include>DefaultSettingButton</include>
+          </control>
+        </control>
+        <control type="group" id="30">
+          <visible>Container(10).HasFocus(3)</visible>
+          <defaultcontrol always="true">33</defaultcontrol>
+          <control type="label" id="31">
+            <description>Channels label</description>
+            <left>480</left>
+            <top>165</top>
+            <width>1000</width>
+            <height>60</height>
+            <font>font30_title</font>
+            <label>$ADDON[pvr.vdr.vnsi 30111]</label>
+            <align>left</align>
+            <aligny>center</aligny>
+            <textcolor>white</textcolor>
+            <shadowcolor>black</shadowcolor>
+          </control>
+          <control type="image">
+            <left>1550</left>
+            <top>180</top>
+            <width>40</width>
+            <height>40</height>
+            <colordiffuse>FFCC0000</colordiffuse>
+            <texture>overlays/circle.png</texture>
+            <visible>StringCompare(Window.Property(IsDirty),1)</visible>
+          </control>
+          <control type="image">
+            <left>1550</left>
+            <top>180</top>
+            <width>40</width>
+            <height>40</height>
+            <colordiffuse>FF00FF00</colordiffuse>
+            <texture>overlays/circle.png</texture>
+            <visible>!StringCompare(Window.Property(IsDirty),1)</visible>
+          </control>
+          <control type="grouplist" id="200">
+            <left>442</left>
+            <top>230</top>
+            <width>520</width>
+            <height>610</height>
+            <onleft>10</onleft>
+            <onright>36</onright>
+            <control type="radiobutton" id="32">
+              <description>Is Radio</description>
+              <width>520</width>
+              <include>DefaultSettingButton</include>
+              <label>$ADDON[pvr.vdr.vnsi 30112]</label>
+            </control>
+            <control type="button" id="33">
+              <description>providers</description>
+              <width>520</width>
+              <label>$ADDON[pvr.vdr.vnsi 30109]</label>
+              <include>DefaultSettingButton</include>
+              <onfocus>Select</onfocus>
+            </control>
+            <control type="button" id="34">
+              <description>channels</description>
+              <width>520</width>
+              <label>$ADDON[pvr.vdr.vnsi 30110]</label>
+              <include>DefaultSettingButton</include>
+              <onfocus>Select</onfocus>
+            </control>
+            <control type="button" id="35">
+              <description>save</description>
+              <width>520</width>
+              <label>$ADDON[pvr.vdr.vnsi 30113]</label>
+              <include>DefaultSettingButton</include>
+            </control>
+          </control>
+          <control type="image">
+            <left>980</left>
+            <top>230</top>
+            <width>640</width>
+            <height>640</height>
+            <texture border="40">buttons/dialogbutton-nofo.png</texture>
+          </control>
+          <control type="list" id="36">
+            <left>1000</left>
+            <top>250</top>
+            <width>600</width>
+            <height>600</height>
+            <onup>36</onup>
+            <onleft>35</onleft>
+            <onright>37</onright>
+            <ondown>36</ondown>
+            <pagecontrol>37</pagecontrol>
+            <scrolltime>200</scrolltime>
+            <itemlayout height="40" width="600">
+              <control type="image">
+                <left>0</left>
+                <top>0</top>
+                <width>6000</width>
+                <height>40</height>
+                <texture border="5">lists/separator.png</texture>
+              </control>
+              <control type="label">
+                <left>40</left>
+                <top>0</top>
+                <width>6000</width>
+                <height>40</height>
+                <align>left</align>
+                <info>ListItem.Label</info>
+              </control>
+              <control type="image">
+                <left>2</left>
+                <top>2</top>
+                <width>36</width>
+                <height>36</height>
+                <aspectratio>stretch</aspectratio>
+                <colordiffuse>7790EE90</colordiffuse>
+                <texture>overlays/arrowright.png</texture>
+                <visible>ListItem.Property(IsWhitelist)</visible>
+              </control>
+              <control type="image">
+                <left>2</left>
+                <top>2</top>
+                <width>36</width>
+                <height>36</height>
+                <aspectratio>stretch</aspectratio>
+                <colordiffuse>77FF0000</colordiffuse>
+                <texture>overlays/arrowright.png</texture>
+                <visible>ListItem.Property(IsBlacklist)</visible>
+              </control>
+            </itemlayout>
+            <focusedlayout height="40" width="600">
+              <control type="image">
+                <left>0</left>
+                <top>0</top>
+                <width>600</width>
+                <height>40</height>
+                <texture border="5">lists/separator.png</texture>
+              </control>
+              <control type="image">
+                <left>0</left>
+                <top>0</top>
+                <width>600</width>
+                <height>40</height>
+                <texture>lists/focus.png</texture>
+              </control>
+              <control type="label">
+                <left>40</left>
+                <top>0</top>
+                <width>600</width>
+                <height>40</height>
+                <align>left</align>
+                <info>ListItem.Label</info>
+              </control>
+              <control type="image">
+                <left>2</left>
+                <top>2</top>
+                <width>36</width>
+                <height>36</height>
+                <aspectratio>stretch</aspectratio>
+                <colordiffuse>7790EE90</colordiffuse>
+                <texture>overlays/arrowright.png</texture>
+                <visible>ListItem.Property(IsWhitelist)</visible>
+              </control>
+              <control type="image">
+                <left>2</left>
+                <top>2</top>
+                <width>36</width>
+                <height>36</height>
+                <aspectratio>stretch</aspectratio>
+                <colordiffuse>77FF0000</colordiffuse>
+                <texture>overlays/arrowright.png</texture>
+                <visible>ListItem.Property(IsBlacklist)</visible>
+              </control>
+            </focusedlayout>
+          </control>
+          <control type="scrollbar" id="37">
+            <left>1620</left>
+            <top>250</top>
+            <width>13</width>
+            <height>600</height>
+            <onleft>36</onleft>
+            <showonepage>false</showonepage>
+            <orientation>vertical</orientation>
+          </control>
+        </control>
+      </control>
+    </control>
+    <include content="TopBar">
+      <param name="breadcrumbs_label" value="$LOCALIZE[5] / VDR VNSI Client" />
+      <param name="breadcrumbs_icon" value="icons/settings/skin.png" />
+    </include>
+    <include>BottomBar</include>
+  </controls>
+</window>
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/src/vnsicommand.h kodi-pvr-vdr-vnsi-2.6.17/src/vnsicommand.h
--- kodi-pvr-vdr-vnsi-2.6.11/src/vnsicommand.h	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/src/vnsicommand.h	2017-01-14 14:03:27.000000000 +0000
@@ -23,7 +23,7 @@
 #define VNSI_COMMAND_H
 
 /** Current VNSI Protocol Version number */
-#define VNSI_PROTOCOLVERSION 9
+#define VNSI_PROTOCOLVERSION 10
 
 /** Start of RDS support protocol Version */
 #define VNSI_RDS_PROTOCOLVERSION 8
@@ -165,6 +165,7 @@
 #define VNSI_TIMER_TYPE_EPG          3
 #define VNSI_TIMER_TYPE_VPS          4
 #define VNSI_TIMER_TYPE_EPG_SEARCH   5
+#define VNSI_TIMER_TYPE_MAN_REPEAT_CHILD 6
 
 /** Packet return codes */
 #define VNSI_RET_OK              0
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/src/VNSIData.cpp kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.cpp
--- kodi-pvr-vdr-vnsi-2.6.11/src/VNSIData.cpp	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.cpp	2017-01-14 14:03:27.000000000 +0000
@@ -24,6 +24,43 @@
 #include "requestpacket.h"
 #include "vnsicommand.h"
 #include "p8-platform/util/StdString.h"
+#include <algorithm>
+#include <string.h>
+#include <time.h>
+
+// helper functions (taken from VDR)
+
+time_t IncDay(time_t t, int days)
+{
+  struct tm tm = *localtime(&t);
+  tm.tm_mday += days;
+  int h = tm.tm_hour;
+  tm.tm_isdst = -1;
+  t = mktime(&tm);
+  tm.tm_hour = h;
+  return mktime(&tm);
+}
+
+int GetWDay(time_t t)
+{
+  int weekday = localtime(&t)->tm_wday;
+  return weekday == 0 ? 6 : weekday - 1; // we start with Monday==0!
+}
+
+bool DayMatches(time_t t, unsigned int weekdays)
+{
+  return (weekdays & (1 << GetWDay(t))) != 0;
+}
+
+time_t SetTime(time_t t, int secondsFromMidnight)
+{
+  struct tm tm = *localtime(&t);
+  tm.tm_hour = secondsFromMidnight / 3600;
+  tm.tm_min = (secondsFromMidnight % 3600) / 60;
+  tm.tm_sec =  secondsFromMidnight % 60;
+  tm.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
+  return mktime(&tm);
+}
 
 using namespace ADDON;
 using namespace P8PLATFORM;
@@ -44,8 +81,7 @@
   return vresp;
 }
 
-void
-cVNSIData::Queue::Set(std::unique_ptr<cResponsePacket> &&vresp)
+void cVNSIData::Queue::Set(std::unique_ptr<cResponsePacket> &&vresp)
 {
   CLockObject lock(m_mutex);
   SMessages::iterator it = m_queue.find(vresp->getRequestID());
@@ -396,6 +432,14 @@
   {
     char *epgSearch = vresp->extract_String();
     strncpy(tag.strEpgSearchString, epgSearch, sizeof(tag.strEpgSearchString) - 1);
+
+    if (tag.iTimerType == VNSI_TIMER_TYPE_MAN && tag.iWeekdays)
+      tag.iTimerType = VNSI_TIMER_TYPE_MAN_REPEAT;
+  }
+
+  if (GetProtocol() >= 10)
+  {
+    tag.iParentClientIndex = vresp->extract_U32();
   }
 
   return PVR_ERROR_NO_ERROR;
@@ -453,29 +497,81 @@
       {
         char *epgSearch = vresp->extract_String();
         strncpy(tag.strEpgSearchString, epgSearch, sizeof(tag.strEpgSearchString) - 1);
+
+        if (tag.iTimerType == VNSI_TIMER_TYPE_MAN && tag.iWeekdays)
+          tag.iTimerType = VNSI_TIMER_TYPE_MAN_REPEAT;
+      }
+
+      if (GetProtocol() >= 10)
+      {
+        tag.iParentClientIndex = vresp->extract_U32();
       }
 
       if (tag.startTime == 0)
-	tag.bStartAnyTime = true;
+        tag.bStartAnyTime = true;
       if (tag.endTime == 0)
-	tag.bEndAnyTime = true;
+        tag.bEndAnyTime = true;
 
       PVR->TransferTimerEntry(handle, &tag);
+
+      if (tag.iTimerType == VNSI_TIMER_TYPE_MAN_REPEAT &&
+          tag.state != PVR_TIMER_STATE_DISABLED)
+      {
+        GenTimerChildren(tag, handle);
+      }
     }
   }
   return true;
 }
 
-PVR_ERROR cVNSIData::AddTimer(const PVR_TIMER &timerinfo)
+bool cVNSIData::GenTimerChildren(const PVR_TIMER &timer, ADDON_HANDLE handle)
 {
-  cRequestPacket vrp;
-  vrp.init(VNSI_TIMER_ADD);
+  time_t now = time(nullptr);
+  time_t firstDay = timer.firstDay;
+
+  struct tm *loctime = localtime(&timer.startTime);
+  int startSec = loctime->tm_hour * 3600 + loctime->tm_min * 60;
+  loctime = localtime(&timer.endTime);
+  int stopSec = loctime->tm_hour * 3600 + loctime->tm_min * 60;
+  int length = stopSec - startSec;
+  if (length < 0)
+    length += 3600 * 24;
+
+  for (int n = 0; n < 2; ++n)
+  {
+    for (int i = -1; i <= 7; i++)
+    {
+      time_t t0 = IncDay(firstDay ? std::max(firstDay, now) : now, i);
+      if (DayMatches(t0, timer.iWeekdays))
+      {
+        time_t start = SetTime(t0, startSec);
+        time_t stop = start + length;
+        if ((!firstDay || start >= firstDay) && now < stop)
+        {
+          PVR_TIMER child = timer;
+          child.iClientIndex = timer.iClientIndex + n | 0xF000;
+          child.iParentClientIndex = timer.iClientIndex;
+          child.iTimerType = VNSI_TIMER_TYPE_MAN_REPEAT_CHILD;
+          child.startTime = start;
+          child.endTime = stop;
+          child.iWeekdays = 0;
+          PVR->TransferTimerEntry(handle, &child);
+          firstDay = start + length + 300;
+          break;
+        }
+      }
+    }
+  }
+  return true;
+}
 
+std::string cVNSIData::GenTimerFolder(std::string directory, std::string title)
+{
   // add directory in front of the title
   std::string path;
-  if (strlen(timerinfo.strDirectory) > 0)
+  if (strlen(directory.c_str()) > 0)
   {
-    path += timerinfo.strDirectory;
+    path += directory;
     if (path == "/")
     {
       path.clear();
@@ -503,9 +599,9 @@
     }
   }
 
-  if (strlen(timerinfo.strTitle) > 0)
+  if (strlen(title.c_str()) > 0)
   {
-    path += timerinfo.strTitle;
+    path += title;
   }
 
   // replace colons
@@ -517,6 +613,16 @@
     }
   }
 
+  return path;
+}
+
+PVR_ERROR cVNSIData::AddTimer(const PVR_TIMER &timerinfo)
+{
+  cRequestPacket vrp;
+  vrp.init(VNSI_TIMER_ADD);
+
+  // add directory in front of the title
+  std::string path = GenTimerFolder(timerinfo.strDirectory, timerinfo.strTitle);
   if (path.empty())
   {
     XBMC->Log(LOG_ERROR, "%s - Empty filename !", __FUNCTION__);
@@ -548,6 +654,12 @@
     vrp.add_String(timerinfo.strEpgSearchString);
   }
 
+  if (GetProtocol() >= 10)
+  {
+    vrp.add_U32(timerinfo.iMarginStart*60);
+    vrp.add_U32(timerinfo.iMarginEnd*60);
+  }
+
   auto vresp = ReadResult(&vrp);
   if (vresp == NULL || vresp->noResponse())
   {
@@ -608,6 +720,14 @@
   uint32_t starttime = timerinfo.startTime - timerinfo.iMarginStart*60;
   uint32_t endtime = timerinfo.endTime + timerinfo.iMarginEnd*60;
 
+  // add directory in front of the title
+  std::string path = GenTimerFolder(timerinfo.strDirectory, timerinfo.strTitle);
+  if (path.empty())
+  {
+    XBMC->Log(LOG_ERROR, "%s - Empty filename !", __FUNCTION__);
+    return PVR_ERROR_UNKNOWN;
+  }
+
   cRequestPacket vrp;
   vrp.init(VNSI_TIMER_UPDATE);
 
@@ -624,7 +744,7 @@
   vrp.add_U32(endtime);
   vrp.add_U32(timerinfo.iWeekdays != PVR_WEEKDAY_NONE ? timerinfo.firstDay : 0);
   vrp.add_U32(timerinfo.iWeekdays);
-  vrp.add_String("");
+  vrp.add_String(path.c_str());
   vrp.add_String(timerinfo.strTitle);
 
   if (GetProtocol() >= 9)
@@ -683,6 +803,20 @@
                              PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
   (*size)++;
 
+  // Repeating manual
+  memset(&types[*size], 0, sizeof(types[*size]));
+  types[*size].iId = VNSI_TIMER_TYPE_MAN_REPEAT_CHILD;
+  strncpy(types[*size].strDescription, XBMC->GetLocalizedString(30205), 64);
+  types[*size].iAttributes = PVR_TIMER_TYPE_IS_MANUAL               |
+                             PVR_TIMER_TYPE_IS_READONLY             |
+                             PVR_TIMER_TYPE_SUPPORTS_CHANNELS       |
+                             PVR_TIMER_TYPE_SUPPORTS_START_TIME     |
+                             PVR_TIMER_TYPE_SUPPORTS_END_TIME       |
+                             PVR_TIMER_TYPE_SUPPORTS_PRIORITY       |
+                             PVR_TIMER_TYPE_SUPPORTS_LIFETIME       |
+                             PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+  (*size)++;
+
   // One-shot epg-based
   memset(&types[*size], 0, sizeof(types[*size]));
   types[*size].iId = VNSI_TIMER_TYPE_EPG;
@@ -807,8 +941,8 @@
     char *strTitle = vresp->extract_String();
     strncpy(tag.strTitle, strTitle, sizeof(tag.strTitle) - 1);
 
-    char *strPlotOutline = vresp->extract_String();
-    strncpy(tag.strPlotOutline, strPlotOutline, sizeof(tag.strPlotOutline) - 1);
+    char *strEpisodeName = vresp->extract_String();
+    strncpy(tag.strEpisodeName, strEpisodeName, sizeof(tag.strEpisodeName) - 1);
 
     char *strPlot = vresp->extract_String();
     strncpy(tag.strPlot, strPlot, sizeof(tag.strPlot) - 1);
@@ -959,8 +1093,8 @@
     char *strTitle = vresp->extract_String();
     strncpy(tag.strTitle, strTitle, sizeof(tag.strTitle) - 1);
 
-    char *strPlotOutline = vresp->extract_String();
-    strncpy(tag.strPlotOutline, strPlotOutline, sizeof(tag.strPlotOutline) - 1);
+    char *strEpisodeName = vresp->extract_String();
+    strncpy(tag.strEpisodeName, strEpisodeName, sizeof(tag.strEpisodeName) - 1);
 
     char *strPlot = vresp->extract_String();
     strncpy(tag.strPlot, strPlot, sizeof(tag.strPlot) - 1);
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/src/VNSIData.h kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.h
--- kodi-pvr-vdr-vnsi-2.6.11/src/VNSIData.h	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.h	2017-01-14 14:03:27.000000000 +0000
@@ -58,6 +58,8 @@
   PVR_ERROR   RenameTimer(const PVR_TIMER &timerinfo, const char *newname);
   PVR_ERROR   UpdateTimer(const PVR_TIMER &timerinfo);
   PVR_ERROR GetTimerTypes(PVR_TIMER_TYPE types[], int *size);
+  bool GenTimerChildren(const PVR_TIMER &timer, ADDON_HANDLE handle);
+  std::string GenTimerFolder(std::string directory, std::string title);
 
   int         GetRecordingsCount();
   PVR_ERROR   GetRecordingsList(ADDON_HANDLE handle);
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/src/xbmc_codec_descriptor.hpp kodi-pvr-vdr-vnsi-2.6.17/src/xbmc_codec_descriptor.hpp
--- kodi-pvr-vdr-vnsi-2.6.11/src/xbmc_codec_descriptor.hpp	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/src/xbmc_codec_descriptor.hpp	2017-01-14 14:03:27.000000000 +0000
@@ -20,7 +20,7 @@
 #ifndef XBMC_CODEC_DESCRIPTOR_HPP
 #define	XBMC_CODEC_DESCRIPTOR_HPP
 
-#include "kodi/libXBMC_codec.h"
+#include "libXBMC_codec.h"
 
 /**
  * Adapter which converts codec names used by tvheadend and VDR into their 
diff -Nru kodi-pvr-vdr-vnsi-2.6.11/.travis.yml kodi-pvr-vdr-vnsi-2.6.17/.travis.yml
--- kodi-pvr-vdr-vnsi-2.6.11/.travis.yml	2016-12-18 09:37:43.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/.travis.yml	2017-01-14 14:03:27.000000000 +0000
@@ -36,7 +36,7 @@
 #
 before_script:
   - cd $TRAVIS_BUILD_DIR/..
-  - git clone --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone -b Krypton --depth=1 https://github.com/xbmc/xbmc.git
   - cd pvr.vdr.vnsi && mkdir build && cd build
   - cmake -DADDONS_TO_BUILD=pvr.vdr.vnsi -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/project/cmake/addons