diff --git a/1080i/DeleteTimer.xml b/1080i/DeleteTimer.xml
index 661b486c..8239791c 100644
--- a/1080i/DeleteTimer.xml
+++ b/1080i/DeleteTimer.xml
@@ -23,12 +23,24 @@
             </control>
             <control type="image">
                 <posx>100</posx>
-                <posy>823</posy>
+                <posy>862</posy>
                 <width>1720</width>
-                <height>211</height>
+                <height>172</height>
                 <texture border="100">$VAR[Theme.Color]/common/bg_list.png</texture>
             </control>
             <control type="label">
+                <visible>System.HasAddon(pvr.dvblink)</visible>
+                <posx>TextMargin</posx>
+                <posy>183</posy>
+                <width>1800</width>
+                <height>105</height>
+                <align>center</align>
+                <font>InfoTitleFont</font>
+                <include>TextColor_MainColor</include>
+                <label>$ADDON[pvr.dvblink 32014]</label>
+            </control>
+            <control type="label">
+                <visible>System.HasAddon(pvr.wmc)</visible>
                 <posx>TextMargin</posx>
                 <posy>183</posy>
                 <width>1800</width>
@@ -47,28 +59,8 @@
                 <font>InfoTitleSubFont</font>
                 <include>TextColor_MainColor</include>
             </control>
-            <control type="radiobutton" id="10">
-                <posx>0</posx>
-                <posy>318</posy>
-                <width>1920</width>
-                <radioposx>1806</radioposx>
-                <textwidth>1700</textwidth>
-                <label>$ADDON[pvr.wmc 30121]</label>
-                <include>LeftMenuButtonWide</include>
-                <onup>10</onup>
-                <ondown>11</ondown>
-            </control>
-            <control type="radiobutton" id="11">
-                <posx>0</posx>
-                <posy>396</posy>
-                <width>1920</width>
-                <radioposx>1806</radioposx>
-                <textwidth>1700</textwidth>
-                <label>$ADDON[pvr.wmc 30122]</label>
-                <include>LeftMenuButtonWide</include>
-                <onup>10</onup>
-                <ondown>1</ondown>
-            </control>
+            <include condition="System.HasAddon(pvr.dvblink)">DeleteTimer_dvblink</include>
+            <include condition="System.HasAddon(pvr.wmc)">DeleteTimer_wmc</include>
             <control type="grouplist" id="9001">
                 <posx>TextMargin</posx>
                 <posy>903</posy>
diff --git a/1080i/Includes_PVR.xml b/1080i/Includes_PVR.xml
index f67de070..afe76406 100644
--- a/1080i/Includes_PVR.xml
+++ b/1080i/Includes_PVR.xml
@@ -585,4 +585,164 @@
             </control>
         </control>
     </include>
+    <include name="DeleteTimer_dvblink">
+        <control type="radiobutton" id="10">
+            <posx>0</posx>
+            <posy>318</posy>
+            <width>1920</width>
+            <radioposx>1806</radioposx>
+            <textwidth>1700</textwidth>
+            <label>$ADDON[pvr.dvblink 32015]</label>
+            <include>LeftMenuButtonWide</include>
+            <onup>10</onup>
+            <ondown>11</ondown>
+        </control>
+        <control type="radiobutton" id="11">
+            <posx>0</posx>
+            <posy>396</posy>
+            <width>1920</width>
+            <radioposx>1806</radioposx>
+            <textwidth>1700</textwidth>
+            <label>$ADDON[pvr.dvblink 32016]</label>
+            <include>LeftMenuButtonWide</include>
+            <onup>10</onup>
+            <ondown>1</ondown>
+        </control>
+    </include>
+    <include name="DeleteTimer_wmc">
+        <control type="radiobutton" id="10">
+            <posx>0</posx>
+            <posy>318</posy>
+            <width>1920</width>
+            <radioposx>1806</radioposx>
+            <textwidth>1700</textwidth>
+            <label>$ADDON[pvr.wmc 30121]</label>
+            <include>LeftMenuButtonWide</include>
+            <onup>10</onup>
+            <ondown>11</ondown>
+        </control>
+        <control type="radiobutton" id="11">
+            <posx>0</posx>
+            <posy>396</posy>
+            <width>1920</width>
+            <radioposx>1806</radioposx>
+            <textwidth>1700</textwidth>
+            <label>$ADDON[pvr.wmc 30122]</label>
+            <include>LeftMenuButtonWide</include>
+            <onup>10</onup>
+            <ondown>1</ondown>
+        </control>
+    </include>
+    <include name="RecordPrefs_dvblink">
+        <control type="radiobutton" id="10">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.dvblink 32012]</label>
+            <include>LeftMenuButton</include>
+        </control>
+        <control type="radiobutton" id="11">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.dvblink 32013]</label>
+            <include>LeftMenuButton</include>
+        </control>
+        <control type="spincontrolex" id="12">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.dvblink 32017]</label>
+            <include>LeftMenuButton</include>
+        </control>
+        <control type="spincontrolex" id="13">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.dvblink 32018]</label>
+            <include>LeftMenuButton</include>
+        </control>
+        <control type="radiobutton" id="14">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.dvblink 32019]</label>
+            <include>LeftMenuButton</include>
+        </control>
+        <control type="radiobutton" id="15">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.dvblink 32020]</label>
+            <include>LeftMenuButton</include>
+        </control>
+        <control type="spincontrolex" id="16">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.dvblink 32021]</label>
+            <include>LeftMenuButton</include>
+        </control>
+    </include>
+    <include name="RecordPrefs_nextpvr">
+        <control type="spincontrolex" id="21">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.nextpvr 30120]</label>
+            <include>LeftMenuButtonWide</include>
+        </control>
+        <control type="spincontrolex" id="25">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.nextpvr 30132]</label>
+            <include>LeftMenuButtonWide</include>
+        </control>
+        <control type="spincontrolex" id="26">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.nextpvr 30133]</label>
+            <include>LeftMenuButtonWide</include>
+        </control>
+        <control type="spincontrolex" id="23">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.nextpvr 30130]</label>
+            <include>LeftMenuButtonWide</include>
+        </control>
+        <control type="spincontrolex" id="27">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.nextpvr 30134]</label>
+            <include>LeftMenuButtonWide</include>
+        </control>
+    </include>
+    <include name="RecordPrefs_wmc">
+        <control type="radiobutton" id="10">
+            <height>78</height>
+            <width>1920</width>
+            <radioposx>1806</radioposx>
+            <textwidth>1700</textwidth>
+            <label>$ADDON[pvr.wmc 30101]</label>
+            <include>LeftMenuButtonWide</include>
+        </control>
+        <control type="radiobutton" id="11">
+            <height>78</height>
+            <width>1920</width>
+            <radioposx>1806</radioposx>
+            <textwidth>1700</textwidth>
+            <label>$ADDON[pvr.wmc 30102]</label>
+            <include>LeftMenuButtonWide</include>
+        </control>
+        <control type="spincontrolex" id="12">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.wmc 30103]</label>
+            <include>LeftMenuButtonWide</include>
+        </control>
+        <control type="spincontrolex" id="13">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.wmc 30107]</label>
+            <include>LeftMenuButtonWide</include>
+        </control>
+        <control type="spincontrolex" id="14">
+            <height>78</height>
+            <width>1920</width>
+            <label>$ADDON[pvr.wmc 30110]</label>
+            <include>LeftMenuButtonWide</include>
+        </control>
+    </include>
 </includes>
diff --git a/1080i/RecordPrefs.xml b/1080i/RecordPrefs.xml
index 10991b7f..fc5521f9 100644
--- a/1080i/RecordPrefs.xml
+++ b/1080i/RecordPrefs.xml
@@ -26,75 +26,106 @@
                 </control>
                 <control type="image">
                     <posx>100</posx>
-                    <posy>823</posy>
+                    <posy>394</posy>
                     <width>1720</width>
-                    <height>211</height>
+                    <height>640</height>
                     <texture border="100">$VAR[Theme.Color]/common/bg_list.png</texture>
                 </control>
+                <control type="image">
+                    <posx>100</posx>
+                    <posy>862</posy>
+                    <width>1720</width>
+                    <height>172</height>
+                    <texture border="100">$VAR[Theme.Color]/common/bg_list.png</texture>
+                </control>
+                <control type="label">
+                    <visible>System.HasAddon(pvr.dvblink)</visible>
+                    <posx>TextMargin</posx>
+                    <posy>183</posy>
+                    <width>1800</width>
+                    <height>135</height>
+                    <align>center</align>
+                    <font>InfoTitleFont</font>
+                    <include>TextColor_MainColor</include>
+                    <label>$ADDON[pvr.dvblink 32011]</label>
+                </control>
+                <control type="label">
+                    <visible>System.HasAddon(pvr.nextpvr)</visible>
+                    <posx>TextMargin</posx>
+                    <posy>183</posy>
+                    <width>1800</width>
+                    <height>135</height>
+                    <align>center</align>
+                    <font>InfoTitleFont</font>
+                    <include>TextColor_MainColor</include>
+                    <label>$ADDON[pvr.nextpvr 30100]</label>
+                </control>
                 <control type="label">
+                    <visible>System.HasAddon(pvr.wmc)</visible>
                     <posx>TextMargin</posx>
                     <posy>183</posy>
                     <width>1800</width>
-                    <height>105</height>
+                    <height>135</height>
                     <align>center</align>
                     <font>InfoTitleFont</font>
                     <include>TextColor_MainColor</include>
                     <label>$ADDON[pvr.wmc 30100]</label>
                 </control>
+                <!-- EPG TITLE-->
                 <control type="label" id="20">
                     <posx>TextMargin</posx>
-                    <posy>270</posy>
+                    <posy>340</posy>
                     <width>1800</width>
                     <height>35</height>
                     <align>center</align>
-                    <font>InfoTitleSubFont</font>
+                    <font>FacadeListMainFont</font>
                     <include>TextColor_MainColor</include>
                 </control>
+                <!-- EPG DESCRIPTION-->
+                <control type="label" id="24">
+                    <visible>System.HasAddon(pvr.nextpvr)</visible>
+                    <posx>TextMargin</posx>
+                    <posy>380</posy>
+                    <width>1800</width>
+                    <height>35</height>
+                    <align>center</align>
+                    <font>InfoTitleSubFont</font>
+                    <include>TextColor_AlternateColor</include>
+                </control>
+                <control type="label">
+                    <visible>!System.HasAddon(pvr.nextpvr)</visible>
+                    <posx>TextMargin</posx>
+                    <posy>380</posy>
+                    <width>1800</width>
+                    <height>35</height>
+                    <align>center</align>
+                    <label>$LOCALIZE[207] - $LOCALIZE[416]</label>
+                    <font>InfoTitleSubFont</font>
+                    <include>TextColor_AlternateColor</include>
+                </control>
                 <control type="grouplist" id="9000">
                     <posx>0</posx>
-                    <posy>318</posy>
+                    <posy>435</posy>
                     <width>1920</width>
-                    <height>585</height>
+                    <height>468</height>
                     <itemgap>0</itemgap>
                     <orientation>vertical</orientation>
                     <onleft>9900</onleft>
-                    <onright>9000</onright>
+                    <onright>60</onright>
                     <onup>9000</onup>
                     <ondown>9001</ondown>
-                    <control type="radiobutton" id="10">
-                        <height>117</height>
-                        <width>1920</width>
-                        <radioposx>1806</radioposx>
-                        <textwidth>1700</textwidth>
-                        <label>$ADDON[pvr.wmc 30101]</label>
-                        <include>LeftMenuButtonWide</include>
-                    </control>
-                    <control type="radiobutton" id="11">
-                        <height>117</height>
-                        <width>1920</width>
-                        <radioposx>1806</radioposx>
-                        <textwidth>1700</textwidth>
-                        <label>$ADDON[pvr.wmc 30102]</label>
-                        <include>LeftMenuButtonWide</include>
-                    </control>
-                    <control type="spincontrolex" id="12">
-                        <height>117</height>
-                        <width>1920</width>
-                        <label>$ADDON[pvr.wmc 30103]</label>
-                        <include>LeftMenuButtonWide</include>
-                    </control>
-                    <control type="spincontrolex" id="13">
-                        <height>117</height>
-                        <width>1920</width>
-                        <label>$ADDON[pvr.wmc 30107]</label>
-                        <include>LeftMenuButtonWide</include>
-                    </control>
-                    <control type="spincontrolex" id="14">
-                        <height>117</height>
-                        <width>1920</width>
-                        <label>$ADDON[pvr.wmc 30110]</label>
-                        <include>LeftMenuButtonWide</include>
-                    </control>
+                    <pagecontrol>60</pagecontrol>
+                    <include condition="System.HasAddon(pvr.dvblink)">RecordPrefs_dvblink</include>
+                    <include condition="System.HasAddon(pvr.nextpvr)">RecordPrefs_nextpvr</include>
+                    <include condition="System.HasAddon(pvr.wmc)">RecordPrefs_wmc</include>
+                </control>
+                <control type="scrollbar" id="60">
+                    <posx>1886</posx>
+                    <posy>435</posy>
+                    <height>468</height>
+                    <include>VerticalScroller</include>
+                    <onleft>9000</onleft>
+                    <onright>60</onright>
                 </control>
                 <control type="grouplist" id="9001">
                     <posx>TextMargin</posx>