diff --git a/1080i/DialogPVRGuideSearch.xml b/1080i/DialogPVRGuideSearch.xml
deleted file mode 100644
index b7f3c0e..0000000
--- a/1080i/DialogPVRGuideSearch.xml
+++ /dev/null
@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-    <defaultcontrol always="true">9</defaultcontrol>
-    <controls>
-        <!--background-->
-        <control type="group">
-            <include>fadeInOut</include>
-            <control type="image">
-                <include>dimensionsFullscreen</include>
-                <texture>colors/black.png</texture>
-                <colordiffuse>eeFFFFFF</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-        </control>
-        <control type="group">
-            <posx>col-5-begin</posx>
-            <posy>row-1-begin</posy>
-            <!--animations-->
-            <include>modalDialogInOutVertical</include>
-            <control type="image">
-                <posx>-384</posx>
-                <posy>44</posy>
-                <width>fullscreenWidth</width>
-                <height>1-row</height>
-                <texture>colors/white.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>-3</posx>
-                <posy>44</posy>
-                <width>3</width>
-                <height>1-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="label">
-                <posx>12</posx>
-                <posy>44</posy>
-                <width>16-col</width>
-                <font>dialogTitle</font>
-                <label>$LOCALIZE[19142]</label>
-                <textcolor>black</textcolor>
-                <shadowcolor>-</shadowcolor>
-            </control>
-            <!--search string-->
-            <control type="label">
-                <posx>12</posx>
-                <posy>120</posy>
-                <width>320</width>
-                <height>40</height>
-                <font>itemTitle</font>
-                <label>$LOCALIZE[19133]</label>
-                <textcolor>textActive</textcolor>
-                <shadowcolor>-</shadowcolor>
-            </control>
-            <control type="edit" id="9">
-                <description>Search string</description>
-                <posx>12</posx>
-                <posy>3-row</posy>
-                <width>16-col</width>
-                <align>left</align>
-                <onleft>9</onleft>
-                <onright>9</onright>
-                <onup>26</onup>
-                <ondown>10</ondown>
-            </control>
-            <control type="textbox">
-                <description>Search help</description>
-                <posx>12</posx>
-                <posy>4-row</posy>
-                <width>12-col</width>
-                <height>2-row</height>
-                <align>left</align>
-                <font>smallMedium</font>
-                <textcolor>textActive</textcolor>
-                <label>$LOCALIZE[19001] $LOCALIZE[19002]</label>
-            </control>
-            <control type="group">
-                <posx>0</posx>
-                <posy>6-row</posy>
-                <control type="radiobutton" id="10">
-                    <description>Include Description</description>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>8-col</width>
-                    <label>19134</label>
-                    <onleft>12</onleft>
-                    <onright>12</onright>
-                    <onup>9</onup>
-                    <ondown>11</ondown>
-                </control>
-                <control type="radiobutton" id="11">
-                    <description>Case Sensitive</description>
-                    <posx>0</posx>
-                    <posy>1-row</posy>
-                    <width>8-col</width>
-                    <label>19135</label>
-                    <onleft>13</onleft>
-                    <onright>13</onright>
-                    <onup>10</onup>
-                    <ondown>14</ondown>
-                </control>
-                <control type="edit" id="14">
-                    <description>Start Date</description>
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>8-col</width>
-                    <font>itemTitle</font>
-                    <label>19128</label>
-                    <texturefocus>colors/white.png</texturefocus>
-                    <texturenofocus>-</texturenofocus>
-                    <focusedcolor>black</focusedcolor>
-                    <onright>16</onright>
-                    <onleft>16</onleft>
-                    <onup>11</onup>
-                    <ondown>15</ondown>
-                </control>
-                <control type="edit" id="15">
-                    <description>Stop Date</description>
-                    <posx>0</posx>
-                    <posy>3-row</posy>
-                    <width>8-col</width>
-                    <label>19129</label>
-                    <texturefocus>colors/white.png</texturefocus>
-                    <texturenofocus>-</texturenofocus>
-                    <focusedcolor>black</focusedcolor>
-                    <onright>17</onright>
-                    <onleft>17</onleft>
-                    <onup>14</onup>
-                    <ondown>18</ondown>
-                </control>
-                <control type="spincontrolex" id="18">
-                    <description>Genre</description>
-                    <posx>0</posx>
-                    <posy>4-row</posy>
-                    <width>8-col</width>
-                    <label>515</label>
-                    <onright>19</onright>
-                    <onleft>19</onleft>
-                    <onup>15</onup>
-                    <ondown>20</ondown>
-                </control>
-                <control type="radiobutton" id="20">
-                    <description>Include unknown Genres</description>
-                    <posx>0</posx>
-                    <posy>5-row</posy>
-                    <width>8-col</width>
-                    <label>19132</label>
-                    <onleft>21</onleft>
-                    <onright>21</onright>
-                    <onup>18</onup>
-                    <ondown>22</ondown>
-                </control>
-                <control type="radiobutton" id="22">
-                    <description>FTA only</description>
-                    <posx>0</posx>
-                    <posy>6-row</posy>
-                    <width>8-col</width>
-                    <label>19123</label>
-                    <onleft>23</onleft>
-                    <onright>23</onright>
-                    <onup>20</onup>
-                    <ondown>24</ondown>
-                </control>
-                <control type="radiobutton" id="24">
-                    <description>Ignore Timers</description>
-                    <posx>0</posx>
-                    <posy>7-row</posy>
-                    <width>8-col</width>
-                    <label>19124</label>
-                    <onleft>27</onleft>
-                    <onright>27</onright>
-                    <onup>22</onup>
-                    <ondown>9000</ondown>
-                </control>
-            </control>
-            <control type="group">
-                <posx>8-col</posx>
-                <posy>6-row</posy>
-                <control type="spincontrolex" id="12">
-                    <description>Min Duration</description>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>8-col</width>
-                    <label>19130</label>
-                    <onright>10</onright>
-                    <onleft>10</onleft>
-                    <onup>9</onup>
-                    <ondown>13</ondown>
-                </control>
-                <control type="spincontrolex" id="13">
-                    <description>Max Duration</description>
-                    <posx>0</posx>
-                    <posy>1-row</posy>
-                    <width>8-col</width>
-                    <label>19131</label>
-                    <onright>11</onright>
-                    <onleft>11</onleft>
-                    <onup>12</onup>
-                    <ondown>16</ondown>
-                </control>
-                <control type="edit" id="16">
-                    <description>Start time</description>
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>8-col</width>
-                    <texturefocus>colors/white.png</texturefocus>
-                    <texturenofocus>-</texturenofocus>
-                    <focusedcolor>black</focusedcolor>
-                    <height>1-row</height>
-                    <label>19126</label>
-                    <onright>14</onright>
-                    <onleft>14</onleft>
-                    <onup>13</onup>
-                    <ondown>17</ondown>
-                </control>
-                <control type="edit" id="17">
-                    <description>Stop time</description>
-                    <posx>0</posx>
-                    <posy>3-row</posy>
-                    <texturefocus>colors/white.png</texturefocus>
-                    <texturenofocus>-</texturenofocus>
-                    <focusedcolor>black</focusedcolor>
-                    <label>19127</label>
-                    <onright>15</onright>
-                    <onleft>15</onleft>
-                    <onup>16</onup>
-                    <ondown>19</ondown>
-                </control>
-                <control type="radiobutton" id="19">
-                    <description>avoid repeats</description>
-                    <posx>0</posx>
-                    <posy>4-row</posy>
-                    <width>8-col</width>
-                    <label>19121</label>
-                    <onright>18</onright>
-                    <onleft>18</onleft>
-                    <onup>17</onup>
-                    <ondown>21</ondown>
-                </control>
-                <control type="spincontrolex" id="21">
-                    <description>Groups</description>
-                    <posx>0</posx>
-                    <posy>5-row</posy>
-                    <width>8-col</width>
-                    <label>19141</label>
-                    <onright>20</onright>
-                    <onleft>20</onleft>
-                    <onup>19</onup>
-                    <ondown>23</ondown>
-                </control>
-                <control type="spincontrolex" id="23">
-                    <description>Channels</description>
-                    <posx>0</posx>
-                    <posy>6-row</posy>
-                    <width>8-col</width>
-                    <label>19148</label>
-                    <onleft>22</onleft>
-                    <onright>22</onright>
-                    <onup>21</onup>
-                    <ondown>27</ondown>
-                </control>
-                <control type="radiobutton" id="27">
-                    <description>Ignore Recordings</description>
-                    <posx>0</posx>
-                    <posy>7-row</posy>
-                    <width>8-col</width>
-                    <label>19125</label>
-                    <onleft>24</onleft>
-                    <onright>24</onright>
-                    <onup>23</onup>
-                    <ondown>9000</ondown>
-                </control>
-            </control>
-            <!--Defaults / cancel / search buttons-->
-            <control type="panel" id="9000">
-                <posx>0</posx>
-                <posy>16-row</posy>
-                <width>12-col</width>
-                <height>1-row</height>
-                <itemgap>3</itemgap>
-                <orientation>horizontal</orientation>
-                <onup>24</onup>
-                <itemlayout width="4-col" height="1-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>4-col</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                    </control>
-                    <control type="label">
-                        <posx>24</posx>
-                        <posy>0</posy>
-                        <width>1-col</width>
-                        <font>symbol</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label2]</label>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                    <control type="label">
-                        <posx>1-col</posx>
-                        <posy>-1</posy>
-                        <width>3-col</width>
-                        <font>menuTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="4-col" height="1-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>4-col</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
-                    </control>
-                    <control type="label">
-                        <posx>24</posx>
-                        <posy>0</posy>
-                        <width>1-col</width>
-                        <font>symbol</font>
-                        <textcolor>black</textcolor>
-                        <label>$INFO[ListItem.label2]</label>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                    <control type="label">
-                        <posx>1-col</posx>
-                        <posy>-1</posy>
-                        <width>3-col</width>
-                        <font>menuTitle</font>
-                        <textcolor>black</textcolor>
-                        <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                </focusedlayout>
-                <content>
-                    <item id="1">
-                        <label>137</label>
-                        <label2></label2>
-                        <thumb>-</thumb>
-                        <onclick>sendclick(26)</onclick>
-                    </item>
-                    <item id="2">
-                        <label>409</label>
-                        <label2></label2>
-                        <thumb>-</thumb>
-                        <onclick>SendClick(28)</onclick>
-                    </item>
-                    <item id="3">
-                        <label>222</label>
-                        <label2></label2>
-                        <thumb>-</thumb>
-                        <onclick>SendClick(25)</onclick>
-                    </item>
-                </content>
-            </control>
-        </control>
-        <!--dialog buttons-->
-        <control type="group">
-            <visible>false</visible>
-            <control type="button" id="28">
-                <description>Defaults Button</description>
-                <label>409</label>
-            </control>
-            <control type="button" id="25">
-                <description>Cancel Button</description>
-                <label>222</label>
-            </control>
-            <control type="button" id="26">
-                <description>Search Button</description>
-                <label>137</label>
-            </control>
-        </control>
-        <!--debugging-->
-        <include>DebugGrid</include>
-        <control type="label">
-            <include>DialogID</include>
-            <label>DialogPVRGuideSearch.xml</label>
-        </control>
-    </controls>
-</window>
diff --git a/1080i/DialogPVRRecordingInfo.xml b/1080i/DialogPVRRecordingInfo.xml
index f9c193a..fadb3a7 100644
--- a/1080i/DialogPVRRecordingInfo.xml
+++ b/1080i/DialogPVRRecordingInfo.xml
@@ -16,101 +16,153 @@
             <!--content-->
             <control type="group">
                 <posx>col-7-begin</posx>
-                <posy>row-6-begin</posy>
+                <posy>row-5-begin</posy>
                 <include>modalDialogInOut</include>
+
                 <!--titles-->
-                <control type="label">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>12-col</width>
-                    <align>left</align>
-                    <font>itemSubTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <label>$INFO[listitem.channelname,,  |  ]$INFO[ListItem.startdate]  |  $INFO[ListItem.duration]</label>
-                </control>
                 <control type="label">
                     <description>Episode title</description>
                     <posx>0</posx>
-                    <posy>1-row</posy>
-                    <width>12-col</width>
+                    <posy>0</posy>
+                    <width>12-col-gutter</width>
+                    <height>3-row</height>
                     <align>left</align>
+                    <aligny>center</aligny>
                     <font>mediumStrong</font>
-
-
-                    <textcolor>textActive</textcolor>
+                    <textcolor>highlight</textcolor>
+                    <shadowcolor>-</shadowcolor>
                     <label>$INFO[ListItem.Label]</label>
+                    <wrapmultiline>true</wrapmultiline>
                 </control>
+
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>4-row</posy>
+                    <width>12-col-gutter</width>
+                    <align>left</align>
+                    <aligny>center</aligny>
+                    <font>itemTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label>[COLOR highlight]$LOCALIZE[31191][/COLOR] $INFO[listitem.channelname]</label>
+                </control>
+
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>5-row</posy>
+                    <width>12-col-gutter</width>
+                    <align>left</align>
+                    <aligny>center</aligny>
+                    <font>itemTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label>[COLOR highlight]$LOCALIZE[31192][/COLOR] $INFO[ListItem.startdate]</label>
+                </control>
+
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>6-row</posy>
+                    <width>6-col-gutter</width>
+                    <align>left</align>
+                    <aligny>center</aligny>
+                    <font>itemTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label>[COLOR highlight]$LOCALIZE[31193][/COLOR] $INFO[ListItem.duration]</label>
+                </control>
+
                 <!--synopsis-->
                 <control type="textbox">
                     <posx>0</posx>
-                    <posy>120</posy>
-                    <font>textboxExtraLeading</font>
+                    <posy>8-row</posy>
+                    <font>textbox</font>
                     <width>12-col</width>
                     <align>left</align>
                     <textcolor>textActive</textcolor>
-                    <height>174</height>
-                    <label>[B]$INFO[ListItem.plot][/B]</label>
+                    <shadowcolor>-</shadowcolor>
+                    <height>200</height>
+                    <label>$INFO[ListItem.plot]</label>
                     <autoscroll delay="10000" time="1000" repeat="10000"/>
                 </control>
+
                 <!--dialog controls-->
                 <control type="list" id="8000">
                     <posx>0</posx>
-                    <posy>330</posy>
+                    <posy>15-row</posy>
                     <width>12-col</width>
-                    <height>1-row</height>
-                    <itemgap>3</itemgap>
+                    <height>2-row</height>
                     <orientation>horizontal</orientation>
-                    <itemlayout width="6-col" height="1-row">
+                    <itemlayout width="6-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
+                            <posy>0</posy>
                             <width>6-col</width>
-                            <height>53</height>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/black.png</texture>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>0</posx>
                             <posy>0</posy>
                             <width>1-col</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <align>center</align>
                             <font>symbol</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                         <control type="label">
-                            <posx>1-col</posx>
-                            <posy>2</posy>
+                            <posx>1-col-indent</posx>
+                            <posy>0</posy>
                             <width>6-col</width>
-                            <font>menuTitle</font>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="6-col" height="1-row">
+                    <focusedlayout width="6-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
-                            <width>6-col</width>
-                            <height>53</height>
+                            <posy>0</posy>
+                            <width>1-col-textbox</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/white.png</texture>
+                            <colordiffuse>highlight</colordiffuse>
+                            <include>spinFocusIcon</include>
+                        </control>
+                        <control type="image">
+                            <posx>1-col</posx>
+                            <posy>0</posy>
+                            <width>5-col</width>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>0</posx>
                             <posy>0</posy>
                             <width>1-col</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <align>center</align>
                             <font>symbol</font>
-                            <textcolor>black</textcolor>
+                            <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                         <control type="label">
-                            <posx>1-col</posx>
-                            <posy>2</posy>
+                            <posx>1-col-indent</posx>
+                            <posy>0</posy>
                             <width>6-col</width>
-                            <font>menuTitle</font>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>-</shadowcolor>
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index aa43f1c..1a22ae2 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -177,24 +177,14 @@
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
                                 <textcolor>black</textcolor>
+                                <selectedcolor>black</selectedcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </focusedlayout>
                     </control>
                 </control>
-                <!--larger thumbnail-->
-                <control type="image">
-                    <posx>12-col-indent</posx>
-                    <posy>3-row</posy>
-                    <width>6-col-gutter</width>
-                    <height>6-col-gutter</height>
-                    <aspectratio scalediffuse="false" align="center" aligny="center">keep</aspectratio>
-                    <texture border="0">$INFO[container(6).Listitem.icon]</texture>
-                    <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                    <bordersize>3</bordersize>
-                    <fadetime>200</fadetime>
-                </control>
+
                 <!--OK / Cancel-->
                 <control type="image">
                     <posx>12-col</posx>
@@ -205,10 +195,22 @@
                     <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
+                <!--larger thumbnail-->
+                <control type="image">
+                    <posx>13-col</posx>
+                    <posy>3-row</posy>
+                    <width>4-col</width>
+                    <height>4-col</height>
+                    <aspectratio scalediffuse="false" align="center" aligny="center">keep</aspectratio>
+                    <texture border="0">$INFO[container(6).Listitem.icon]</texture>
+                    <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                    <bordersize>3</bordersize>
+                    <fadetime>200</fadetime>
+                </control>
                 <control type="panel" id="9999">
                     <visible>control.isvisible(3) | control.isvisible(5)</visible>
                     <posx>12-col</posx>
-                    <posy>19-row</posy>
+                    <posy>12-row</posy>
                     <width>6-col</width>
                     <height>6-row</height>
                     <orientation>vertical</orientation>
@@ -221,7 +223,7 @@
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/black.png</texture>
-                            <colordiffuse>textboxInactive</colordiffuse>
+                            <colordiffuse>overlay</colordiffuse>
                         </control>
                         <control type="label">
                             <posx>0</posx>
@@ -242,7 +244,7 @@
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/black.png</texture>
-                            <colordiffuse>textboxInactive</colordiffuse>
+                            <colordiffuse>overlay</colordiffuse>
                         </control>
                         <control type="label">
                             <posx>1-col-indent</posx>
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index 5fb8fba..4d22f0d 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -2,11 +2,6 @@
 <window>
     <defaultcontrol>160</defaultcontrol>
     <allowoverlay>no</allowoverlay>
-    <coordinates>
-        <system>1</system>
-        <posx>0</posx>
-        <posy>0</posy>
-    </coordinates>
     <controls>
         <control type="image">
             <posx>0</posx>
@@ -20,37 +15,38 @@
         </control>
         <control type="group" id="250">
             <posx>col-3-begin</posx>
-            <posy>row-2-begin</posy>
+            <posy>row-3-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
-                <posx>-240</posx>
-                <posy>44</posy>
-                <width>fullscreenWidth</width>
-                <height>1-row</height>
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>20-col</width>
+                <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>-3</posx>
-                <posy>44</posy>
-                <width>3</width>
-                <height>1-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
+            <!--title-->
             <control type="label">
-                <posx>12</posx>
-                <posy>44</posy>
-                <width>18-col-gutter</width>
-                <height>1-row</height>
+                <posx>24</posx>
+                <posy>0</posy>
+                <width>20-col-gutter</width>
+                <height>2-row</height>
                 <font>dialogTitle</font>
-                <textcolor>black</textcolor>
-                <shadowcolor>-</shadowcolor>
                 <label>$LOCALIZE[31154] - $INFO[Player.Filename]</label>
-                <wrapmultiline>false</wrapmultiline>
+                <textcolor>textActive</textcolor>
+                <shadowcolor>-</shadowcolor>
+            </control>
+            <!--dialog background-->
+            <control type="image">
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>20-col</width>
+                <height>21-row</height>
+                <texture>colors/offblack.png</texture>
+                <colordiffuse></colordiffuse>
+                <aspectratio>stretch</aspectratio>
             </control>
             <control type="label" id="140">
                 <posx>300</posx>
@@ -63,17 +59,27 @@
             </control>
             <!-- ** Required ** Do not change <id>or<type>-->
             <control type="group">
+                <!--options-->
+                <control type="image">
+                    <posx>4-col</posx>
+                    <posy>2-row</posy>
+                    <width>16-col</width>
+                    <height>21-row</height>
+                    <texture>colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
                 <!--subtitle file selection-->
                 <control type="panel" id="120">
                     <posx>4-col</posx>
-                    <posy>177</posy>
+                    <posy>2-row</posy>
                     <width>16-col</width>
                     <height>13-row</height>
                     <onleft>150</onleft>
                     <onright>60</onright>
                     <scrolltime>200</scrolltime>
                     <pagecontrol>60</pagecontrol>
-                    <itemlayout width="16-col" height="1-row">
+                    <itemlayout width="16-col" height="2-row">
                         <!--filename-->
                         <control type="label">
                             <posx>12</posx>
@@ -121,7 +127,7 @@
                             <label>31122</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="16-col" height="1-row">
+                    <focusedlayout width="16-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
@@ -194,35 +200,31 @@
             </control>
             <!--manual search button-->
             <control type="button" id="160">
-                <posy>120</posy>
-                <height>54</height>
-                <width>4-col-gutter</width>
-                <align>left</align>
-                <textoffsetx>12</textoffsetx>
-                <font>menuTitle</font>
-                <textcolor>textActive</textcolor>
-                <focusedcolor>black</focusedcolor>
-                <texturefocus>colors/white.png</texturefocus>
+                <posy>2-row</posy>
+                <width>4-col</width>
                 <label>31134</label>
                 <ondown>150</ondown>
                 <onright>120</onright>
+                <textoffsetx>12</textoffsetx>
             </control>
             <!--subtitle service choice-->
             <control type="group">
                 <control type="list" id="150">
                     <posx>0</posx>
-                    <posy>177</posy>
-                    <width>4-col-gutter</width>
+                    <posy>4-row</posy>
+                    <width>4-col</width>
                     <height>11-row</height>
                     <onright>120</onright>
                     <onup>160</onup>
                     <scrolltime>200</scrolltime>
-                    <itemlayout width="4-col" height="1-row">
+                    <itemlayout width="4-col" height="2-row">
                         <control type="label">
                             <posx>12</posx>
                             <posy>0</posy>
-                            <width>6-col-gutter</width>
-                            <font>menuTitle</font>
+                            <width>4-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
                             <selectedcolor>selected</selectedcolor>
                             <shadowcolor>-</shadowcolor>
@@ -232,8 +234,10 @@
                         <control type="label">
                             <posx>12</posx>
                             <posy>0</posy>
-                            <width>6-col-gutter</width>
-                            <font>menuTitle</font>
+                            <width>4-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
                             <selectedcolor>selected</selectedcolor>
                             <shadowcolor>-</shadowcolor>
@@ -241,13 +245,13 @@
                             <visible>ListItem.property(man)</visible>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="4-col" height="1-row">
+                    <focusedlayout width="4-col" height="2-row">
                         <control type="image">
                             <visible>control.hasfocus(150)</visible>
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>6-col</width>
-                            <height>54</height>
+                            <width>4-col</width>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
                             <bordersize>0</bordersize>
@@ -257,8 +261,8 @@
                             <visible>!control.hasfocus(150)</visible>
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>6-col</width>
-                            <height>54</height>
+                            <width>4-col</width>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
                             <bordersize>0</bordersize>
@@ -267,8 +271,10 @@
                         <control type="label">
                             <posx>12</posx>
                             <posy>0</posy>
-                            <width>6-col-gutter</width>
-                            <font>menuTitle</font>
+                            <width>4-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
                             <selectedcolor>black</selectedcolor>
                             <shadowcolor>-</shadowcolor>
@@ -278,8 +284,10 @@
                         <control type="label">
                             <posx>12</posx>
                             <posy>0</posy>
-                            <width>6-col-gutter</width>
-                            <font>menuTitle</font>
+                            <width>4-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
                             <selectedcolor>black</selectedcolor>
                             <shadowcolor>-</shadowcolor>
diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml
index 955c951..3de5ba9 100644
--- a/1080i/FileBrowser.xml
+++ b/1080i/FileBrowser.xml
@@ -6,6 +6,7 @@
     <controls>
         <!--background-->
         <include>globalBackground</include>
+
         <!--fanart (if available)-->
         <control type="image">
             <visible>SubString(ListItem.label,fanart)</visible>
@@ -23,6 +24,7 @@
             <aspectratio>stretch</aspectratio>
             <fadetime>400</fadetime>
         </control>
+
         <!--poster (if available)-->
         <control type="image">
             <visible>SubString(ListItem.label,remote art)</visible>
@@ -38,97 +40,104 @@
             <aspectratio>stretch</aspectratio>
             <colordiffuse>99ffffff</colordiffuse>
         </control>
+
         <!--file list-->
         <control type="group">
-            <posx>col-5-begin</posx>
-            <posy>row-2-begin</posy>
+            <posx>col-6-begin</posx>
+            <posy>row-3-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
-                <posx>-384</posx>
-                <posy>44</posy>
-                <width>fullscreenWidth</width>
-                <height>1-row</height>
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>16-col</width>
+                <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
-                <posx>-3</posx>
-                <posy>44</posy>
-                <width>3</width>
-                <height>1-row</height>
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>16-col</width>
+                <height>21-row</height>
                 <texture>colors/black.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
+                <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="label" id="411">
-                <posx>12</posx>
-                <posy>44</posy>
-                <width>16-col</width>
+                <posx>24</posx>
+                <posy>0</posy>
+                <width>16-col-gutter</width>
+                <height>2-row</height>
+                <aligny>center</aligny>
                 <font>dialogTitle</font>
                 <label>31089</label>
-                <textcolor>black</textcolor>
+                <textcolor>textActive</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>12-col</width>
+                <height>21-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="panel" id="450">
                 <posx>0</posx>
-                <posy>120</posy>
+                <posy>2-row</posy>
                 <width>12-col</width>
-                <height>11-row</height>
+                <height>21-row</height>
                 <onright>9000</onright>
-                <itemlayout height="1-row" width="12-col">
+                <itemlayout height="2-row" width="12-col">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
-                        <width>12-col-gutter</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="24,0,24,0">UIControls/listitemNF.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>99FFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>4</posx>
-                        <posy>4</posy>
-                        <width>48</width>
-                        <height>48</height>
+                        <posy>0</posy>
+                        <width>1-col</width>
+                        <height>2-row</height>
                         <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
+                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
                     </control>
                     <control type="label">
-                        <posx>1-col</posx>
+                        <posx>1-col-indent</posx>
                         <posy>0</posy>
                         <width>11-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.Label]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout height="1-row" width="12-col">
+                <focusedlayout height="2-row" width="12-col">
                     <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>12-col-gutter</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="24,0,24,0">UIControls/listitemFO.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>FFFFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>4</posx>
-                        <posy>4</posy>
-                        <width>48</width>
-                        <height>48</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
-                    </control>
-                    <control type="label">
                         <posx>1-col</posx>
                         <posy>0</posy>
+                        <width>11-col</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <bordersize>0</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
+                    </control>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>1-col</width>
+                        <height>2-row</height>
+                        <aspectratio scalediffuse="false">scale</aspectratio>
+                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
+                        <include>spinFocusIcon</include>
+                    </control>
+                    <control type="label">
+                        <posx>1-col-indent</posx>
+                        <posy>0</posy>
                         <width>11-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
                         <font>itemTitle</font>
                         <textcolor>black</textcolor>
                         <selectedcolor>black</selectedcolor>
@@ -150,63 +159,92 @@
             <!--OK / Cancel / New folder buttons-->
             <control type="panel" id="9000">
                 <posx>12-col</posx>
-                <posy>120</posy>
+                <posy>2-row</posy>
                 <width>4-col</width>
-                <height>5-row</height>
-                <itemgap>3</itemgap>
+                <height>6-row</height>
                 <orientation>vertical</orientation>
                 <onleft>450</onleft>
-                <itemlayout width="4-col" height="1-row">
+                <itemlayout width="4-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
-                        <width>4-col</width>
-                        <height>53</height>
+                        <posy>0</posy>
+                        <width>1-col-textbox</width>
+                        <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/black.png</texture>
+                        <colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>24</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
                         <font>symbol</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
-                    <control type="label">
+                    <control type="image">
                         <posx>1-col</posx>
-                        <posy>2</posy>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
+                        <posy>0</posy>
+                        <width>5-col</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/black.png</texture>
+                        <colordiffuse>overlay</colordiffuse>
+                    </control>
+                    <control type="label">
+                        <posx>1-col-indent</posx>
+                        <posy>0</posy>
+                        <width>5-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
                 </itemlayout>
-                <focusedlayout width="4-col" height="1-row">
+                <focusedlayout width="4-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
-                        <width>4-col</width>
-                        <height>53</height>
+                        <posy>0</posy>
+                        <width>1-col</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                        <include>spinFocusIcon</include>
+                    </control>
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>5-col</width>
+                        <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                     </control>
                     <control type="label">
-                        <posx>24</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
                         <font>symbol</font>
-                        <textcolor>black</textcolor>
+                        <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
-                        <posx>1-col</posx>
-                        <posy>2</posy>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
+                        <posx>1-col-indent</posx>
+                        <posy>0</posy>
+                        <width>5-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
                         <textcolor>black</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 5e5085a..1247f7f 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -6,8 +6,15 @@
     <onload>Skin.Reset(keepMusicMenuActive)</onload>
     <animation effect="fade" start="100" end="0" time="250">WindowClose</animation>
     <animation effect="fade" start="0" end="100" time="500" reversible="true">WindowOpen</animation>
+
+    <onload>alarmClock(bg1,Control.Move(9450,1),00:10,silent,loop)</onload>
+    <onload>alarmClock(bg2,Control.Move(9451,-1),00:10,silent,loop)</onload>
+    <onload>alarmClock(bg3,Control.Move(9452,1),00:10,silent,loop)</onload>
+
     <controls>
         <include>globalBackground</include>
+        <include>homeBackground</include>
+
         <!--browse controls-->
         <control type="group">
             <posx>24</posx>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index fd30eb0..3bfd351 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -4,6 +4,7 @@
     <include file="Includes_grid.xml"/>
     <include file="Includes_variables.xml"/>
     <include file="Includes_animations.xml"/>
+    <include file="Includes_homeBackground.xml"/>
     <include file="Includes_hubMenu.xml"/>
     <include file="Includes_hubMenuItems.xml"/>
     <include file="Includes_hubMenuSubItems.xml"/>
diff --git a/1080i/Includes_homeBackground.xml b/1080i/Includes_homeBackground.xml
new file mode 100644
index 0000000..96c5b7d
--- /dev/null
+++ b/1080i/Includes_homeBackground.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+    <include name="homeBackground">
+        <control type="group">
+            <animation type="windowopen">
+                <effect type="zoom" end="115" time="0"/>
+            </animation>
+            <!--movies-->
+            <control type="wraplist" id="9450">
+                <posx>0</posx>
+                <posy>00</posy>
+                <width>2100</width>
+                <height>fullscreenHeight</height>
+                <orientation>horizontal</orientation>
+                <scrolltime tween="linear" easing="in">10000</scrolltime>
+                <animation type="windowopen">
+                    <effect type="fade" start="0" end="10" time="0"/>
+                    <effect type="zoom" end="115" time="0"/>
+                </animation>
+                <animation type="windowclose">
+                    <effect type="fade" end="0" time="0"/>
+                </animation>
+                <itemlayout width="4-col" height="4-col">
+                    <control type="image">
+                        <posx>-144</posx>
+                        <posy>0</posy>
+                        <width>4-col-gutter</width>
+                        <height>4-col-gutter</height>
+                        <aspectratio>scale</aspectratio>
+                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                        <bordersize>3</bordersize>
+                        <colordiffuse>ffFFFFFF</colordiffuse>
+                        <animation type="conditional" condition="true" loop="true">
+                            <effect type="rotatey" start="0" end="10" center="132" delay="0" time="1500"/>
+                            <effect type="rotatey" start="0" end="-10" center="132" delay="1500" time="1500"/>
+                        </animation>
+                    </control>
+                </itemlayout>
+                <focusedlayout/>
+                <content>videodb://movies/titles/</content>
+            </control>
+            <!--albums-->
+            <control type="wraplist" id="9451">
+                <posx>0</posx>
+                <posy>9-row</posy>
+                <width>fullscreenWidth</width>
+                <height>fullscreenHeight</height>
+                <orientation>horizontal</orientation>
+                <scrolltime tween="linear" easing="in">10000</scrolltime>
+                <animation type="windowopen">
+                    <effect type="fade" start="0" end="10" time="0"/>
+                    <effect type="zoom" end="115" time="0"/>
+                </animation>
+                <animation type="windowclose">
+                    <effect type="fade" end="0" time="0"/>
+                </animation>
+                <itemlayout width="4-col" height="4-col">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>4-col-gutter</width>
+                        <height>4-col-gutter</height>
+                        <aspectratio>scale</aspectratio>
+                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                        <bordersize>3</bordersize>
+                        <colordiffuse>ffFFFFFF</colordiffuse>
+                        <animation type="conditional" condition="true" loop="true">
+                            <effect type="rotatey" start="0" end="-10" center="132" delay="0" time="1500"/>
+                            <effect type="rotatey" start="0" end="10" center="132" delay="1500" time="1500"/>
+                        </animation>
+                    </control>
+                </itemlayout>
+                <focusedlayout/>
+                <content>musicdb://albums/</content>
+            </control>
+            <!--albums-->
+            <control type="wraplist" id="9452">
+                <posx>-72</posx>
+                <posy>18-row</posy>
+                <width>2000</width>
+                <height>fullscreenHeight</height>
+                <orientation>horizontal</orientation>
+                <scrolltime tween="linear" easing="in">10000</scrolltime>
+                <animation type="windowopen">
+                    <effect type="fade" start="0" end="10" time="0"/>
+                    <effect type="zoom" end="115" time="0"/>
+                </animation>
+                <animation type="windowclose">
+                    <effect type="fade" end="0" time="0"/>
+                </animation>
+                <itemlayout width="4-col" height="4-col">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>4-col-gutter</width>
+                        <height>4-col-gutter</height>
+                        <aspectratio>scale</aspectratio>
+                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                        <bordersize>3</bordersize>
+                        <colordiffuse>ffFFFFFF</colordiffuse>
+                        <animation type="conditional" condition="true" loop="true">
+                            <effect type="rotatey" start="0" end="10" center="132" delay="0" time="1500"/>
+                            <effect type="rotatey" start="0" end="-10" center="132" delay="1500" time="1500"/>
+                        </animation>
+                    </control>
+                </itemlayout>
+                <focusedlayout/>
+                <content>videodb://tvshows/titles/</content>
+            </control>
+        </control>
+    </include>
+</includes>
\ No newline at end of file
diff --git a/1080i/Includes_hubMenuSubItems.xml b/1080i/Includes_hubMenuSubItems.xml
index f4ef196..1dbb097 100644
--- a/1080i/Includes_hubMenuSubItems.xml
+++ b/1080i/Includes_hubMenuSubItems.xml
@@ -20,7 +20,7 @@
         </control>
         <control type="button" id="502">
             <description>Search (videos)</description>
-            <visible>[window.isactive(videolibrary) | window.isactive(videoplaylist)] + System.HasAddon(script.globalsearch)</visible>
+            <visible>[window.isactive(videolibrary) | window.isactive(videoplaylist) | window.isactive(pvr)] + System.HasAddon(script.globalsearch)</visible>
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
@@ -36,22 +36,6 @@
             <onclick>RunScript(script.globalsearch,movies=true&amp;tvshows=true&amp;episodes=true)</onclick>
             <onclick>right</onclick>
         </control>
-        <control type="button" id="503">
-            <description>Search (PVR)</description>
-            <visible>window.isactive(pvr)</visible>
-            <height>2-row</height>
-            <width>col-7-begin</width>
-            <font>menuTitle</font>
-            <textcolor>textActive</textcolor>
-            <focusedcolor>highlight</focusedcolor>
-            <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
-            <texturenofocus>-</texturenofocus>
-            <textoffsetx>col-1-begin</textoffsetx>
-            <label>137</label>
-            <onclick>right</onclick>
-            <onclick>activateWindow(pvrguidesearch)</onclick>
-        </control>
         <control type="button" id="3">
             <description>Sort by</description>
             <height>2-row</height>
@@ -152,7 +136,7 @@
             <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
             <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
-            <texturenofocus>-</texturenofocus>
+            <textureradiooffnofocus>colors/white.png</textureradiooffnofocus>
             <textoffsetx>col-1-begin</textoffsetx>
         </control>
         <control type="radiobutton" id="508">
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index 67526a0..ba80711 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -20,8 +20,8 @@
 
             <!--initial animation-->
             <animation type="Windowopen">
-                <effect type="zoom" start="150" time="200" center="auto" tween="linear" easing="out"/>
-                <effect type="fade" start="30" end="100" time="200"/>
+                <effect type="zoom" start="120" time="100" center="auto" tween="linear" easing="out"/>
+                <effect type="fade" start="30" end="100" time="100"/>
             </animation>
 
             <!--Main content listing-->
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 43de8e6..0a97c08 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -20,8 +20,8 @@
 
             <!--initial animation-->
             <animation type="Windowopen">
-                <effect type="zoom" start="150" time="200" center="auto" tween="linear" easing="out"/>
-                <effect type="fade" start="30" end="100" time="200"/>
+                <effect type="zoom" start="120" time="100" center="auto" tween="linear" easing="out"/>
+                <effect type="fade" start="30" end="100" time="100"/>
             </animation>
 
             <!--Main content listing-->
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index f3da45b..515f262 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -20,8 +20,8 @@
 
             <!--initial animation-->
             <animation type="Windowopen">
-                <effect type="zoom" start="150" time="200" center="auto" tween="linear" easing="out"/>
-                <effect type="fade" start="30" end="100" time="200"/>
+                <effect type="zoom" start="120" time="100" center="auto" tween="linear" easing="out"/>
+                <effect type="fade" start="30" end="100" time="100"/>
             </animation>
 
             <!--Main content listing-->
diff --git a/1080i/custom_subtitleMenu.xml b/1080i/custom_subtitleMenu.xml
index 6ac19cd..f137a4c 100644
--- a/1080i/custom_subtitleMenu.xml
+++ b/1080i/custom_subtitleMenu.xml
@@ -22,25 +22,40 @@
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="group">
-                <posx>col-10-begin</posx>
-                <posy>row-7-begin</posy>
+                <posx>col-9-begin</posx>
+                <posy>row-9-begin</posy>
                 <!--animations-->
                 <include>modalDialogInOutVertical</include>
                 <!--subtitle menu-->
-                <control type="grouplist" id="5000">
+                <control type="image">
+                    <posx>-36</posx>
+                    <posy>-36</posy>
+                    <width>9-col</width>
+                    <height>10-row</height>
+                    <texture>colors/black.png</texture>
+                    <aspectratio>stretch</aspectratio>
+                    <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                    <bordersize>3</bordersize>
+                    <colordiffuse>ffffffff</colordiffuse>
+                </control>
+                <control type="label">
+                    <description>heading</description>
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>6-col</width>
+                    <width>9-col</width>
+                    <font>dialogTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <label>$LOCALIZE[31194]</label>
+                </control>
+                <control type="grouplist" id="5000">
+                    <posx>0</posx>
+                    <posy>2-row</posy>
+                    <width>8-col</width>
                     <height>11-row</height>
                     <itemgap>0</itemgap>
                     <control type="radiobutton" id="1">
                         <description>Enable subtitles</description>
                         <enable>VideoPlayer.HasSubtitles</enable>
-                        <textoffsetx>0</textoffsetx>
-                        <textcolor>unselected</textcolor>
-                        <focusedcolor>selected</focusedcolor>
-                        <texturefocus>-</texturefocus>
-                        <width>6-col</width>
                         <label>449</label>
                         <onclick>ShowSubtitles</onclick>
                         <selected>VideoPlayer.SubtitlesEnabled</selected>
@@ -48,27 +63,12 @@
                     <control type="button" id="3">
                         <description>Adjust Subtitle Offset</description>
                         <visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
-                        <height>1-row</height>
-                        <width>6-col</width>
-                        <font>itemTitle</font>
-                        <textcolor>unselected</textcolor>
-                        <focusedcolor>selected</focusedcolor>
-                        <texturefocus>-</texturefocus>
-                        <texturenofocus>-</texturenofocus>
-                        <textoffsetx>0</textoffsetx>
                         <label>22006</label>
                         <onclick>SubtitleDelay</onclick>
                     </control>
                     <control type="button" id="4">
                         <description>Download Subtitle</description>
-                        <height>1-row</height>
-                        <width>6-col</width>
-                        <font>itemTitle</font>
-                        <textcolor>unselected</textcolor>
-                        <focusedcolor>selected</focusedcolor>
-                        <texturefocus>-</texturefocus>
-                        <texturenofocus>-</texturenofocus>
-                        <textoffsetx>0</textoffsetx>
+                        <width>8-col</width>
                         <label>31154</label>
                         <onclick>Dialog.Close(VideoOSD)</onclick>
                         <onclick>ActivateWindow(SubtitleSearch)</onclick>
diff --git a/icon.png b/icon.png
index f41ec0d..1f0f1f9 100644
Binary files a/icon.png and b/icon.png differ
diff --git a/language/English/strings.po b/language/English/strings.po
index 97d8657..acae829 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -704,3 +704,19 @@ msgstr ""
 msgctxt "#31190"
 msgid "All Episodes"
 msgstr ""
+
+msgctxt "#31191"
+msgid "Channel"
+msgstr ""
+
+msgctxt "#31192"
+msgid "Recorded"
+msgstr ""
+
+msgctxt "#31193"
+msgid "Duration"
+msgstr ""
+
+msgctxt "#31194"
+msgid "Subtitles"
+msgstr ""