diff --git a/1080i/DialogAddonSettings.xml b/1080i/DialogAddonSettings.xml
index 58f2e7e..80c8f2e 100644
--- a/1080i/DialogAddonSettings.xml
+++ b/1080i/DialogAddonSettings.xml
@@ -39,13 +39,13 @@
                 <textcolor>textActive</textcolor>
             </control>
             <!--subnav-->
-            <control type="grouplist" id="9">
+            <control type="grouplist" id="3">
                 <posx>0</posx>
                 <posy>2-row</posy>
                 <width>4-col</width>
                 <height>20-row</height>
                 <onleft>9000</onleft>
-                <onright>2</onright>
+                <onright>5</onright>
                 <orientation>vertical</orientation>
             </control>
             <!--options area-->
@@ -58,12 +58,12 @@
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="grouplist" id="2">
+            <control type="grouplist" id="5">
                 <posx>4-col</posx>
                 <posy>2-row</posy>
                 <width>10-col</width>
                 <height>20-row</height>
-                <onleft>9</onleft>
+                <onleft>3</onleft>
                 <onright>9001</onright>
                 <orientation>vertical</orientation>
             </control>
@@ -74,7 +74,7 @@
                 <width>4-col</width>
                 <height>20-row</height>
                 <orientation>vertical</orientation>
-                <onleft>2</onleft>
+                <onleft>5</onleft>
                 <itemlayout width="6-col" height="2-row">
                     <control type="label">
                         <posx>0</posx>
@@ -156,7 +156,7 @@
                         <thumb></thumb>
                         <onclick>SendClick(10140,11)</onclick>
                     </item>
-                    <item id="3">
+                    <item id="7">
                         <description>Defaults Button</description>
                         <label>409</label>
                         <label2></label2>
@@ -165,7 +165,7 @@
                     </item>
                 </content>
             </control>
-            <control type="togglebutton" id="13">
+            <control type="togglebutton" id="10">
                 <description>Default Category Button</description>
                 <width>287</width>
                 <font>buttonTitle</font>
@@ -175,20 +175,20 @@
             <control type="button" id="3">
                 <description>Default Button</description>
             </control>
-            <control type="radiobutton" id="4">
+            <control type="radiobutton" id="8">
                 <description>Default RadioButton</description>
             </control>
-            <control type="spincontrolex" id="5">
+            <control type="spincontrolex" id="9">
                 <description>Default spincontrolex</description>
             </control>
-            <control type="label" id="7">
+            <control type="label" id="14">
                 <label></label>
                 <textoffsetx>24</textoffsetx>
                 <height>2-row</height>
                 <font>settingsCategoryTitle</font>
                 <textcolor>highlight</textcolor>
             </control>
-            <control type="image" id="6">
+            <control type="image" id="11">
                 <description>Default Separator</description>
                 <width>1</width>
                 <height>1</height>
@@ -196,19 +196,22 @@
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="sliderex" id="8">
+            <control type="edit" id="12">
+                <description>Default Edit</description>
+            </control>
+			<control type="sliderex" id="13">
                 <description>Default Slider</description>
             </control>
             <!--ok, cancel etc buttons-->
             <control type="group">
                 <visible>false</visible>
-                <control type="button" id="10">
+                <control type="button" id="28">
                     <description>OK Button</description>
                 </control>
-                <control type="button" id="11">
+                <control type="button" id="29">
                     <description>Cancel Button</description>
                 </control>
-                <control type="button" id="12">
+                <control type="button" id="30">
                     <description>Defaults Button</description>
                 </control>
             </control>
diff --git a/1080i/DialogPVRChannelManager.xml b/1080i/DialogPVRChannelManager.xml
index 74962a8..8974f39 100644
--- a/1080i/DialogPVRChannelManager.xml
+++ b/1080i/DialogPVRChannelManager.xml
@@ -30,9 +30,9 @@
                     <aspectratio>stretch</aspectratio>
                 </control>
                 <control type="image">
-                    <posx>8-col</posx>
+                    <posx>6-col</posx>
                     <posy>2-row</posy>
-                    <width>8-col</width>
+                    <width>11-col</width>
                     <height>21-row</height>
                     <texture>colors/black.png</texture>
                     <colordiffuse>overlay</colordiffuse>
@@ -62,25 +62,22 @@
                     <textcolor>textActive</textcolor>
                     <shadowcolor></shadowcolor>
                 </control>
-
                 <!--channel list-->
                 <control type="image">
                     <posx>0</posx>
                     <posy>2-row</posy>
-                    <width>8-col-textbox</width>
-                    <height>2-row</height>
+                    <width>8-col</width>
+                    <height>71</height>
                     <texture>colors/white.png</texture>
                     <aspectratio>stretch</aspectratio>
-                    <colordiffuse>44FFFFFF</colordiffuse>
                 </control>
                 <control type="label">
                     <description>name label</description>
-                    <posx>0</posx>
+                    <posx>24</posx>
                     <posy>2-row</posy>
                     <width>8-col</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
-                    <align>center</align>
                     <font>itemSubTitle</font>
                     <textcolor>black</textcolor>
                     <label>$LOCALIZE[31214]</label>
@@ -88,7 +85,7 @@
                 <control type="list" id="20">
                     <posx>0</posx>
                     <posy>4-row</posy>
-                    <width>8-col-textbox</width>
+                    <width>6-col-textbox</width>
                     <height>19-row</height>
                     <onright>7</onright>
                     <itemlayout height="2-row" width="8-col">
@@ -103,7 +100,7 @@
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>7-col-gutter</width>
+                            <width>5-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
@@ -138,7 +135,7 @@
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>7-col-gutter</width>
+                            <width>5-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>buttonTitle</font>
@@ -149,37 +146,34 @@
                         </control>
                     </focusedlayout>
                 </control>
-
                 <!--channel management options-->
                 <control type="image">
                     <posx>8-col</posx>
                     <posy>2-row</posy>
-                    <width>8-col-textbox</width>
-                    <height>2-row</height>
+                    <width>8-col</width>
+                    <height>71</height>
                     <texture>colors/white.png</texture>
                     <aspectratio>stretch</aspectratio>
-                    <colordiffuse>44FFFFFF</colordiffuse>
                 </control>
                 <control type="label">
                     <description>name label</description>
-                    <posx>8-col</posx>
+                    <posx>444</posx>
                     <posy>2-row</posy>
                     <width>8-col</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
-                    <align>center</align>
                     <font>itemSubTitle</font>
                     <textcolor>black</textcolor>
                     <label>$LOCALIZE[31179]</label>
                 </control>
                 <control type="group">
-                    <posx>8-col</posx>
+                    <posx>6-col</posx>
                     <posy>4-row</posy>
                     <control type="radiobutton" id="7">
                         <description>Channel activated</description>
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>8-col</width>
+                        <width>11-col</width>
                         <label>19074</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -189,7 +183,7 @@
                         <description>Channel name</description>
                         <posx>0</posx>
                         <posy>2-row</posy>
-                        <width>8-col</width>
+                        <width>11-col</width>
                         <font>buttonTitle</font>
                         <align>left</align>
                         <texturefocus>colors/white.png</texturefocus>
@@ -206,7 +200,7 @@
                         <description>Channel logo Button</description>
                         <posx>0</posx>
                         <posy>4-row</posy>
-                        <width>8-col</width>
+                        <width>11-col</width>
                         <label>19202</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -214,7 +208,7 @@
                         <ondown>12</ondown>
                     </control>
                     <control type="image" id="10">
-                        <posx>496</posx>
+                        <posx>10-col</posx>
                         <posy>156</posy>
                         <width>48</width>
                         <height>48</height>
@@ -225,7 +219,7 @@
                         <description>EPG activated</description>
                         <posx>0</posx>
                         <posy>6-row</posy>
-                        <width>8-col</width>
+                        <width>11-col</width>
                         <label>19206</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -236,7 +230,7 @@
                         <description>EPG source</description>
                         <posx>0</posx>
                         <posy>8-row</posy>
-                        <width>8-col</width>
+                        <width>11-col</width>
                         <label>19200</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -247,7 +241,7 @@
                         <description>Parental locked</description>
                         <posx>0</posx>
                         <posy>10-row</posy>
-                        <width>8-col</width>
+                        <width>11-col</width>
                         <label>19267</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -258,7 +252,7 @@
                         <description>Group Manager Button</description>
                         <posx>0</posx>
                         <posy>12-row</posy>
-                        <width>8-col</width>
+                        <width>11-col</width>
                         <label>19205</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -270,7 +264,7 @@
                         <description>TV/Radio Button</description>
                         <posx>0</posx>
                         <posy>14-row</posy>
-                        <width>8-col</width>
+                        <width>11-col</width>
                         <label>19024</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -282,7 +276,7 @@
                         <description>TV/Radio Button</description>
                         <posx>0</posx>
                         <posy>14-row</posy>
-                        <width>8-col</width>
+                        <width>11-col</width>
                         <label>19023</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -293,7 +287,7 @@
                         <description>Edit channel Button</description>
                         <posx>0</posx>
                         <posy>16-row</posy>
-                        <width>8-col</width>
+                        <width>11-col</width>
                         <label>19203</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -301,33 +295,19 @@
                         <ondown>32</ondown>
                     </control>
                 </control>
-
                 <!--OK / Cancel / apply-->
                 <control type="image">
                     <posx>16-col</posx>
                     <posy>2-row</posy>
                     <width>6-col</width>
-                    <height>2-row</height>
+                    <height>71</height>
                     <texture>colors/white.png</texture>
                     <aspectratio>stretch</aspectratio>
-                    <colordiffuse>44FFFFFF</colordiffuse>
-                </control>
-                <control type="label">
-                    <description>name label</description>
-                    <posx>16-col</posx>
-                    <posy>2-row</posy>
-                    <width>6-col</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <align>center</align>
-                    <font>itemSubTitle</font>
-                    <textcolor>black</textcolor>
-                    <label>$LOCALIZE[31179]</label>
                 </control>
                 <control type="panel" id="9000">
-                    <posx>16-col</posx>
+                    <posx>17-col</posx>
                     <posy>4-row</posy>
-                    <width>8-col</width>
+                    <width>5-col</width>
                     <height>6-row</height>
                     <itemgap>3</itemgap>
                     <orientation>vertical</orientation>
@@ -369,7 +349,7 @@
                         <control type="image">
                             <posx>1-col</posx>
                             <posy>0</posy>
-                            <width>5-col-textbox</width>
+                            <width>5-col</width>
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
@@ -399,21 +379,28 @@
                         </control>
                     </focusedlayout>
                     <content>
-                        <item id="1">
+						<item id="5">
+	                        <description>Switch TV / Radio</description>
+	                        <label>31236</label>
+	                        <label2></label2>
+	                        <thumb></thumb>
+	                        <onclick>SendClick(34)</onclick>
+	                    </item>
+						<item id="2">
                             <description>Apply Button</description>
                             <label>14070</label>
                             <label2></label2>
                             <thumb></thumb>
                             <onclick>SendClick(5)</onclick>
                         </item>
-                        <item id="2">
+                        <item id="3">
                             <description>Ok Button</description>
                             <label>186</label>
                             <label2></label2>
                             <thumb></thumb>
                             <onclick>SendClick(4)</onclick>
                         </item>
-                        <item id="3">
+                        <item id="4">
                             <description>Cancel Button</description>
                             <label>222</label>
                             <label2></label2>
@@ -428,6 +415,9 @@
         <!--dialog control buttons-->
         <control type="group">
             <visible>false</visible>
+			<control type="togglebutton" id="34">
+                <description>Switch TV / Radio</description>
+            </control>
             <control type="button" id="4">
                 <description>OK Button</description>
             </control>
diff --git a/1080i/DialogPVRGroupManager.xml b/1080i/DialogPVRGroupManager.xml
index 12fa877..7a3adfd 100644
--- a/1080i/DialogPVRGroupManager.xml
+++ b/1080i/DialogPVRGroupManager.xml
@@ -31,25 +31,7 @@
             <control type="image">
                 <posx>4-col</posx>
                 <posy>2-row</posy>
-                <width>6-col-textbox</width>
-                <height>21-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>10-col</posx>
-                <posy>2-row</posy>
-                <width>6-col-textbox</width>
-                <height>21-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>16-col</posx>
-                <posy>2-row</posy>
-                <width>4-col</width>
+                <width>12-col</width>
                 <height>21-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
@@ -70,11 +52,11 @@
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>4-col-textbox</width>
-                <height>2-row</height>
+                <width>4-col</width>
+                <height>71</height>
                 <texture>colors/white.png</texture>
                 <aspectratio>stretch</aspectratio>
-                <colordiffuse>44FFFFFF</colordiffuse>
+                <colordiffuse>FFFFFFFF</colordiffuse>
             </control>
             <control type="label">
                 <description>name label</description>
@@ -111,17 +93,6 @@
                     </itemlayout>
                     <focusedlayout height="2-row" width="4-col">
                         <control type="image">
-                            <visible>!control.hasfocus(13)</visible>
-                            <posx>0</posx>
-                            <posy></posy>
-                            <width>4-col</width>
-                            <height>2-row</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture>colors/white.png</texture>
-                            <colordiffuse>77FFFFFF</colordiffuse>
-                        </control>
-                        <control type="image">
-                            <visible>control.hasfocus(13)</visible>
                             <posx>0</posx>
                             <posy>0</posy>
                             <width>4-col</width>
@@ -152,20 +123,18 @@
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>6-col-textbox</width>
-                    <height>2-row</height>
+                    <width>6-col</width>
+                    <height>71</height>
                     <texture>colors/white.png</texture>
                     <aspectratio>stretch</aspectratio>
-                    <colordiffuse>44FFFFFF</colordiffuse>
                 </control>
                 <control type="label" id="22">
                     <description>name label</description>
-                    <posx>0</posx>
+                    <posx>12</posx>
                     <posy>0</posy>
                     <width>6-col-gutter</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
-                    <align>center</align>
                     <font>itemSubTitle</font>
                     <textcolor>black</textcolor>
                 </control>
@@ -247,20 +216,18 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName]</label>
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>6-col-textbox</width>
-                    <height>2-row</height>
+                    <width>6-col</width>
+                    <height>71</height>
                     <texture>colors/white.png</texture>
                     <aspectratio>stretch</aspectratio>
-                    <colordiffuse>44FFFFFF</colordiffuse>
                 </control>
                 <control type="label" id="21">
                     <description>name label</description>
-                    <posx>0</posx>
+                    <posx>12</posx>
                     <posy>0</posy>
                     <width>6-col</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
-                    <align>center</align>
                     <font>itemSubTitle</font>
                     <textcolor>black</textcolor>
                 </control>
@@ -339,27 +306,15 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName]</label>
                 <posx>16-col</posx>
                 <posy>2-row</posy>
                 <width>4-col</width>
-                <height>2-row</height>
+                <height>71</height>
                 <texture>colors/white.png</texture>
                 <aspectratio>stretch</aspectratio>
-                <colordiffuse>44FFFFFF</colordiffuse>
-            </control>
-            <control type="label">
-                <posx>16-col</posx>
-                <posy>2-row</posy>
-                <width>4-col</width>
-                <height>2-row</height>
-                <aligny>center</aligny>
-                <align>center</align>
-                <font>itemSubTitle</font>
-                <textcolor>black</textcolor>
-                <label>$LOCALIZE[31179]</label>
             </control>
             <control type="panel" id="9001">
                 <posx>16-col</posx>
                 <posy>4-row</posy>
                 <width>4-col</width>
-                <height>8-row</height>
+                <height>12-row</height>
                 <itemgap>3</itemgap>
                 <orientation>vertical</orientation>
                 <onleft>12</onleft>
@@ -430,6 +385,13 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName]</label>
                     </control>
                 </focusedlayout>
                 <content>
+					<item id="5">
+                        <description>Switch TV / Radio</description>
+                        <label>31236</label>
+                        <label2></label2>
+                        <thumb></thumb>
+                        <onclick>SendClick(34)</onclick>
+                    </item>
                     <item id="1">
                         <description>Add group</description>
                         <label>31099</label>
@@ -464,6 +426,9 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName]</label>
         <!--hidden dialog controls-->
         <control type="group">
             <visible>false</visible>
+			<control type="togglebutton" id="34">
+                <description>Switch TV / Radio</description>
+            </control>
             <control type="button" id="26">
                 <description>Add Group</description>
             </control>
diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml
index 164343f..17b29e8 100644
--- a/1080i/DialogSeekBar.xml
+++ b/1080i/DialogSeekBar.xml
@@ -10,7 +10,7 @@
         </control>
         <control type="group">
             <posx>col-1-begin</posx>
-            <posy>row-20-begin</posy>
+            <posy>row-19-begin</posy>
             <control type="label">
                 <visible>!String.IsEmpty(Player.SeekNumeric)</visible>
                 <posx>0</posx>
@@ -66,15 +66,15 @@
                 <posy>80</posy>
                 <width>18-col</width>
                 <height>24</height>
-                <texturebg colordiffuse="textboxInactive">colors/offblack.png</texturebg>
-                <midtexture colordiffuse="highlight">colors/white.png</midtexture>
+                <texturebg colordiffuse="77000000" border="19">colors/black.png</texturebg>
+                <midtexture colordiffuse="highlight" border="19">colors/white.png</midtexture>
                 <info>Player.Progress</info>
             </control>
             <control type="slider" id="401">
                 <posx>0</posx>
                 <posy>80</posy>
                 <width>18-col</width>
-                <height>24</height>
+                <height>36</height>
                 <texturesliderbar colordiffuse="00FFFFFF">colors/white.png</texturesliderbar>
                 <textureslidernib>colors/white.png</textureslidernib>
                 <orientation>horizontal</orientation>
@@ -85,7 +85,7 @@
                 <posy>1-row</posy>
                 <width>18-col</width>
                 <align>center</align>
-                <font>small</font>
+                <font>itemTitle</font>
                 <textcolor>textActive</textcolor>
                 <label>$INFO[Player.title]</label>
                 <shadowcolor></shadowcolor>
@@ -95,26 +95,27 @@
                 <posx>0</posx>
                 <posy>1-row</posy>
                 <width>18-col</width>
+				<height>1-row</height>
                 <align>center</align>
-                <font>small</font>
+                <font>itemTitle</font>
                 <textcolor>textActive</textcolor>
                 <label>$INFO[VideoPlayer.TVShowTitle,, - ]$INFO[Player.title]</label>
                 <shadowcolor></shadowcolor>
             </control>
             <control type="label">
                 <posx>0</posx>
-                <posy>3-row</posy>
+                <posy>120</posy>
                 <width>8-col</width>
-                <font>smallStrong</font>
+                <font>itemTitle</font>
                 <textcolor>textActive</textcolor>
                 <label>$INFO[Player.Time]</label>
                 <shadowcolor></shadowcolor>
             </control>
             <control type="label">
                 <posx>18-col</posx>
-                <posy>3-row</posy>
+                <posy>120</posy>
                 <width>8-col</width>
-                <font>smallStrong</font>
+                <font>itemTitle</font>
                 <align>right</align>
                 <textcolor>textActive</textcolor>
                 <label>$INFO[Player.Duration]</label>
@@ -127,9 +128,10 @@
             <posx>12-col</posx>
             <posy>row-21-begin</posy>
             <control type="label">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>1-col</width>
+                <posx>-18</posx>
+                <posy>-32</posy>
+                <width>100</width>
+				<height>100</height>
                 <align>center</align>
                 <font>symbolVeryLarge</font>
                 <textcolor>textActive</textcolor>
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index 6c99730..407e80e 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -43,8 +43,8 @@
                 <posy>2-row</posy>
                 <width>20-col</width>
                 <height>21-row</height>
-                <texture>colors/offblack.png</texture>
-                <colordiffuse></colordiffuse>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <!-- ** Required ** Do not change <id>or<type>-->
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index da3e90a..9757e6a 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -26,7 +26,7 @@
     <include file="Includes_mediaShowcase.xml"/>
 
     <!--view type conditions-->
-    <expression name="isVideoList">!String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) |container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons)</expression>
+    <expression name="isVideoList">!String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons) | container.content(tvshows)</expression>
     <expression name="isMovie">container.content(movies) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)]</expression>
     <expression name="isAddonMovieOrTVshow">!String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows)]</expression>
 
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index fef8ffa..f7261b9 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -35,7 +35,7 @@
         <value condition="Window.isactive(Music)">$INFO[container.NumAllItems,, $LOCALIZE[31014]]</value>
 		<value condition="Window.isactive(Weather)">$LOCALIZE[31212] $INFO[Window.Property(WeatherProvider)]</value>
 		<value condition="Window.isactive(TVchannels) | Window.isactive(RadioChannels) | Window.isactive(TVGuide)">$INFO[Pvr.BackendChannels] $LOCALIZE[31017] ($INFO[control.getlabel(29)])</value>
-		<value condition="Window.isactive(TVRecordings)">$INFO[container.NumAllItems] $LOCALIZE[31165]</value>
+		<value condition="Window.isactive(TVRecordings)">$INFO[container.NumAllItems] $LOCALIZE[31165] ($INFO[Pvr.BackendDiskSpace])</value>
 		<value condition="Window.isactive(programs)">$INFO[container.NumAllItems,, $LOCALIZE[31145]]</value>
 		<value condition="Window.isactive(games)">$INFO[container.NumAllItems,, $LOCALIZE[31145]]</value>
 		<value condition="Window.isactive(musicplaylist) | Window.isactive(videoplaylist)">$INFO[container.NumAllItems,, $LOCALIZE[31014]]</value>
diff --git a/1080i/MyGames.xml b/1080i/MyGames.xml
index 4a26dc4..bcd3f27 100644
--- a/1080i/MyGames.xml
+++ b/1080i/MyGames.xml
@@ -40,7 +40,7 @@
         <include>DebugGrid</include>
         <control type="label">
             <include>WindowID</include>
-            <label>MyGames.xml</label>
+            <label>MyGames.xml path: $INFO[container.folderpath] folder: $INFO[container.foldername] content: $INFO[container.content]</label>
         </control>
     </controls>
 </window>
diff --git a/1080i/MyMusicPlaylistEditor.xml b/1080i/MyMusicPlaylistEditor.xml
index 81154d8..6038bd5 100644
--- a/1080i/MyMusicPlaylistEditor.xml
+++ b/1080i/MyMusicPlaylistEditor.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol allways="true">50</defaultcontrol>
+	<views>50</views>
     <controls>
         <include>globalBackground</include>
         <control type="group">
@@ -9,7 +10,7 @@
             <!--page title-->
             <control type="group">
                 <posx>col-2-begin</posx>
-                <posy>row-5-begin</posy>
+                <posy>row-4-begin</posy>
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
@@ -34,7 +35,7 @@
                     <posx>0</posx>
                     <posy>2-row</posy>
                     <width>22-col</width>
-                    <height>660</height>
+                    <height>19-row</height>
                     <texture>colors/black.png</texture>
                     <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
@@ -43,7 +44,7 @@
                     <posx>18-col</posx>
                     <posy>2-row</posy>
                     <width>4-col</width>
-                    <height>660</height>
+                    <height>19-row</height>
                     <texture>colors/black.png</texture>
                     <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
@@ -52,7 +53,15 @@
             <!--left panel-->
             <control type="group">
                 <posx>col-2-begin</posx>
-                <posy>row-7-begin</posy>
+                <posy>row-6-begin</posy>
+				<control type="image">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>9-col</width>
+                    <height>71</height>
+                    <texture>colors/white.png</texture>
+                    <aspectratio>stretch</aspectratio>
+                </control>
                 <control type="label">
                     <description>Header Label</description>
                     <posx>24</posx>
@@ -61,69 +70,57 @@
                     <width>8-col-gutter</width>
                     <label>31022</label>
                     <font>settingsCategoryTitle</font>
-                    <textcolor>highlight</textcolor>
+                    <textcolor>black</textcolor>
                     <shadowcolor></shadowcolor>
                 </control>
                 <!--left file list-->
                 <control type="list" id="50">
-                    <posx>12</posx>
+                    <posx>0</posx>
                     <posy>2-row</posy>
                     <width>9-col</width>
-                    <height>15-row</height>
+                    <height>17-row</height>
                     <onright>100</onright>
                     <itemlayout height="2-row" width="9-col">
                         <control type="label">
-                            <posx>12</posx>
-                            <width>9-col-gutter</width>
+                            <posx>24</posx>
+                            <width>8-col</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <info>ListItem.Label</info>
                             <font>itemTitle</font>
                         </control>
-                        <control type="label">
-                            <posx>12r</posx>
-                            <width>3-col</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <align>right</align>
-                            <info>ListItem.Label2</info>
-                            <font>itemTitle</font>
-                            <textcolor>highlight</textcolor>
-                        </control>
                     </itemlayout>
                     <focusedlayout height="2-row" width="9-col">
                         <control type="image">
-                            <width>9-col-gutter</width>
+                            <width>9-col</width>
                             <height>2-row</height>
                             <texture>colors/white.png</texture>
                             <animation effect="fade" start="100" end="50" condition="!Control.HasFocus(50)">Conditional</animation>
                         </control>
                         <control type="label">
-                            <posx>12</posx>
-                            <width>9-col-gutter</width>
+                            <posx>24</posx>
+                            <width>8-col</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <info>ListItem.Label</info>
                             <font>itemTitle</font>
                             <textcolor>black</textcolor>
                         </control>
-                        <control type="label">
-                            <posx>12r</posx>
-                            <width>3-col</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <align>right</align>
-                            <info>ListItem.Label2</info>
-                            <font>itemTitle</font>
-                            <textcolor>black</textcolor>
-                        </control>
                     </focusedlayout>
                 </control>
             </control>
             <!--right panel-->
             <control type="group">
                 <posx>col-11-begin</posx>
-                <posy>row-7-begin</posy>
+                <posy>row-6-begin</posy>
+				<control type="image">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>13-col</width>
+                    <height>71</height>
+                    <texture>colors/white.png</texture>
+                    <aspectratio>stretch</aspectratio>
+                </control>
                 <control type="label">
                     <description>Header Label</description>
                     <posx>12</posx>
@@ -132,61 +129,41 @@
                     <height>2-row</height>
                     <label>31029</label>
                     <font>settingsCategoryTitle</font>
-                    <textcolor>highlight</textcolor>
+                    <textcolor>black</textcolor>
                 </control>
                 <control type="list" id="100">
                     <posx>0</posx>
                     <posy>2-row</posy>
-                    <width>636</width>
+                    <width>9-col</width>
                     <height>15-row</height>
                     <onleft>50</onleft>
                     <onright>9000</onright>
                     <itemlayout height="2-row" width="636">
                         <control type="label">
-                            <posx>12</posx>
-                            <width>636</width>
+                            <posx>24</posx>
+                            <width>8-col</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <info>ListItem.Label</info>
                             <font>itemTitle</font>
                         </control>
-                        <control type="label">
-                            <posx>12r</posx>
-                            <width>3-col</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <align>right</align>
-                            <info>ListItem.Label2</info>
-                            <font>itemTitle</font>
-                            <textcolor>highlight</textcolor>
-                        </control>
                     </itemlayout>
                     <focusedlayout height="2-row" width="636">
                         <control type="image">
-                            <width>636</width>
+                            <width>9-col</width>
                             <height>2-row</height>
                             <texture>colors/white.png</texture>
                             <animation effect="fade" start="100" end="50" condition="!Control.HasFocus(100)">Conditional</animation>
                         </control>
                         <control type="label">
-                            <posx>12</posx>
-                            <width>636</width>
+                            <posx>24</posx>
+                            <width>8-col</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <info>ListItem.Label</info>
                             <font>itemTitle</font>
                             <textcolor>black</textcolor>
                         </control>
-                        <control type="label">
-                            <posx>12r</posx>
-                            <width>3-col</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <align>right</align>
-                            <info>ListItem.Label2</info>
-                            <font>itemTitle</font>
-                            <textcolor>black</textcolor>
-                        </control>
                     </focusedlayout>
                 </control>
                 <!--dialog controls-->
@@ -195,7 +172,7 @@
                     <posy>0</posy>
                     <control type="panel" id="9000">
                         <posx>0</posx>
-                        <posy>0</posy>
+                        <posy>2-row</posy>
                         <width>4-col</width>
                         <height>6-row</height>
                         <orientation>vertical</orientation>
@@ -237,7 +214,7 @@
                             <control type="image">
                                 <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>3-col-textbox</width>
+                                <width>3-col</width>
                                 <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 6faee1d..1a6915e 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -26,7 +26,7 @@
                     <posx>0</posx>
                     <posy>0</posy>
                     <width>24-col</width>
-                    <height>21-row</height>
+                    <height>23-row</height>
                     <onleft>9000</onleft>
                     <onright>60</onright>
                     <onback>9000</onback>
@@ -145,22 +145,6 @@
                         </control>
                     </focusedlayout>
                 </control>
-                <!--Additional info-->
-                <control type="group">
-                    <posx>0</posx>
-                    <posy>22-row</posy>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>12-col</width>
-						<height>2-row</height>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <selectedcolor>textActive</selectedcolor>
-                        <shadowcolor></shadowcolor>
-                        <label>$INFO[Pvr.BackendDiskSpace]</label>
-                    </control>
-                </control>
             </control>
             <!--page scrollbar-->
             <control type="group" id="9400">
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index ed1d586..0a61873 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -3,6 +3,7 @@
     <defaultcontrol always="true">9999</defaultcontrol>
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
     <include>fadeInOut</include>
+	<views>50</views>
     <controls>
         <!--page container group-->
         <control type="group">
@@ -14,108 +15,106 @@
                 <!--source content-->
                 <control type="group">
                     <include>contentOpen</include>
-                    <control type="panel" id="50">
-                        <posx>78</posx>
-                        <posy>row-5-begin</posy>
-                        <width>1800</width>
-                        <height>24-row</height>
-                        <onleft>9000</onleft>
-                        <onright>60</onright>
-                        <ondown>50</ondown>
-                        <onup>50</onup>
-                        <onback>9000</onback>
-                        <pagecontrol>60</pagecontrol>
-                        <scrolltime tween="cubic" easing="out">600</scrolltime>
-                        <itemlayout width="4-col" height="348">
-                            <control type="image">
-                                <posx>0</posx>
-                                <posy>0</posy>
-                                <width>4-col-gutter</width>
-                                <height>4-col-gutter</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture border="6">colors/black.png</texture>
-                                <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
-                                <bordersize>6</bordersize>
-								<colordiffuse>overlay</colordiffuse>
-                            </control>
-							<control type="image">
-                                <posx>0</posx>
-                                <posy>0</posy>
-                                <width>4-col-gutter</width>
-                                <height>4-col-gutter</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture>$INFO[Listitem.thumb]</texture>
-                                <bordersize>6</bordersize>
-		                        <colordiffuse>ffffffff</colordiffuse>
-                            </control>
-                            <control type="label">
-                                <posx>12</posx>
-                                <posy>262</posy>
-                                <width>240</width>
-                                <height>1-row</height>
-                                <aligny>center</aligny>
-                                <font>thumbTitle</font>
-                                <textcolor>textActive</textcolor>
-                                <label>[B]$INFO[ListItem.label][/B]</label>
-                            </control>
-                            <control type="label">
-                                <posx>12</posx>
-                                <posy>286</posy>
-                                <width>240</width>
-                                <height>1-row</height>
-                                <aligny>center</aligny>
-                                <font>thumbTitle</font>
-                                <textcolor>textDisabled</textcolor>
-                                <label>$INFO[ListItem.AddonSummary]</label>
-                            </control>
-                        </itemlayout>
-                        <focusedlayout width="4-col" height="348">
-                            <control type="group">
-                                <include>focusThumb</include>
-                                <control type="image">
-                                    <posx>0</posx>
-                                    <posy>0</posy>
-                                    <width>4-col-gutter</width>
-                                    <height>4-col-gutter</height>
-                                    <aspectratio>stretch</aspectratio>
-                                    <texture border="6">colors/black.png</texture>
-		                            <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-		                            <bordersize>6</bordersize>
-		                            <colordiffuse>FF000000</colordiffuse>
-                                </control>
-                                <control type="image">
-                                    <posx>0</posx>
-                                    <posy>0</posy>
-                                    <width>4-col-gutter</width>
-                                    <height>4-col-gutter</height>
-                                    <aspectratio>stretch</aspectratio>
-                                    <texture>$INFO[Listitem.thumb]</texture>
-                                    <bordersize>6</bordersize>
-		                            <colordiffuse>ffffffff</colordiffuse>
-                                </control>
-                                <control type="label">
-                                    <posx>12</posx>
-                                    <posy>262</posy>
-                                    <width>240</width>
-                                    <height>1-row</height>
-                                    <aligny>center</aligny>
-                                    <font>thumbTitle</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label>[B]$INFO[ListItem.label][/B]</label>
-                                </control>
-                                <control type="label">
-                                    <posx>12</posx>
-                                    <posy>286</posy>
-                                    <width>240</width>
-                                    <height>1-row</height>
-                                    <aligny>center</aligny>
-                                    <font>thumbTitle</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label>$INFO[ListItem.AddonSummary]</label>
-                                </control>
-                            </control>
-                        </focusedlayout>
-                    </control>
+					<control type="panel" id="50">
+			            <visible>$EXP[isVideoList]</visible>
+			            <posx>col-1-begin</posx>
+			            <posy>row-5-begin</posy>
+			            <width>24-col</width>
+			            <height>23-row</height>
+			            <onleft>9000</onleft>
+			            <onright>60</onright>
+			            <ondown>50</ondown>
+			            <onup>50</onup>
+			            <pagecontrol>60</pagecontrol>
+			            <itemlayout width="24-col" height="2-row">
+			                <control type="image">
+			                    <posx>0</posx>
+			                    <posy>3</posy>
+			                    <width>66</width>
+			                    <height>66</height>
+			                    <aspectratio scalediffuse="false">stretch</aspectratio>
+			                    <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+			                </control>
+			                <control type="image">
+			                    <posx>1-col</posx>
+			                    <posy>0</posy>
+			                    <width>23-col</width>
+			                    <height>69</height>
+			                    <aspectratio>stretch</aspectratio>
+			                    <texture border="0">colors/black.png</texture>
+			                    <colordiffuse>textboxInactive</colordiffuse>
+			                </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>textActive</textcolor>
+			                    <shadowcolor></shadowcolor>
+			                    <label>$INFO[ListItem.Label]</label>
+			                </control>
+			                <control type="label">
+			                    <posx>12-col-gutter</posx>
+			                    <posy>0</posy>
+			                    <width>12-col</width>
+			                    <height>2-row</height>
+			                    <aligny>center</aligny>
+			                    <align>right</align>
+			                    <font>itemSubtitle</font>
+			                    <textcolor>textActive</textcolor>
+			                    <shadowcolor></shadowcolor>
+			                    <label>$INFO[ListItem.AddonSummary]</label>
+			                </control>
+			            </itemlayout>
+			            <focusedlayout width="24-col" height="2-row">
+			                <control type="image">
+			                    <posx>0</posx>
+			                    <posy>3</posy>
+			                    <width>66</width>
+			                    <height>66</height>
+			                    <aspectratio scalediffuse="false">stretch</aspectratio>
+			                    <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+			                    <animation type="focus" loop="false" reversible="false">
+			                        <effect type="fade" time="500"/>
+			                        <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+			                    </animation>
+			                </control>
+			                <control type="image">
+			                    <posx>1-col</posx>
+			                    <posy>0</posy>
+			                    <width>23-col</width>
+			                    <height>2-row</height>
+			                    <aspectratio>stretch</aspectratio>
+			                    <texture border="0">colors/white.png</texture>
+			                    <colordiffuse>highlight</colordiffuse>
+			                </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>textActive</textcolor>
+			                    <shadowcolor></shadowcolor>
+			                    <label>$INFO[ListItem.Label]</label>
+			                </control>
+			                <control type="label">
+			                    <posx>12-col-gutter</posx>
+			                    <posy>0</posy>
+			                    <width>12-col</width>
+			                    <height>2-row</height>
+			                    <aligny>center</aligny>
+			                    <align>right</align>
+			                    <font>itemSubtitle</font>
+			                    <textcolor>textActive</textcolor>
+			                    <shadowcolor></shadowcolor>
+			                    <label>$INFO[ListItem.AddonSummary]</label>
+			                </control>
+			            </focusedlayout>
+			        </control>
                 </control>
             </control>
             <!--page scrollbar-->
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 5173564..3d2c841 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -5,9 +5,9 @@
     <controls>
 		<control type="group">
 			<posx>col-1-begin</posx>
-            <posy>row-21-begin</posy>
+            <posy>row-22-begin</posy>
 			<!--fade out if audio / video menu active-->
-            <animation type="Conditional" condition="Window.IsActive(seekbar) | Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels)">
+            <animation type="Conditional" condition="Window.IsActive(seekbar) | Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels) | window.isactive(subtitlesearch)">
                 <effect type="fade" start="100" end="0" time="350"/>
                 <effect type="slide" start="0" end="0,300" tween="cubic" easing="out" time="400"/>
             </animation>
@@ -19,42 +19,45 @@
                 <effect type="fade" start="100" end="0" time="350"/>
                 <effect type="slide" start="0" end="0,300" tween="cubic" easing="out" time="400"/>
             </animation>
+			<animation type="conditional" condition="true">
+				<effect type="fade" end="90" time="0"/>
+			</animation>
+			<control type="image">
+                <posx>-96</posx>
+                <posy>2-row</posy>
+                <width>fullscreenWidth</width>
+                <height>45</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse></colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
 			<control type="image">
                 <posx>-96</posx>
                 <posy>0</posy>
                 <width>fullscreenWidth</width>
                 <height>2-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>aa111111</colordiffuse>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
 			<control type="image">
                 <posx>-96</posx>
-                <posy>2-row</posy>
+                <posy>118</posy>
 				<width>fullscreenWidth</width>
-                <height>143</height>
+                <height>6-row</height>
                 <texture>colors/black.png</texture>
-                <colordiffuse>aa111111</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-			<control type="image">
-                <posx>-96</posx>
-                <posy>6-row</posy>
-                <width>fullscreenWidth</width>
-                <height>2-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>cc111111</colordiffuse>
+                <colordiffuse>dd000000</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
 			<control type="label">
                 <posx>0</posx>
                 <posy>0</posy>
                 <align>left</align>
-				<width>19-col</width>
+				<width>16-col</width>
                 <height>2-row</height>
                 <font>dialogTitle</font>
                 <textcolor>textActive</textcolor>
-                <label>[COLOR highlight]$INFO[videoplayer.TVShowTitle,, ]$INFO[VideoPlayer.ChannelName,, ][/COLOR]$INFO[videoplayer.title]</label>
+                <label>[B]$INFO[videoplayer.TVShowTitle,,   ]$INFO[VideoPlayer.ChannelName,,   ][/B]$INFO[videoplayer.title]</label>
             </control>
 			<control type="label">
                 <posx>24-col</posx>
@@ -63,14 +66,13 @@
                 <height>2-row</height>
                 <font>itemTitle</font>
 				<align>right</align>
-                <aligny>center</aligny>
                 <textcolor>textActive</textcolor>
-                <label>$INFO[Videoplayer.time] / $INFO[Videoplayer.duration]</label>
+                <label>$INFO[Player.TimeRemaining(mm),, $LOCALIZE[31235]] / $INFO[Videoplayer.time] / $INFO[Videoplayer.duration]</label>
                 <scroll>false</scroll>
             </control>          
 			<control type="textbox">
                 <posx>0</posx>
-                <posy>2-row</posy>
+                <posy>132</posy>
                 <font>textbox</font>
                 <width>1706</width>
                 <align>left</align>
@@ -82,8 +84,8 @@
             </control>
 			<!--dialog controls-->
 			<control type="grouplist" id="8001">
-				<posx>0</posx>
-                <posy>6-row</posy>
+				<posx>-24</posx>
+                <posy>2-row</posy>
 				<orientation>horizontal</orientation>
 				<itemgap>12</itemgap>
 				<onleft>8001</onleft>
@@ -92,8 +94,10 @@
                     <description>DVD Menu</description>
 					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
 		            <focusedcolor>textActive</focusedcolor>
+					<textcolor>black</textcolor>
 					<font>itemSubtitle</font>
 		            <width>auto</width>
+					<height>1-row</height>
                     <label>31051</label>
                     <onclick>PlayerControl(ShowVideoMenu)</onclick>
 		        </control>
@@ -102,8 +106,10 @@
                     <description>Record</description>
 					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
 		            <focusedcolor>textActive</focusedcolor>
+					<textcolor>black</textcolor>
 					<font>itemSubtitle</font>
 		            <width>auto</width>
+					<height>45</height>
                     <label>31201</label>
                     <onclick>PVR.ToggleRecordPlayingChannel</onclick>
 		        </control>
@@ -111,7 +117,9 @@
 					<description>Download subtitles</description>		            
 					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
 		            <focusedcolor>textActive</focusedcolor>
+					<textcolor>black</textcolor>
 		            <width>auto</width>
+					<height>45</height>
 					<font>itemSubtitle</font>
 					<label>31154</label>
 					<onclick>ActivateWindow(SubtitleSearch)</onclick>
@@ -121,8 +129,10 @@
 					<visible>VideoPlayer.HasSubtitles + !VideoPlayer.SubtitlesEnabled</visible>		            
 					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
 		            <focusedcolor>textActive</focusedcolor>
+					<textcolor>black</textcolor>
 					<font>itemSubtitle</font>
 		            <width>auto</width>
+					<height>45</height>
 					<label>24012</label>
 					<onclick>ShowSubtitles</onclick>
 		        </control>
@@ -131,8 +141,10 @@
                     <visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
 					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
 		            <focusedcolor>textActive</focusedcolor>
+					<textcolor>black</textcolor>
 					<font>itemSubtitle</font>
 		            <width>auto</width>
+					<height>45</height>
                     <label>31161</label>
 					<onclick>ShowSubtitles</onclick>
 		        </control>
@@ -141,8 +153,10 @@
                     <visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
 					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
 		            <focusedcolor>textActive</focusedcolor>
+					<textcolor>black</textcolor>
 					<font>itemSubtitle</font>
 		            <width>auto</width>
+					<height>45</height>
                     <label>31202</label>
                     <onclick>SubtitleDelay</onclick>
 		        </control>
@@ -150,8 +164,10 @@
                     <description>Video Settings</description>
 					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
 		            <focusedcolor>textActive</focusedcolor>
+					<textcolor>black</textcolor>
 					<font>itemSubtitle</font>
 		            <width>auto</width>
+					<height>45</height>
                     <label>31191</label>
                     <onclick>ActivateWindow(osdvideosettings)</onclick>
 		        </control>
@@ -159,8 +175,10 @@
                     <description>Audio Settings</description>
 					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
 		            <focusedcolor>textActive</focusedcolor>
+					<textcolor>black</textcolor>
 					<font>itemSubtitle</font>
 		            <width>auto</width>
+					<height>45</height>
                     <label>31177</label>
                     <onclick>ActivateWindow(osdaudiosettings)</onclick>
 		        </control>
@@ -168,8 +186,10 @@
                     <description>Bookmarks</description>
 					<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
 		            <focusedcolor>textActive</focusedcolor>
+					<textcolor>black</textcolor>
 					<font>itemSubtitle</font>
 		            <width>auto</width>
+					<height>45</height>
                     <label>298</label>
                     <onclick>ActivateWindow(videobookmarks)</onclick>
 		        </control>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 84e8899..9e54df9 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -104,7 +104,7 @@
                     <control type="label">
                         <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
-                        <posy>9-row</posy>
+                        <posy>330</posy>
                         <width>312</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
@@ -140,7 +140,7 @@
                         <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx>12</posx>
-	                        <posy>9-row</posy>
+	                        <posy>330</posy>
 	                        <width>312</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
@@ -218,7 +218,7 @@
                     <control type="label">
                         <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
-                        <posy>7-row</posy>
+                        <posy>258</posy>
                         <width>240</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
@@ -264,7 +264,7 @@
                         <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx>12</posx>
-	                        <posy>7-row</posy>
+	                        <posy>258</posy>
 	                        <width>240</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index b0fc360..62804aa 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -102,7 +102,7 @@
 						<control type="label">
 							<visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
-							<posy>262</posy>
+							<posy>268</posy>
 							<width>240</width>
 							<height>1-row</height>
 							<aligny>center</aligny>
@@ -113,7 +113,7 @@
 						<control type="label">
 							<visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
-							<posy>286</posy>
+							<posy>292</posy>
 							<width>240</width>
 							<height>1-row</height>
 							<aligny>center</aligny>
@@ -158,7 +158,7 @@
 							</control>
 							<control type="label">
 								<posx>12</posx>
-								<posy>262</posy>
+								<posy>268</posy>
 								<width>240</width>
 								<height>1-row</height>
 								<aligny>center</aligny>
@@ -168,7 +168,7 @@
 							</control>
 							<control type="label">
 								<posx>12</posx>
-								<posy>286</posy>
+								<posy>292</posy>
 								<width>240</width>
 								<height>1-row</height>
 								<aligny>center</aligny>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 9a2f0a1..3cafa09 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -99,7 +99,7 @@
 	                    <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx>12</posx>
-	                        <posy>312</posy>
+	                        <posy>318</posy>
 	                        <width>584</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
@@ -146,7 +146,7 @@
 	                        <control type="label">
 		                        <visible>!controlgroup(9000).hasfocus</visible>
 		                        <posx>12</posx>
-		                        <posy>312</posy>
+		                        <posy>318</posy>
 		                        <width>584</width>
 		                        <height>2-row</height>
 		                        <aligny>center</aligny>
@@ -234,7 +234,7 @@
 						<control type="label">
 							<visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
-							<posy>338</posy>
+							<posy>344</posy>
 							<width>204</width>
 							<height>1-row</height>
 							<aligny>center</aligny>
@@ -245,7 +245,7 @@
 						<control type="label">
 							<visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
-							<posy>362</posy>
+							<posy>368</posy>
 							<width>204</width>
 							<height>1-row</height>
 							<aligny>center</aligny>
@@ -314,7 +314,7 @@
 							</control>
 							<control type="label">
 								<posx>12</posx>
-								<posy>338</posy>
+								<posy>344</posy>
 								<width>204</width>
 								<height>1-row</height>
 								<aligny>center</aligny>
@@ -324,7 +324,7 @@
 							</control>
 							<control type="label">
 								<posx>12</posx>
-								<posy>362</posy>
+								<posy>368</posy>
 								<width>204</width>
 								<height>1-row</height>
 								<aligny>center</aligny>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 1b2a83b..8ff3558 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -23,18 +23,28 @@
                 <control type="group">
                     <visible>!String.Contains(Container.folderpath,plugin)</visible>
                     <posx>col-1-begin</posx>
-                    <posy>row-7-begin</posy>
+                    <posy>row-5-begin</posy>
 					<control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>10-col</width>
-                        <height>4-row</height>
+                        <width>12-col</width>
+                        <height>2-row</height>
                         <font>largeTitle</font>
                         <textcolor>textActive</textcolor>
 						<aligny>center</aligny>
                         <shadowcolor></shadowcolor>
-                        <wrapmultiline>true</wrapmultiline>
                         <label>$INFO[container.showtitle]</label>
+                    </control>
+					<control type="textbox">
+                        <posx>0</posx>
+                        <posy>3-row</posy>
+                        <width>14-col</width>
+                        <height>192</height>
+                        <font>textbox</font>
+                        <textcolor>textActive</textcolor>
+						<aligny>center</aligny>
+                        <shadowcolor></shadowcolor>
+                        <label>$INFO[container.showplot]</label>
                     </control>
                 </control>
                 <!--overlay-->
@@ -100,7 +110,7 @@
                         <control type="label">
                             <visible>!controlgroup(9000).hasfocus + !ListItem.IsParentFolder</visible>
                             <posx>12</posx>
-                            <posy>384</posy>
+                            <posy>390</posy>
                             <width>240</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
@@ -171,7 +181,7 @@
                             <control type="label">
 	                            <visible>!controlgroup(9000).hasfocus + !ListItem.IsParentFolder</visible>
 	                            <posx>12</posx>
-	                            <posy>384</posy>
+	                            <posy>390</posy>
 	                            <width>240</width>
 	                            <height>2-row</height>
 	                            <aligny>center</aligny>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index c815bb1..d1673ab 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -99,7 +99,7 @@
 	                    <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx>12</posx>
-	                        <posy>312</posy>
+	                        <posy>318</posy>
 	                        <width>584</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
@@ -146,7 +146,7 @@
 	                        <control type="label">
 		                        <visible>!controlgroup(9000).hasfocus</visible>
 		                        <posx>12</posx>
-		                        <posy>312</posy>
+		                        <posy>318</posy>
 		                        <width>584</width>
 		                        <height>2-row</height>
 		                        <aligny>center</aligny>
@@ -236,7 +236,7 @@
 					<control type="label">
 						<visible>!controlgroup(9000).hasfocus</visible>
 						<posx>12</posx>
-						<posy>338</posy>
+						<posy>344</posy>
 						<width>204</width>
 						<height>1-row</height>
 						<aligny>center</aligny>
@@ -247,7 +247,7 @@
 					<control type="label">
 						<visible>!System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
 						<posx>12</posx>
-						<posy>362</posy>
+						<posy>368</posy>
 						<width>204</width>
 						<height>1-row</height>
 						<aligny>center</aligny>
@@ -258,7 +258,7 @@
 					<control type="label">
 						<visible>System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
 						<posx>12</posx>
-						<posy>362</posy>
+						<posy>368</posy>
 						<width>204</width>
 						<height>1-row</height>
 						<aligny>center</aligny>
@@ -327,7 +327,7 @@
 						</control>
 						<control type="label">
 							<posx>12</posx>
-							<posy>338</posy>
+							<posy>344</posy>
 							<width>204</width>
 							<height>1-row</height>
 							<aligny>center</aligny>
@@ -338,7 +338,7 @@
 						<control type="label">
 							<visible>!System.Setting(hidewatched)</visible>
 							<posx>12</posx>
-							<posy>362</posy>
+							<posy>368</posy>
 							<width>204</width>
 							<height>1-row</height>
 							<aligny>center</aligny>
@@ -349,7 +349,7 @@
 						<control type="label">
 							<visible>System.Setting(hidewatched)</visible>
 							<posx>12</posx>
-							<posy>362</posy>
+							<posy>368</posy>
 							<width>204</width>
 							<height>1-row</height>
 							<aligny>center</aligny>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 744feda..006d22f 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -49,7 +49,7 @@
 					<effect type="slide" start="0,500" end="0,0" tween="sine" time="400"/>
 				</animation>
 				<animation type="conditional" condition="true">
-					<effect type="fade" end="60" time="0"/>
+					<effect type="fade" end="90" time="0"/>
 				</animation>
 				<!--coverart (or channel art if radio)-->
 				<control type="image">
diff --git a/changelog.txt b/changelog.txt
index 76eb3d9..f229cdb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -21,13 +21,18 @@
 - [COMPLETE] PVR.time/duration/progress checked
 - [COMPLETE] Games settings
 - [COMPLETE] New shortcuts menu for games
+- [COMPLETE] DialogAddonSettings updated
+- [COMPLETE] DialogPVRGroupManager.xml updated
+- [COMPLETE] DialogPVRChannelManager.xml updated
+- [COMPLETE] MyMusicPlaylistEditor.xml updated
 
-[complete up to DialogPVRGroupManager.xml section]
-
+- return heebo font and add font include for Israel
 - check controls for new window: MyGames.xml
 
 - musicvideos
 
+- Subtitles update
+
 - Screenshots etc need updating
 
 - global search needs updating
diff --git a/extras/homeBackgrounds/ian-dooley-407846.jpg b/extras/homeBackgrounds/ian-dooley-407846.jpg
deleted file mode 100644
index 14a3299..0000000
Binary files a/extras/homeBackgrounds/ian-dooley-407846.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/lily-lvnatikk-267356.jpg b/extras/homeBackgrounds/lily-lvnatikk-267356.jpg
deleted file mode 100644
index 8df6575..0000000
Binary files a/extras/homeBackgrounds/lily-lvnatikk-267356.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/photo-1515260268569-9271009adfdb.jpeg b/extras/homeBackgrounds/photo-1515260268569-9271009adfdb.jpeg
deleted file mode 100644
index dd9855b..0000000
Binary files a/extras/homeBackgrounds/photo-1515260268569-9271009adfdb.jpeg and /dev/null differ
diff --git a/language/English/strings.po b/language/English/strings.po
index 0aab29a..8c570f4 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -964,3 +964,11 @@ msgstr ""
 msgctxt "#31234"
 msgid "Game Addons"
 msgstr ""
+
+msgctxt "#31235"
+msgid "mins remaining"
+msgstr ""
+
+msgctxt "#31236"
+msgid "Radio / TV"
+msgstr ""
diff --git a/shortcuts/mainmenu.DATA.xml b/shortcuts/mainmenu.DATA.xml
index 5e19f9a..086a5a7 100644
--- a/shortcuts/mainmenu.DATA.xml
+++ b/shortcuts/mainmenu.DATA.xml
@@ -88,6 +88,13 @@
         <action>PlayerControl(Partymode(music))</action>
     </shortcut>
     <shortcut>
+        <label>31232</label>
+        <label2>32034</label2>
+        <icon>DefaultAddon.png</icon>
+        <thumb />
+        <action>ActivateWindow(games)</action>
+    </shortcut>
+	<shortcut>
         <label>12600</label>
         <label2>32034</label2>
         <icon>DefaultAddon.png</icon>