diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index acf5395..f09a21b 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -28,9 +28,9 @@
                 <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>108r</posx>
-                    <posy>276</posy>
-                    <height>672</height>
+                    <posx>98r</posx>
+                    <posy>row-5-begin</posy>
+                    <height>22-row</height>
                     <onleft>9999</onleft>
                 </control>
             </control>
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 4bf569f..10dd03b 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -9,242 +9,175 @@
         <include>globalBackground</include>
         <!--page container group-->
         <control type="group">
+
             <!--window fader-->
             <animation type="conditional" condition="window.next(0) | window.next(1)">
                 <effect type="fade" start="100" end="0" time="300"/>
             </animation>
+
             <!--shift page for certain modal dialogs-->
             <include>modalDialogContentShift</include>
-            <!--content provider-->
-            <control type="group">
-                <posx>0</posx>
-                <posy>0</posy>
-                <!--main menu-->
-                <control type="group" id="8000">
+
+            <!--Main content listing-->
+            <control type="group" id="9999">
+                <control type="epggrid" id="10">
+                    <description>EPG Grid</description>
                     <posx>col-1-begin</posx>
-                    <posy>row-2-begin</posy>
-                    <include>dateTime</include>
-                    <include>hubMenu</include>
-                </control>
-                <!--Folder titles-->
-                <control type="group">
-                    <posx>col-4-begin</posx>
-                    <posy>row-2-begin</posy>
-                    <!--source title-->
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>14-col</width>
-                        <font>pageTitle</font>
-                        <label>$LOCALIZE[31006] [COLOR textAccented]$LOCALIZE[31080][/COLOR]</label>
-                        <textcolor>textActive</textcolor>
-                    </control>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>45</posy>
-                        <width>14-col</width>
-                        <font>regular</font>
-                        <label>$INFO[Pvr.BackendChannels] $LOCALIZE[31017]</label>
-                        <textcolor>textActive</textcolor>
-                    </control>
-                </control>
-                <!--Main content listing-->
-                <control type="group" id="9999">
-                    <posx>col-1-begin</posx>
-                    <posy>270</posy>
-                    <!--animations-->
-                    <animation type="windowopen">
-                        <include>listSlideIn</include>
-                    </animation>
-                    <control type="epggrid" id="10">
-                        <description>EPG Grid</description>
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1758</width>
-                        <height>600</height>
-                        <pagecontrol>10</pagecontrol>
-                        <timeblocks>30</timeblocks>
-                        <!--<progresstexture border="0,33,18,14">UIControls/PVR-EpgProgressIndicator.png</progresstexture>-->
-                        <rulerunit>6</rulerunit>
-                        <onback>8000</onback>
-                        <rulerlayout height="60" width="139">
-                            <control type="label" id="2">
-                                <visible>SubString(ListItem.Label,:)</visible>
-                                <posx>0</posx>
-                                <posy>20</posy>
-                                <width>60</width>
-                                <height>30</height>
-                                <font>itemSubTitle</font>
-                                <textcolor>textActive</textcolor>
-                                <selectedcolor>selected</selectedcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.Label]</label>
-                            </control>
-                        </rulerlayout>
-                        <channellayout height="60" width="288">
-                            <control type="image">
-                                <width>284</width>
-                                <height>57</height>
-                                <texture border="24,0,-24,0">UIControls/listitemNF.png</texture>
-                                <colordiffuse>99FFFFFF</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.thumb]</texture>
-                            </control>
-                            <control type="label">
-                                <posx>60</posx>
-                                <width>3-col</width>
-                                <height>57</height>
-                                <font>itemSubTitleCondensed</font>
-                                <textoffsetx>12</textoffsetx>
-                                <textcolor>textActive</textcolor>
-                                <selectedcolor>selected</selectedcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.ChannelName]</label>
-                            </control>
-                        </channellayout>
-                        <focusedchannellayout height="60" width="360">
-                            <control type="image">
-                                <width>284</width>
-                                <height>57</height>
-                                <texture border="24,0,-24,0">UIControls/listitemFO.png</texture>
-                            </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.thumb]</texture>
-                            </control>
-                            <control type="label" id="1">
-                                <posx>60</posx>
-                                <width>3-col</width>
-                                <height>57</height>
-                                <font>itemSubTitleCondensed</font>
-                                <textcolor>black</textcolor>
-                                <textoffsetx>15</textoffsetx>
-                                <selectedcolor>black</selectedcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.ChannelName]</label>
-                            </control>
-                        </focusedchannellayout>
-                        <itemlayout height="60" width="139">
-                            <control type="image" id="2">
-                                <visible>!ListItem.HasTimer</visible>
-                                <width>139</width>
-                                <height>57</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture border="2">colors/black.png</texture>
-                                <colordiffuse>ffFFFFFF</colordiffuse>
-                                <bordersize>0,0,2,0</bordersize>
-                                <bordertexture border="2">colors/white.png</bordertexture>
-                            </control>
-                            <control type="image" id="2">
-                                <visible>ListItem.HasTimer</visible>
-                                <width>139</width>
-                                <height>57</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture border="2">colors/white.png</texture>
-                                <colordiffuse>99FFFFFF</colordiffuse>
-                                <animation effect="fade" start="75" end="100" time="1500" tween="sine" easing="in" pulse="true" condition="true">Conditional</animation>
-                                <bordersize>0,0,2,0</bordersize>
-                                <bordertexture border="2">colors/white.png</bordertexture>
-                            </control>
-                            <control type="label" id="1">
-                                <width>120</width>
-                                <height>57</height>
-                                <font>itemSubTitleCondensed</font>
-                                <textoffsetx>15</textoffsetx>
-                                <textcolor>textActive</textcolor>
-                                <selectedcolor>selected</selectedcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.Label]</label>
-                            </control>
-                        </itemlayout>
-                        <focusedlayout height="60" width="139">
-                            <control type="image" id="14">
-                                <width>139</width>
-                                <height>57</height>
-                                <texture border="2">colors/white.png</texture>
-                                <bordersize>0,0,2,0</bordersize>
-                                <bordertexture border="2">colors/white.png</bordertexture>
-                            </control>
-                            <control type="label" id="1">
-                                <width>120</width>
-                                <height>57</height>
-                                <font>itemSubTitleCondensed</font>
-                                <textoffsetx>15</textoffsetx>
-                                <textcolor>black</textcolor>
-                                <selectedcolor>black</selectedcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.Label]</label>
-                            </control>
-                        </focusedlayout>
-                    </control>
-                    <!--focussed item-->
-                    <control type="group">
-                        <posx>0</posx>
-                        <posy>580</posy>
-                        <control type="label">
+                    <posy>row-4-begin</posy>
+                    <width>1758</width>
+                    <height>23-row</height>
+                    <pagecontrol>10</pagecontrol>
+                    <timeblocks>30</timeblocks>
+                    <!--<progresstexture border="0,33,18,14">UIControls/PVR-EpgProgressIndicator.png</progresstexture>-->
+                    <rulerunit>6</rulerunit>
+                    <onback>8000</onback>
+                    <rulerlayout height="60" width="139">
+                        <control type="label" id="2">
+                            <visible>SubString(ListItem.Label,:)</visible>
+                            <posx>0</posx>
+                            <posy>20</posy>
+                            <width>60</width>
+                            <height>30</height>
+                            <font>itemSubTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <selectedcolor>selected</selectedcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Label]</label>
+                        </control>
+                    </rulerlayout>
+                    <channellayout height="2-row" width="288">
+                        <control type="image">
+                            <width>284</width>
+                            <height>2-row</height>
+                            <texture>colors/black.png</texture>
+                            <colordiffuse>textboxInactive</colordiffuse>
+                        </control>
+                        <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>12-col-gutter</width>
-                            <font>itemTitle</font>
+                            <width>2-row</width>
+                            <height>2-row</height>
+                            <aspectratio scalediffuse="false">scale</aspectratio>
+                            <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
+                        </control>
+                        <control type="label">
+                            <posx>1-col-indent</posx>
+                            <width>3-col</width>
+                            <height>2-row</height>
+                            <font>itemSubTitle</font>
                             <textcolor>textActive</textcolor>
                             <selectedcolor>selected</selectedcolor>
                             <shadowcolor>-</shadowcolor>
-                            <label>$INFO[ListItem.starttime,, - ]$INFO[ListItem.endtime,,: ]$INFO[ListItem.Label]</label>
+                            <label>$INFO[ListItem.ChannelName]</label>
                         </control>
-                        <control type="textbox">
+                    </channellayout>
+                    <focusedchannellayout height="2-row" width="360">
+                        <control type="image">
+                            <posx>1-col</posx>
+                            <width>284</width>
+                            <height>2-row</height>
+                            <texture>colors/white.png</texture>
+                            <colordiffuse>500</colordiffuse>
+                        </control>
+                        <control type="image">
                             <posx>0</posx>
-                            <posy>50</posy>
-                            <width>21-col-gutter</width>
-                            <height>80</height>
-                            <font>textboxExtraLeading</font>
+                            <posy>0</posy>
+                            <width>2-row</width>
+                            <height>2-row</height>
+                            <aspectratio scalediffuse="false">scale</aspectratio>
+                            <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
+                            <include>spinFocusIcon</include>
+                        </control>
+                        <control type="label">
+                            <posx>1-col-indent</posx>
+                            <width>3-col</width>
+                            <height>2-row</height>
+                            <font>itemSubTitle</font>
                             <textcolor>textActive</textcolor>
                             <selectedcolor>selected</selectedcolor>
                             <shadowcolor>-</shadowcolor>
-                            <label>[B]$INFO[ListItem.plot][/B]</label>
+                            <label>$INFO[ListItem.ChannelName]</label>
                         </control>
-                    </control>
-                </control>
-                <!--page scrollbar-->
-                <control type="group" id="9400">
-                    <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
-                    <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
-                    <control type="scrollbar" id="60">
-                        <posx>108r</posx>
-                        <posy>276</posy>
-                        <height>672</height>
-                        <onleft>9999</onleft>
-                    </control>
+                    </focusedchannellayout>
+                    <itemlayout height="2-row" width="139">
+                        <control type="image" id="2">
+                            <width>139</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="2">colors/black.png</texture>
+                            <colordiffuse>textboxInactive</colordiffuse>
+                        </control>
+                        <control type="label" id="1">
+                            <width>120</width>
+                            <height>2-row</height>
+                            <font>itemTitle</font>
+                            <textoffsetx>12</textoffsetx>
+                            <textcolor>textActive</textcolor>
+                            <selectedcolor>selected</selectedcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Label]</label>
+                        </control>
+                    </itemlayout>
+                    <focusedlayout height="2-row" width="139">
+                        <control type="image" id="14">
+                            <width>139</width>
+                            <height>2-row</height>
+                            <texture border="2">colors/white.png</texture>
+                            <colordiffuse>500</colordiffuse>
+                        </control>
+                        <control type="label" id="1">
+                            <width>120</width>
+                            <height>2-row</height>
+                            <font>itemTitle</font>
+                            <textoffsetx>12</textoffsetx>
+                            <textcolor>textActive</textcolor>
+                            <selectedcolor>textActive</selectedcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Label]</label>
+                        </control>
+                    </focusedlayout>
                 </control>
             </control>
-        </control>
-        <!--sorting and misc controls-->
-        <control type="group" id="61">
-            <!--Options-->
+            <!--page scrollbar-->
+            <control type="group" id="9400">
+                <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
+                <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
+                <control type="scrollbar" id="60">
+                    <posx>108r</posx>
+                    <posy>276</posy>
+                    <height>672</height>
+                    <onleft>9999</onleft>
+                </control>
+            </control>
+            <!--Folder titles-->
             <control type="group">
-                <posx>24</posx>
-                <posy>111</posy>
-                <animation type="Conditional" condition="controlgroup(62).hasfocus">
-                    <effect type="fade" start="0" end="100" time="300"/>
-                    <effect type="slide" start="-200" end="0" tween="sine" easing="out" time="400"/>
-                </animation>
-                <animation type="Conditional" condition="!controlgroup(62).hasfocus | Window.IsActive(5000) | Window.IsActive(5900)">
-                    <effect type="fade" start="100" end="0" time="400"/>
-                    <effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
-                </animation>
-                <!--menu-->
-                <include>sideBarMenuItems</include>
+                <posx>col-1-begin</posx>
+                <posy>row-1-begin</posy>
+                <!--source title-->
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>14-col</width>
+                    <font>pageTitle</font>
+                    <label>$LOCALIZE[31006] [COLOR textAccented]$LOCALIZE[31080][/COLOR]</label>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>45</posy>
+                    <width>14-col</width>
+                    <font>regular</font>
+                    <label>$INFO[Pvr.BackendChannels] $LOCALIZE[31017]</label>
+                    <textcolor>textActive</textcolor>
+                </control>
             </control>
+            <!--dateTime-->
+            <include>dateTime</include>
         </control>
+
+        <!--hub menu-->
+        <include>hubMenu</include>
+
         <!--debugging-->
         <include>DebugGrid</include>
         <control type="label">
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index b02dda3..675ba55 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -4,7 +4,7 @@
     <include>fadeInOut</include>
     <controls>
         <control type="group">
-            <posx>col-1-begin</posx>
+            <posx>col-13-begin</posx>
             <posy>row-3-begin</posy>
             <!--fade out if audio / video menu active-->
             <animation type="Conditional" condition="Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels)">
@@ -43,10 +43,9 @@
                 <posy>11-row</posy>
                 <width>12-col-gutter</width>
                 <height>2-row</height>
-                <aligny>center</aligny>
                 <font>largeTitle</font>
                 <textcolor>textActive</textcolor>
-                <label>[UPPERCASE]$INFO[videoplayer.Title][/UPPERCASE]</label>
+                <label>$INFO[videoplayer.Title]</label>
                 <include condition="Skin.HasSetting(lowPowerMode)">scrollSuppressionActive</include>
                 <include condition="!Skin.HasSetting(lowPowerMode)">scrollSuppressionInactive</include>
             </control>
@@ -56,14 +55,14 @@
                 <width>12-col</width>
                 <height>6-row</height>
                 <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
+                <colordiffuse>textboxInactive</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="textbox">
                 <posx>12</posx>
-                <posy>14-row</posy>
+                <posy>516</posy>
                 <width>12-col-gutter</width>
-                <height>6-row</height>
+                <height>5-row</height>
                 <font>textbox</font>
                 <textcolor>textActive</textcolor>
                 <label fallback="31009">$INFO[Videoplayer.plot]</label>
@@ -73,11 +72,12 @@
             </control>
             <control type="label">
                 <posx>12</posx>
-                <posy>13-row</posy>
+                <posy>462</posy>
                 <width>8-col</width>
-                <font>smallStrong</font>
+                <height>1-row</height>
+                <font>itemTitle</font>
                 <textcolor>textActive</textcolor>
-                <label>$LOCALIZE[180] $INFO[Videoplayer.time] / $INFO[Videoplayer.duration]</label>
+                <label>$INFO[Videoplayer.time] / $INFO[Videoplayer.duration]</label>
                 <scroll>false</scroll>
                 <shadowcolor>-</shadowcolor>
             </control>
@@ -90,13 +90,12 @@
                 <height>2-row</height>
                 <itemgap>0</itemgap>
                 <orientation>horizontal</orientation>
-                <onright>control.setfocus(8000,0)</onright>
-                <onleft>control.setfocus(8000,6)</onleft>
+                <ondown>control.setfocus(8000,0)</ondown>
                 <itemlayout width="3-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>3-col-textbox</width>
+                        <width>3-col</width>
                         <height>2-row</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
                         <texture border="0">colors/black.png</texture>
@@ -106,11 +105,11 @@
                     <control type="label">
                         <posx>12</posx>
                         <posy>0</posy>
-                        <width>3-col-textbox</width>
+                        <width>3-col</width>
                         <height>2-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
-                        <font>menuTitle</font>
+                        <font>buttonTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
@@ -121,7 +120,7 @@
                         <visible>control.hasfocus(8001)</visible>
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>3-col-textbox</width>
+                        <width>3-col</width>
                         <height>2-row</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
@@ -132,7 +131,7 @@
                         <visible>!control.hasfocus(8001)</visible>
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>3-col-textbox</width>
+                        <width>3-col</width>
                         <height>2-row</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
                         <texture border="0">colors/black.png</texture>
@@ -147,7 +146,7 @@
                         <height>2-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
-                        <font>menuTitle</font>
+                        <font>buttonTitle</font>
                         <textcolor>black</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
@@ -203,8 +202,7 @@
                 <height>1-col</height>
                 <itemgap>0</itemgap>
                 <orientation>horizontal</orientation>
-                <onright>control.setfocus(8001,0)</onright>
-                <onleft>control.setfocus(8001,4)</onleft>
+                <onup>control.setfocus(8001,0)</onup>
                 <itemlayout width="1-col" height="1-col">
                     <control type="image">
                         <posx>0</posx>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 5cb2a84..39a3e91 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -5,66 +5,44 @@
         <!--fanart-->
         <control type="group">
             <visible>container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
-            <posy>-696</posy>
+            <posy>0</posy>
+            <posx>-960</posx>
             <control type="image">
                 <include>dimensionsFullscreen</include>
                 <aspectratio scalediffuse="false">stretch</aspectratio>
                 <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
                 <bordertexture border="0" colordiffuse="500">colors/white.png</bordertexture>
-                <bordersize>0,0,0,6</bordersize>
+                <bordersize>0,0,6,0</bordersize>
                 <colordiffuse>ffffffff</colordiffuse>
             </control>
         </control>
 
         <!--title-->
         <control type="group">
-            <posx>col-1-begin</posx>
+            <posx>col-13-begin</posx>
             <posy>row-5-begin</posy>
             <visible>container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
-            <control type="image">
-                <posx>-97</posx>
-                <posy>3-row</posy>
-                <width>fullscreenWidth</width>
-                <height>2-row</height>
-                <aspectratio scalediffuse="false">stretch</aspectratio>
-                <texture border="0">colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-            </control>
             <control type="label">
-                <posx>0</posx>
-                <posy>3-row</posy>
-                <width>24-col</width>
+                <posx>24</posx>
+                <posy>0</posy>
+                <width>12-col</width>
                 <height>2-row</height>
                 <align></align>
                 <font>medium</font>
-                <textcolor>ccf1f1f1</textcolor>
-                <label>$INFO[ListItem.TVShowTitle] [B]$INFO[listitem.Season,$LOCALIZE[31011], ][/B]</label>
+                <textcolor>textActive</textcolor>
+                <label>[B]$INFO[ListItem.TVShowTitle][/B] $INFO[listitem.Season,$LOCALIZE[31011] , ]</label>
             </control>
         </control>
 
         <!--episode synopsis & thumb-->
         <control type="group">
-            <visible>[container.content(episodes) | Substring(Container.folderpath,plugin)]</visible>
-            <control type="image">
-                <visible>!Substring(Container.folderpath,plugin)</visible>
-                <posx>col-1-begin</posx>
-                <posy>row-12-begin</posy>
-                <width>12-col-gutter</width>
-                <height>473</height>
-                <aspectratio aligny="top" scalediffuse="false">scale</aspectratio>
-                <texture border="0">$INFO[listitem.thumb]</texture>
-                <bordertexture border="3" colordiffuse="background">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
-                <fadetime>600</fadetime>
-                <colordiffuse>ffffffff</colordiffuse>
-            </control>
             <!--tvhsow library-sourced episode list-->
             <control type="panel" id="52">
                 <visible>container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
                 <posx>col-13-begin</posx>
-                <posy>row-12-begin</posy>
+                <posy>row-8-begin</posy>
                 <width>12-col</width>
-                <height>18-row</height>
+                <height>20-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <pagecontrol>60</pagecontrol>
diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml
index b4ac9d9..0476123 100644
--- a/1080i/View_LiveTVChannels.xml
+++ b/1080i/View_LiveTVChannels.xml
@@ -12,9 +12,9 @@
                 <pagecontrol>60</pagecontrol>
                 <itemlayout height="2-row" width="24-col">
                     <control type="image">
-                        <posx>0</posx>
+                        <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>6-col-textbox</width>
+                        <width>5-col-textbox</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/black.png</texture>
@@ -26,7 +26,7 @@
                         <width>2-row</width>
                         <height>2-row</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
@@ -42,19 +42,19 @@
                     <control type="image">
                         <posx>6-col</posx>
                         <posy>0</posy>
-                        <width>2-col-textbox</width>
+                        <width>2-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
+                        <colordiffuse>textboxInactive</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>6-col</posx>
                         <posy>0</posy>
-                        <width>2-col-textbox</width>
+                        <width>2-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <align>center</align>
+                        <align>right</align>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -70,7 +70,7 @@
                         <colordiffuse>textboxInactive</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>8-col-indent</posx>
+                        <posx>8-col</posx>
                         <posy>0</posy>
                         <width>7-col-gutter</width>
                         <height>2-row</height>
@@ -83,18 +83,18 @@
                     <control type="image">
                         <posx>15-col</posx>
                         <posy>0</posy>
-                        <width>2-col-textbox</width>
+                        <width>2-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
+                        <colordiffuse>textboxInactive</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>15-col</posx>
+                        <posx>15-col-gutter</posx>
                         <posy>0</posy>
                         <width>2-col-textbox</width>
                         <height>2-row</height>
-                        <align>center</align>
+                        <align>right</align>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
@@ -111,7 +111,7 @@
                         <colordiffuse>textboxInactive</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>17-col-indent</posx>
+                        <posx>17-col</posx>
                         <posy>0</posy>
                         <width>7-col-gutter</width>
                         <height>2-row</height>
@@ -124,9 +124,9 @@
                 </itemlayout>
                 <focusedlayout height="2-row" width="20-col">
                     <control type="image">
-                        <posx>0</posx>
+                        <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>6-col-textbox</width>
+                        <width>5-col-textbox</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
@@ -138,7 +138,8 @@
                         <width>2-row</width>
                         <height>2-row</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <include>spinFocusIcon</include>
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
@@ -154,7 +155,7 @@
                     <control type="image">
                         <posx>6-col</posx>
                         <posy>0</posy>
-                        <width>2-col-textbox</width>
+                        <width>2-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
@@ -163,10 +164,10 @@
                     <control type="label">
                         <posx>6-col</posx>
                         <posy>0</posy>
-                        <width>2-col-textbox</width>
+                        <width>2-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <align>center</align>
+                        <align>right</align>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -182,7 +183,7 @@
                         <colordiffuse>500</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>8-col-indent</posx>
+                        <posx>8-col</posx>
                         <posy>0</posy>
                         <width>7-col-gutter</width>
                         <height>2-row</height>
@@ -195,18 +196,18 @@
                     <control type="image">
                         <posx>15-col</posx>
                         <posy>0</posy>
-                        <width>2-col-textbox</width>
+                        <width>2-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
                         <colordiffuse>500</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>15-col</posx>
+                        <posx>15-col-gutter</posx>
                         <posy>0</posy>
                         <width>2-col-textbox</width>
                         <height>2-row</height>
-                        <align>center</align>
+                        <align>right</align>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
@@ -223,7 +224,7 @@
                         <colordiffuse>500</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>17-col-indent</posx>
+                        <posx>17-col</posx>
                         <posy>0</posy>
                         <width>7-col-gutter</width>
                         <height>2-row</height>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 1823a8a..3ebb5c9 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -62,24 +62,74 @@
                             <posx>0</posx>
                             <posy>0</posy>
                             <control type="image">
-                                <posx>0</posx>
-                                <posy>0</posy>
-                                <width>1-col</width>
-                                <height>396</height>
+                                <posx>3</posx>
+                                <posy>3</posy>
+                                <width>258</width>
+                                <height>390</height>
                                 <aspectratio>stretch</aspectratio>
-                                <texture border="0">colors/white.png</texture>
-                                <colordiffuse>500</colordiffuse>
+                                <texture border="0">colors/black.png</texture>
+                                <colordiffuse>ccFFFFFF</colordiffuse>
                             </control>
                             <control type="label">
-                                <posx>34</posx>
-                                <posy>10-row</posy>
-                                <width>9-row</width>
-                                <align>left</align>
-                                <angle>90</angle>
-                                <font>itemTitle</font>
-                                <textcolor>white</textcolor>
+                                <posx>12</posx>
+                                <posy>4-row</posy>
+                                <width>240</width>
+                                <height>2-row</height>
+                                <align>center</align>
+                                <aligny>center</aligny>
+                                <font>regularStrong</font>
+                                <textcolor>textActive</textcolor>
                                 <label>$INFO[ListItem.title]</label>
                             </control>
+                            <control type="label">
+                                <posx>12</posx>
+                                <posy>5-row</posy>
+                                <width>240</width>
+                                <height>2-row</height>
+                                <align>center</align>
+                                <aligny>center</aligny>
+                                <font>buttonTitle</font>
+                                <textcolor>textActive</textcolor>
+                                <label>$INFO[ListItem.year]</label>
+                            </control>
+                            <control type="grouplist">
+                                <posx>42</posx>
+                                <posy>9-row</posy>
+                                <width>4-col-gutter</width>
+                                <orientation>horizontal</orientation>
+                                <control type="label">
+                                    <width>24</width>
+                                    <height>2-row</height>
+                                    <aligny>center</aligny>
+                                    <font>symbol</font>
+                                    <textcolor>textActive</textcolor>
+                                    <label></label>
+                                </control>
+                                <control type="label">
+                                    <width>1-col</width>
+                                    <height>2-row</height>
+                                    <aligny>center</aligny>
+                                    <font>smallStrong</font>
+                                    <textcolor>textActive</textcolor>
+                                    <label>$LOCALIZE[31183]</label>
+                                </control>
+                                <control type="label">
+                                    <width>24</width>
+                                    <height>2-row</height>
+                                    <aligny>center</aligny>
+                                    <font>symbol</font>
+                                    <textcolor>textActive</textcolor>
+                                    <label></label>
+                                </control>
+                                <control type="label">
+                                    <width>1-col</width>
+                                    <height>2-row</height>
+                                    <aligny>center</aligny>
+                                    <font>smallStrong</font>
+                                    <textcolor>textActive</textcolor>
+                                    <label>$LOCALIZE[31184]</label>
+                                </control>
+                            </control>
                         </control>
                     </control>
                 </focusedlayout>
diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml
index e5cd58f..755bcf1 100644
--- a/1080i/View_VideoRecentItems.xml
+++ b/1080i/View_VideoRecentItems.xml
@@ -73,27 +73,73 @@
                             <bordersize>3</bordersize>
                             <colordiffuse>ffFFFFFF</colordiffuse>
                         </control>
-                        <control type="group">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <control type="image">
-                                <posx>0</posx>
-                                <posy>0</posy>
-                                <width>1-col</width>
-                                <height>396</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture border="0">colors/white.png</texture>
-                                <colordiffuse>500</colordiffuse>
+                        <control type="image">
+                            <posx>3</posx>
+                            <posy>3</posy>
+                            <width>258</width>
+                            <height>390</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="0">colors/black.png</texture>
+                            <colordiffuse>ccFFFFFF</colordiffuse>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>4-row</posy>
+                            <width>240</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>regularStrong</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.title]</label>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>5-row</posy>
+                            <width>240</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.year]</label>
+                        </control>
+                        <control type="grouplist">
+                            <posx>42</posx>
+                            <posy>9-row</posy>
+                            <width>4-col-gutter</width>
+                            <orientation>horizontal</orientation>
+                            <control type="label">
+                                <width>24</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
+                                <font>symbol</font>
+                                <textcolor>textActive</textcolor>
+                                <label></label>
                             </control>
                             <control type="label">
-                                <posx>34</posx>
-                                <posy>10-row</posy>
-                                <width>9-row</width>
-                                <align>left</align>
-                                <angle>90</angle>
-                                <font>itemTitle</font>
-                                <textcolor>white</textcolor>
-                                <label>$INFO[ListItem.title]</label>
+                                <width>1-col</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
+                                <font>smallStrong</font>
+                                <textcolor>textActive</textcolor>
+                                <label>$LOCALIZE[31183]</label>
+                            </control>
+                            <control type="label">
+                                <width>24</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
+                                <font>symbol</font>
+                                <textcolor>textActive</textcolor>
+                                <label></label>
+                            </control>
+                            <control type="label">
+                                <width>1-col</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
+                                <font>smallStrong</font>
+                                <textcolor>textActive</textcolor>
+                                <label>$LOCALIZE[31184]</label>
                             </control>
                         </control>
                     </control>
@@ -172,27 +218,73 @@
                             <bordersize>3</bordersize>
                             <colordiffuse>ffffffff</colordiffuse>
                         </control>
-                        <control type="group">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <control type="image">
-                                <posx>0</posx>
-                                <posy>0</posy>
-                                <width>1-col</width>
-                                <height>396</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture border="0">colors/white.png</texture>
-                                <colordiffuse>500</colordiffuse>
+                        <control type="image">
+                            <posx>3</posx>
+                            <posy>3</posy>
+                            <width>258</width>
+                            <height>390</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="0">colors/black.png</texture>
+                            <colordiffuse>ccFFFFFF</colordiffuse>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>4-row</posy>
+                            <width>240</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>regularStrong</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.TVshowTitle]</label>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>5-row</posy>
+                            <width>240</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.season,$LOCALIZE[31011] ,]</label>
+                        </control>
+                        <control type="grouplist">
+                            <posx>42</posx>
+                            <posy>9-row</posy>
+                            <width>4-col-gutter</width>
+                            <orientation>horizontal</orientation>
+                            <control type="label">
+                                <width>24</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
+                                <font>symbol</font>
+                                <textcolor>textActive</textcolor>
+                                <label></label>
                             </control>
                             <control type="label">
-                                <posx>34</posx>
-                                <posy>10-row</posy>
-                                <width>9-row</width>
-                                <align>left</align>
-                                <angle>90</angle>
-                                <font>itemTitle</font>
-                                <textcolor>white</textcolor>
-                                <label>$INFO[ListItem.TVshowTitle] $INFO[ListItem.season,$LOCALIZE[31011] ,]</label>
+                                <width>1-col</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
+                                <font>smallStrong</font>
+                                <textcolor>textActive</textcolor>
+                                <label>$LOCALIZE[31183]</label>
+                            </control>
+                            <control type="label">
+                                <width>24</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
+                                <font>symbol</font>
+                                <textcolor>textActive</textcolor>
+                                <label></label>
+                            </control>
+                            <control type="label">
+                                <width>1-col</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
+                                <font>smallStrong</font>
+                                <textcolor>textActive</textcolor>
+                                <label>$LOCALIZE[31184]</label>
                             </control>
                         </control>
                     </control>
diff --git a/extras/backgrounds/background001.jpg b/extras/backgrounds/background001.jpg
index cd5ac75..0603efe 100644
Binary files a/extras/backgrounds/background001.jpg and b/extras/backgrounds/background001.jpg differ
diff --git a/extras/backgrounds/background002.jpg b/extras/backgrounds/background002.jpg
deleted file mode 100644
index 0603efe..0000000
Binary files a/extras/backgrounds/background002.jpg and /dev/null differ
diff --git a/extras/backgrounds/background003.jpg b/extras/backgrounds/background003.jpg
deleted file mode 100644
index da73624..0000000
Binary files a/extras/backgrounds/background003.jpg and /dev/null differ
diff --git a/language/English/strings.po b/language/English/strings.po
index 06e36b7..0db0086 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -671,4 +671,12 @@ msgstr ""
 
 msgctxt "#31182"
 msgid "Tracks"
+msgstr ""
+
+msgctxt "#31183"
+msgid "Play"
+msgstr ""
+
+msgctxt "#31184"
+msgid "Info"
 msgstr ""
\ No newline at end of file