diff --git a/1080i/DialogFullScreenInfo.xml b/1080i/DialogFullScreenInfo.xml
index 0d7e9b5..1d1f0b8 100644
--- a/1080i/DialogFullScreenInfo.xml
+++ b/1080i/DialogFullScreenInfo.xml
@@ -31,44 +31,14 @@
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>col-1-begin</width>
-                    <height>2-row</height>
-                    <texture>colors/white.png</texture>
-                    <colordiffuse>highlight</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-                <control type="image">
-                    <posx>col-2-begin</posx>
-                    <posy>0</posy>
                     <width>fullscreenWidth</width>
                     <height>2-row</height>
                     <texture>colors/white.png</texture>
                     <colordiffuse>highlight</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
-                <!--channel logo-->
-                <control type="image">
-                    <posx>col-1-begin</posx>
-                    <posy>0</posy>
-                    <width>1-col</width>
-                    <height>1-col</height>
-                    <texture>colors/black.png</texture>
-                    <bordertexture border="0" diffuse="masks/circle.png">colors/black.png</bordertexture>
-                    <bordersize>0</bordersize>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-                <control type="image">
-                    <posx>col-1-begin</posx>
-                    <posy>0</posy>
-                    <width>1-col</width>
-                    <height>1-col</height>
-                    <texture border="0" diffuse="masks/circle.png">$INFO[Player.Art(thumb)]</texture>
-                    <bordertexture border="0">colors/black.png</bordertexture>
-                    <bordersize>0</bordersize>
-                    <aspectratio>stretch</aspectratio>
-                </control>
                 <control type="label">
-                    <posx>192</posx>
+                    <posx>col-1-begin</posx>
                     <posy>0</posy>
                     <width>16-col</width>
                     <height>2-row</height>
@@ -115,4 +85,4 @@
             <label>DialogFullScreenInfo.xml</label>
         </control>
     </controls>
-</window>
+</window>
\ No newline at end of file
diff --git a/1080i/DialogOK.xml b/1080i/DialogOK.xml
index 1a5b4ad..8eff60e 100644
--- a/1080i/DialogOK.xml
+++ b/1080i/DialogOK.xml
@@ -9,21 +9,39 @@
             <posy>row-9-begin</posy>
             <!--animations-->
             <include>modalDialogInOut</include>
+            <control type="image">
+                <posx>col-9-begin</posx>
+                <posy>0</posy>
+                <width>8-col</width>
+                <height>8-row</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/black.png</texture>
+                <colordiffuse>ccffffff</colordiffuse>
+            </control>
+            <control type="image">
+                <posx>col-9-begin</posx>
+                <posy>0</posy>
+                <width>8-col</width>
+                <height>2-row</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+            </control>
             <!--text-->
             <control type="label" id="1">
                 <description>heading</description>
-                <posx>0</posx>
-                <posy>-48</posy>
-                <width>8-col</width>
-                <height>3-row</height>
+                <posx>24</posx>
+                <posy>0</posy>
+                <width>540</width>
+                <height>2-row</height>
                 <wrapmultiline>true</wrapmultiline>
-                <font>pageTitle</font>
-                <textcolor>highlight</textcolor>
+                <font>dialogTitle</font>
+                <textcolor>textActive</textcolor>
             </control>
             <control type="textbox" id="9">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>8-col</width>
+                <posx>24</posx>
+                <posy>3-row</posy>
+                <width>540</width>
                 <height>4-row</height>
                 <font>textbox</font>
                 <textcolor>textActive</textcolor>
@@ -32,11 +50,10 @@
             <control type="panel" id="9001">
                 <posx>0</posx>
                 <posy>7-row</posy>
-                <width>4-col</width>
-                <height>5-row</height>
-                <itemgap>3</itemgap>
+                <width>8-col</width>
+                <height>2-row</height>
+                <itemgap>0</itemgap>
                 <orientation>vertical</orientation>
-                <onleft>2</onleft>
                 <itemlayout width="5-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
diff --git a/1080i/DialogPVRInfo.xml b/1080i/DialogPVRInfo.xml
index f2d9bb3..595143b 100644
--- a/1080i/DialogPVRInfo.xml
+++ b/1080i/DialogPVRInfo.xml
@@ -27,8 +27,8 @@
                     <height>3-row</height>
                     <align>left</align>
                     <aligny>center</aligny>
-                    <font>mediumStrong</font>
-                    <textcolor>highlight</textcolor>
+                    <font>largeLight</font>
+                    <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <label>$INFO[ListItem.Label]</label>
                     <wrapmultiline>true</wrapmultiline>
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index 82ea08f..80dfa04 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -358,8 +358,8 @@
                     <height>2-row</height>
                     <align>left</align>
                     <aligny>center</aligny>
-                    <font>mediumStrong</font>
-                    <textcolor>highlight</textcolor>
+                    <font>largeLight</font>
+                    <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <label>$INFO[ListItem.Label]</label>
                     <wrapmultiline>true</wrapmultiline>
diff --git a/1080i/DialogYesNo.xml b/1080i/DialogYesNo.xml
index 1266433..5fa953a 100644
--- a/1080i/DialogYesNo.xml
+++ b/1080i/DialogYesNo.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9001</defaultcontrol>
-
     <include>fadeInOut</include>
     <controls>
         <include>modalDialog</include>
@@ -10,24 +9,42 @@
             <posy>row-9-begin</posy>
             <!--animations-->
             <include>modalDialogInOut</include>
+             <control type="image">
+                <posx>col-9-begin</posx>
+                <posy>0</posy>
+                <width>8-col</width>
+                <height>8-row</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/black.png</texture>
+                <colordiffuse>ffffffff</colordiffuse>
+            </control>
+            <control type="image">
+                <posx>col-9-begin</posx>
+                <posy>0</posy>
+                <width>8-col</width>
+                <height>2-row</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+            </control>
             <!--text-->
             <control type="group">
                 <posx>col-9-begin</posx>
                 <posy>0</posy>
                 <control type="label" id="1">
                     <description>heading</description>
-                    <posx>0</posx>
-                    <posy>-48</posy>
-                    <width>8-col</width>
-                    <height>3-row</height>
+                    <posx>24</posx>
+                    <posy>0</posy>
+                    <width>540</width>
+                    <height>2-row</height>
                     <wrapmultiline>true</wrapmultiline>
-                    <font>pageTitle</font>
-                    <textcolor>highlight</textcolor>
+                    <font>dialogTitle</font>
+                    <textcolor>textActive</textcolor>
                 </control>
                 <control type="textbox" id="9">
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>8-col</width>
+                    <posx>24</posx>
+                    <posy>3-row</posy>
+                    <width>540</width>
                     <height>78</height>
                     <font>textbox</font>
                     <textcolor>textActive</textcolor>
@@ -36,7 +53,7 @@
             <!--Yes / No-->
             <control type="image">
                 <posx>col-9-begin</posx>
-                <posy>5-row</posy>
+                <posy>6-row</posy>
                 <width>1-col</width>
                 <height>2-row</height>
                 <aspectratio>stretch</aspectratio>
@@ -45,7 +62,7 @@
             <control type="image">
                 <visible>control.hasfocus(10)</visible>
                 <posx>col-9-begin</posx>
-                <posy>5-row</posy>
+                <posy>6-row</posy>
                 <width>1-col</width>
                 <height>2-row</height>
                 <aspectratio>stretch</aspectratio>
@@ -58,7 +75,7 @@
             </control>
             <control type="label">
                 <posx>col-9-begin</posx>
-                <posy>5-row</posy>
+                <posy>6-row</posy>
                 <width>1-col</width>
                 <height>2-row</height>
                 <align>center</align>
@@ -69,7 +86,7 @@
             </control>
             <control type="image">
                 <posx>col-13-begin</posx>
-                <posy>5-row</posy>
+                <posy>6-row</posy>
                 <width>1-col</width>
                 <height>2-row</height>
                 <aspectratio>stretch</aspectratio>
@@ -78,7 +95,7 @@
             <control type="image">
                 <visible>control.hasfocus(11)</visible>
                 <posx>col-13-begin</posx>
-                <posy>5-row</posy>
+                <posy>6-row</posy>
                 <width>1-col</width>
                 <height>2-row</height>
                 <aspectratio>stretch</aspectratio>
@@ -91,7 +108,7 @@
             </control>
             <control type="label">
                 <posx>col-13-begin</posx>
-                <posy>5-row</posy>
+                <posy>6-row</posy>
                 <width>1-col</width>
                 <height>2-row</height>
                 <align>center</align>
@@ -102,7 +119,7 @@
             </control>
             <control type="grouplist" id="9001">
                 <posx>col-10-begin</posx>
-                <posy>5-row</posy>
+                <posy>6-row</posy>
                 <width>8-col</width>
                 <height>2-row</height>
                 <itemgap>1-col</itemgap>
diff --git a/1080i/Font.xml b/1080i/Font.xml
index 258e1e4..2f60566 100644
--- a/1080i/Font.xml
+++ b/1080i/Font.xml
@@ -36,7 +36,7 @@
         <font>
             <name>largeLight</name>
             <filename>roboto/light.ttf</filename>
-            <size>60</size>
+            <size>54</size>
             <linespacing>0.8</linespacing>
         </font>
         <font>
@@ -171,6 +171,12 @@
             <size>28</size>
             <linespacing>1.0</linespacing>
         </font>
+        <font>
+            <name>thumbTitle</name>
+            <filename>roboto/regular.ttf</filename>
+            <size>24</size>
+            <linespacing>1.0</linespacing>
+        </font>
         <font>
             <name>symbol</name>
             <filename>symbol.ttf</filename>
diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml
index 33f3dee..60c2dd0 100644
--- a/1080i/Includes_animations.xml
+++ b/1080i/Includes_animations.xml
@@ -34,8 +34,8 @@
     </include>
     <include name="focusThumb">
         <animation type="focus" loop="false" reversible="false">
-            <effect type="rotatey" start="0" end="-10" center="132" tween="back" easing="out" time="300"/>
-            <effect type="rotatey" start="0" end="10" center="132" tween="back" easing="out" delay="300" time="300"/>
+            <!--<effect type="rotatey" start="0" end="-10" center="132" tween="back" easing="out" time="300"/>
+            <effect type="rotatey" start="0" end="10" center="132" tween="back" easing="out" delay="300" time="300"/>-->
             <effect type="zoom" start="95" end="110" center="auto" tween="sine" easing="out" time="200"/>
         </animation>
     </include>
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index 3b30f90..361ec2c 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -33,7 +33,7 @@
                 <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>51r</posx>
+                    <posx>62r</posx>
                     <posy>row-5-begin</posy>
                     <height>22-row</height>
                     <onleft>9999</onleft>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 0e514e5..8665168 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -2,7 +2,6 @@
 <includes>
     <!--Album browser-->
     <include name="album">
-
         <!--fanart-->
         <control type="group">
             <visible>container.content(albums) + !container.content(songs) + !SubString(container.folderpath,musicdb://artists) + !SubString(container.folderpath,musicdb://genres)</visible>
@@ -19,7 +18,6 @@
                 <aspectratio>stretch</aspectratio>
             </control>
         </control>
-
         <control type="panel" id="50">
             <visible>container.content(albums) + !container.content(songs) + !SubString(container.folderpath,musicdb://artists) + !SubString(container.folderpath,musicdb://genres)</visible>
             <posx>78</posx>
@@ -33,7 +31,7 @@
             <onback>9000</onback>
             <pagecontrol>60</pagecontrol>
             <scrolltime tween="cubic" easing="out">600</scrolltime>
-            <itemlayout width="300" height="300">
+            <itemlayout width="300" height="348">
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
@@ -60,24 +58,24 @@
                 <control type="label">
                     <visible>!controlgroup(9000).hasfocus</visible>
                     <posx>12</posx>
-                    <posy>2-row</posy>
+                    <posy>264</posy>
                     <width>240</width>
-                    <height>2-row</height>
+                    <height>1-row</height>
                     <align>center</align>
                     <aligny>center</aligny>
-                    <font>regularStrong</font>
+                    <font>thumbtitle</font>
                     <textcolor>textDisabled</textcolor>
-                    <label>$INFO[ListItem.Title]</label>
+                    <label>[B]$INFO[ListItem.Title][/B]</label>
                 </control>
                 <control type="label">
                     <visible>!controlgroup(9000).hasfocus</visible>
                     <posx>12</posx>
-                    <posy>3-row</posy>
+                    <posy>292</posy>
                     <width>240</width>
-                    <height>2-row</height>
+                    <height>1-row</height>
                     <align>center</align>
                     <aligny>center</aligny>
-                    <font>buttonTitle</font>
+                    <font>thumbTitle</font>
                     <textcolor>textDisabled</textcolor>
                     <label>$INFO[ListItem.artist]</label>
                 </control>
@@ -93,7 +91,7 @@
                     <colordiffuse>ffFFFFFF</colordiffuse>
                 </control>
             </itemlayout>
-            <focusedlayout width="4-col" height="4-col">
+            <focusedlayout width="4-col" height="348">
                 <control type="group">
                     <include>focusThumb</include>
                     <control type="image">
@@ -116,7 +114,6 @@
                         <texture border="6">$INFO[Listitem.thumb]</texture>
                         <bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
                         <bordersize>6</bordersize>
-                        <colordiffuse>ff666666</colordiffuse>
                     </control>
                     <control type="label">
                         <visible>isempty(listitem.title)</visible>
@@ -132,64 +129,25 @@
                     </control>
                     <control type="label">
                         <posx>12</posx>
-                        <posy>2-row</posy>
+                        <posy>264</posy>
                         <width>240</width>
-                        <height>2-row</height>
+                        <height>1-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
-                        <font>regularStrong</font>
+                        <font>thumbtitle</font>
                         <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.title]</label>
+                        <label>[B]$INFO[ListItem.Title][/B]</label>
                     </control>
                     <control type="label">
                         <posx>12</posx>
-                        <posy>3-row</posy>
+                        <posy>292</posy>
                         <width>240</width>
-                        <height>2-row</height>
+                        <height>1-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
-                        <font>buttonTitle</font>
+                        <font>thumbTitle</font>
                         <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.Artist]</label>
-                    </control>
-                    <control type="grouplist">
-                        <visible>!isempty(listitem.title)</visible>
-                        <posx>42</posx>
-                        <posy>5-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>
+                        <label>$INFO[ListItem.artist]</label>
                     </control>
                 </control>
             </focusedlayout>
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index 8df9d2c..b21eeab 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -64,6 +64,7 @@
                         <label>[B]$INFO[listitem.title][/B][CR]$INFO[listitem.year]</label>
                     </control>
                     <control type="label">
+                        <visible>false</visible>
                         <posx>0</posx>
                         <posy>12-row</posy>
                         <width>24-col</width>
@@ -71,7 +72,7 @@
                         <font>large</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>background</shadowcolor>
-                        <label>[B]$INFO[container.foldername][/B]</label>
+                        <label>$INFO[container.foldername]</label>
                     </control>
                 </control>
 
@@ -205,45 +206,6 @@
                                 <bordersize>6</bordersize>
                                 <colordiffuse>ffffffff</colordiffuse>
                             </control>
-                            <control type="grouplist">
-                                <visible>!isempty(listitem.title)</visible>
-                                <posx>42</posx>
-                                <posy>5-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>
                     </focusedlayout>
                 </control>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 221eb3c..77aafd6 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -3,7 +3,6 @@
     <include name="movies">
         <visible>window.isactive(Videos,videodb://movies/titles/)</visible>
         <control type="group">
-
             <!--fanart-->
             <control type="group">
                 <visible>container.content(movies)</visible>
@@ -21,13 +20,12 @@
                 </control>
                 <include>kenBurnsey</include>
             </control>
-
             <control type="panel" id="50">
                 <visible>Library.HasContent(movies) + !container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
                 <posx>78</posx>
                 <posy>row-5-begin</posy>
                 <width>1800</width>
-                <height>27-row</height>
+                <height>25-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <ondown>50</ondown>
@@ -35,7 +33,7 @@
                 <onback>9000</onback>
                 <pagecontrol>60</pagecontrol>
                 <scrolltime tween="cubic" easing="out">600</scrolltime>
-                <itemlayout width="300" height="430">
+                <itemlayout width="300" height="468">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -62,27 +60,15 @@
                     <control type="label">
                         <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
-                        <posy>4-row</posy>
+                        <posy>11-row</posy>
                         <width>240</width>
-                        <height>2-row</height>
+                        <height>1-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
-                        <font>regularStrong</font>
+                        <font>thumbTitle</font>
                         <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.title]</label>
                     </control>
-                    <control type="label">
-                        <visible>!controlgroup(9000).hasfocus</visible>
-                        <posx>12</posx>
-                        <posy>5-row</posy>
-                        <width>240</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>buttonTitle</font>
-                        <textcolor>textDisabled</textcolor>
-                        <label>$INFO[ListItem.year]</label>
-                    </control>
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -95,7 +81,7 @@
                         <colordiffuse>ffffffff</colordiffuse>
                     </control>
                 </itemlayout>
-                <focusedlayout width="4-col" height="418">
+                <focusedlayout width="4-col" height="468">
                     <control type="group">
                         <include>focusThumb</include>
                         <control type="image">
@@ -107,7 +93,6 @@
                             <texture fallback="DefaultPoster.png" border="0">$INFO[ListItem.Art(poster)]</texture>
                             <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                             <bordersize>6</bordersize>
-                            <colordiffuse>ff666666</colordiffuse>
                         </control>
                         <control type="group">
                             <posx>0</posx>
@@ -115,76 +100,26 @@
                             <control type="label">
                                 <visible>isempty(listitem.title)</visible>
                                 <posx>12</posx>
-                                <posy>4-row</posy>
+                                <posy>11-row</posy>
                                 <width>240</width>
-                                <height>2-row</height>
+                                <height>1-row</height>
                                 <align>center</align>
                                 <aligny>center</aligny>
-                                <font>regularStrong</font>
+                                <font>thumbTitle</font>
                                 <textcolor>textActive</textcolor>
                                 <label>$INFO[ListItem.label]</label>
                             </control>
                             <control type="label">
                                 <posx>12</posx>
-                                <posy>4-row</posy>
+                                <posy>11-row</posy>
                                 <width>240</width>
-                                <height>2-row</height>
+                                <height>1-row</height>
                                 <align>center</align>
                                 <aligny>center</aligny>
-                                <font>regularStrong</font>
+                                <font>thumbTitle</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">
-                                <visible>!isempty(listitem.title)</visible>
-                                <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_MusicAddons.xml b/1080i/View_MusicAddons.xml
index c9ba689..861abbe 100644
--- a/1080i/View_MusicAddons.xml
+++ b/1080i/View_MusicAddons.xml
@@ -14,7 +14,7 @@
             <onback>9000</onback>
             <pagecontrol>60</pagecontrol>
             <scrolltime tween="cubic" easing="out">600</scrolltime>
-            <itemlayout width="300" height="300">
+            <itemlayout width="300" height="348">
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
@@ -22,31 +22,31 @@
                     <height>4-col-gutter</height>
                     <aspectratio>stretch</aspectratio>
                     <texture border="6">DefaultAlbumCover.png</texture>
-                    <bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
+                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
                     <bordersize>6</bordersize>
-                    <colordiffuse>overlay</colordiffuse>
+                    <colordiffuse>textboxInactive</colordiffuse>
                 </control>
                 <control type="label">
                     <visible>!controlgroup(9000).hasfocus</visible>
                     <posx>12</posx>
-                    <posy>2-row</posy>
+                    <posy>264</posy>
                     <width>240</width>
-                    <height>2-row</height>
+                    <height>1-row</height>
                     <align>center</align>
                     <aligny>center</aligny>
-                    <font>regularStrong</font>
+                    <font>thumbtitle</font>
                     <textcolor>textDisabled</textcolor>
-                    <label>$INFO[ListItem.label]</label>
+                    <label>[B]$INFO[ListItem.label][/B]</label>
                 </control>
                 <control type="label">
                     <visible>!controlgroup(9000).hasfocus</visible>
                     <posx>12</posx>
-                    <posy>3-row</posy>
+                    <posy>292</posy>
                     <width>240</width>
-                    <height>2-row</height>
+                    <height>1-row</height>
                     <align>center</align>
                     <aligny>center</aligny>
-                    <font>buttonTitle</font>
+                    <font>thumbTitle</font>
                     <textcolor>textDisabled</textcolor>
                     <label>$INFO[ListItem.Property(Addon.Summary)]</label>
                 </control>
@@ -62,7 +62,7 @@
                     <colordiffuse>ffFFFFFF</colordiffuse>
                 </control>
             </itemlayout>
-            <focusedlayout width="4-col" height="4-col">
+            <focusedlayout width="4-col" height="348">
                 <control type="group">
                     <include>focusThumb</include>
                     <control type="image">
@@ -78,65 +78,26 @@
                     </control>
                     <control type="label">
                         <posx>12</posx>
-                        <posy>2-row</posy>
+                        <posy>264</posy>
                         <width>240</width>
-                        <height>2-row</height>
+                        <height>1-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
-                        <font>regularStrong</font>
+                        <font>thumbtitle</font>
                         <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label]</label>
+                        <label>[B]$INFO[ListItem.label][/B]</label>
                     </control>
                     <control type="label">
                         <posx>12</posx>
-                        <posy>3-row</posy>
+                        <posy>292</posy>
                         <width>240</width>
-                        <height>2-row</height>
+                        <height>1-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
-                        <font>buttonTitle</font>
+                        <font>thumbTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.Property(Addon.Summary)]</label>
                     </control>
-                    <control type="grouplist">
-                        <visible>!isempty(ListItem.Property(Addon.Name))</visible>
-                        <posx>42</posx>
-                        <posy>5-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[31185]</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>
             </focusedlayout>
         </control>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index e8aa01d..0837c9e 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -105,7 +105,7 @@
                             <aligny>center</aligny>
                             <font>regularStrong</font>
                             <textcolor>textDisabled</textcolor>
-                            <label fallback="31190">$INFO[ListItem.season,$LOCALIZE[31011]]</label>
+                            <label fallback="31190">$INFO[ListItem.season,$LOCALIZE[31011] ]</label>
                         </control>
                         <control type="label">
                             <visible>!controlgroup(9000).hasfocus</visible>
@@ -154,7 +154,7 @@
                                 <aligny>center</aligny>
                                 <font>regularStrong</font>
                                 <textcolor>textActive</textcolor>
-                                <label fallback="31190">$INFO[ListItem.season,$LOCALIZE[31011]]</label>
+                                <label fallback="31190">$INFO[ListItem.season,$LOCALIZE[31011] ]</label>
                             </control>
                             <control type="label">
                                 <posx>12</posx>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 25ee3f0..648fc89 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -2,9 +2,7 @@
 <includes>
     <include name="tvshows">
         <visible>window.isactive(Videos,videodb://tvshows/titles/)</visible>
-
         <control type="group">
-
             <!--fanart-->
             <control type="group">
                 <visible>Substring(Container.folderpath,plugin)</visible>
@@ -27,7 +25,7 @@
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
                 <width>1800</width>
-                <height>24-row</height>
+                <height>25-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <ondown>50</ondown>
@@ -36,16 +34,17 @@
                 <scrolltime tween="cubic" easing="out">600</scrolltime>
                 <onback>9000</onback>
                 <pagecontrol>60</pagecontrol>
-                <itemlayout width="444" height="300">
+                <itemlayout width="444" height="336">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
                         <width>6-col-gutter</width>
                         <height>4-col-gutter</height>
                         <aspectratio>scale</aspectratio>
-                        <texture fallback="DefaultPoster.png" border="6">$INFO[Listitem.art(fanart)]</texture>
+                        <texture border="6">DefaultPoster.png</texture>
                         <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
                         <bordersize>6</bordersize>
+                        <colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="label">
                         <visible>isempty(ListItem.Title)</visible>
@@ -60,38 +59,31 @@
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>ff333333</shadowcolor>
                     </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>268</posy>
+                        <width>384</width>
+                        <height>1-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>thumbTitle</font>
+                        <textcolor>textDisabled</textcolor>
+                        <label>$INFO[ListItem.label]</label>
+                        <shadowcolor>ff333333</shadowcolor>
+                    </control>
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
                         <width>6-col-gutter</width>
                         <height>4-col-gutter</height>
-                        <texture>vignette.png</texture>
+                        <aspectratio>scale</aspectratio>
+                        <texture fallback="DefaultPoster.png" border="6">$INFO[Listitem.art(fanart)]</texture>
+                        <bordertexture border="3" colordiffuse="07FFFFFF">colors/white.png</bordertexture>
+                        <bordersize>3</bordersize>
                         <colordiffuse>ffffffff</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>row-3-begin</posy>
-                        <width>6-col-gutter</width>
-                        <height>2-col-gutter</height>
-                        <aspectratio>keep</aspectratio>
-                        <texture>$INFO[ListItem.Art(clearlogo)]</texture>
-                    </control>
-                    <control type="label">
-                        <visible>isempty(ListItem.Art(clearlogo))</visible>
-                        <posx>12</posx>
-                        <posy>4-row</posy>
-                        <width>384</width>
-                        <height>3-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.title]</label>
-                        <shadowcolor>ff333333</shadowcolor>
                     </control>
                 </itemlayout>
-                <focusedlayout width="444" height="300">
+                <focusedlayout width="444" height="336">
                     <control type="group">
                         <include>focusThumb</include>
                         <control type="image">
@@ -118,25 +110,16 @@
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>ff333333</shadowcolor>
                         </control>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>row-3-begin</posy>
-                            <width>6-col-gutter</width>
-                            <height>2-col-gutter</height>
-                            <aspectratio>keep</aspectratio>
-                            <texture>$INFO[ListItem.Art(clearlogo)]</texture>
-                        </control>
                         <control type="label">
-                            <visible>isempty(ListItem.Art(clearlogo))</visible>
                             <posx>12</posx>
-                            <posy>4-row</posy>
+                            <posy>268</posy>
                             <width>384</width>
-                            <height>3-row</height>
+                            <height>1-row</height>
                             <align>center</align>
                             <aligny>center</aligny>
-                            <font>itemTitle</font>
+                            <font>thumbTitle</font>
                             <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.title]</label>
+                            <label>$INFO[ListItem.label]</label>
                             <shadowcolor>ff333333</shadowcolor>
                         </control>
                     </control>
diff --git a/1080i/View_VideoAddons.xml b/1080i/View_VideoAddons.xml
index 6c99f93..a3563f4 100644
--- a/1080i/View_VideoAddons.xml
+++ b/1080i/View_VideoAddons.xml
@@ -17,7 +17,7 @@
                 <onback>9000</onback>
                 <pagecontrol>60</pagecontrol>
                 <scrolltime tween="cubic" easing="out">600</scrolltime>
-                <itemlayout width="300" height="300">
+                <itemlayout width="300" height="348">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -32,24 +32,24 @@
                     <control type="label">
                         <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
-                        <posy>2-row</posy>
+                        <posy>264</posy>
                         <width>240</width>
-                        <height>2-row</height>
+                        <height>1-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
-                        <font>regularStrong</font>
+                        <font>thumbtitle</font>
                         <textcolor>textDisabled</textcolor>
-                        <label>$INFO[ListItem.label]</label>
+                        <label>[B]$INFO[ListItem.label][/B]</label>
                     </control>
                     <control type="label">
                         <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
-                        <posy>3-row</posy>
+                        <posy>292</posy>
                         <width>240</width>
-                        <height>2-row</height>
+                        <height>1-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
-                        <font>buttonTitle</font>
+                        <font>thumbTitle</font>
                         <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.Property(Addon.Summary)]</label>
                     </control>
@@ -65,7 +65,7 @@
                         <colordiffuse>ffFFFFFF</colordiffuse>
                     </control>
                 </itemlayout>
-                <focusedlayout width="4-col" height="4-col">
+                <focusedlayout width="4-col" height="348">
                     <control type="group">
                         <include>focusThumb</include>
                         <control type="image">
@@ -81,65 +81,26 @@
                         </control>
                         <control type="label">
                             <posx>12</posx>
-                            <posy>2-row</posy>
+                            <posy>264</posy>
                             <width>240</width>
-                            <height>2-row</height>
+                            <height>1-row</height>
                             <align>center</align>
                             <aligny>center</aligny>
-                            <font>regularStrong</font>
+                            <font>thumbtitle</font>
                             <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label]</label>
+                            <label>[B]$INFO[ListItem.label][/B]</label>
                         </control>
                         <control type="label">
                             <posx>12</posx>
-                            <posy>3-row</posy>
+                            <posy>292</posy>
                             <width>240</width>
-                            <height>2-row</height>
+                            <height>1-row</height>
                             <align>center</align>
                             <aligny>center</aligny>
-                            <font>buttonTitle</font>
+                            <font>thumbTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.Property(Addon.Summary)]</label>
                         </control>
-                        <control type="grouplist">
-                            <visible>!isempty(ListItem.Property(Addon.Name))</visible>
-                            <posx>42</posx>
-                            <posy>5-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[31185]</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>
                 </focusedlayout>
             </control>
diff --git a/changelog.txt b/changelog.txt
index 7d1a568..45fe6fb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -44,6 +44,12 @@
 
 ***To do (Skinners Notes)***
 
+DialogOK / yes no refresh still needs work
+
+PVR item info rework
+
+PVR Channel selection as part of dialogfullscreeninfo
+
 Improve handling of new users (bring through images from homescreen etc)
 
 Check back on dialog keyboard (ok on laptop: not on openelec??)