From 03e35fbc4fb4254fc203fc8ff0060bacd2a25d9b Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Sun, 12 Apr 2015 21:22:47 +0100
Subject: [PATCH] Various

---
 1080i/AddonBrowser.xml                       |   2 +-
 1080i/DialogAddonInfo.xml                    |  10 +-
 1080i/DialogAddonSettings.xml                |   2 +-
 1080i/DialogButtonMenu.xml                   |   2 +-
 1080i/DialogContextMenu.xml                  |   2 +-
 1080i/DialogExtendedProgressBar.xml          |   2 +-
 1080i/DialogKaiToast.xml                     |   2 +-
 1080i/DialogKeyboard.xml                     | 118 +++----
 1080i/DialogMuteBug.xml                      |   2 +-
 1080i/DialogNumeric.xml                      |  28 +-
 1080i/DialogPVRGroupManager.xml              |   4 +-
 1080i/DialogPVRGuideInfo.xml                 |  89 ++---
 1080i/DialogProgress.xml                     |   2 +-
 1080i/DialogSeekBar.xml                      |  62 ++--
 1080i/DialogSelect.xml                       |  32 +-
 1080i/DialogSlider.xml                       |   2 +-
 1080i/DialogSongInfo.xml                     |   2 +-
 1080i/DialogSubtitles.xml                    |   2 +-
 1080i/DialogVideoInfo.xml                    |  40 +--
 1080i/DialogVolumeBar.xml                    |   2 +-
 1080i/DialogYesNo.xml                        |  19 +-
 1080i/FileManager.xml                        |   4 +-
 1080i/Font.xml                               |   2 +-
 1080i/Home.xml                               |  11 +-
 1080i/Includes.xml                           |  10 -
 1080i/Includes_hubMenu.xml                   |  10 +-
 1080i/Includes_hubMenuSubItems.xml           | 126 +++----
 1080i/Includes_variables.xml                 |   6 +-
 1080i/LoginScreen.xml                        |   2 +-
 1080i/MyMusicPlaylist.xml                    |   2 +-
 1080i/MyPVRChannels.xml                      |   4 +-
 1080i/MyPVRGuide.xml                         |  10 +-
 1080i/MyPVRRecordings.xml                    |   2 +-
 1080i/ProfileSettings.xml                    |   2 +-
 1080i/Settings.xml                           |   2 +-
 1080i/SettingsCategory.xml                   |   4 +-
 1080i/SettingsProfile.xml                    |   2 +-
 1080i/SkinSettings.xml                       |   6 +-
 1080i/VideoOSD.xml                           | 330 +++++--------------
 1080i/View_Addons.xml                        |  85 +++--
 1080i/View_Albums.xml                        |  95 ++++--
 1080i/View_Artists.xml                       |  23 +-
 1080i/View_Episodes.xml                      |  33 +-
 1080i/View_Files.xml                         |   2 +-
 1080i/View_LiveTVChannels.xml                | 143 +++-----
 1080i/View_Movies.xml                        |   5 +-
 1080i/View_MusicFiles.xml                    |   2 +-
 1080i/View_MusicRecentItems.xml              | 191 +++++++----
 1080i/View_Seasons.xml                       |  97 ++++--
 1080i/View_Songs.xml                         |   6 +-
 1080i/View_TVShows.xml                       |   6 +-
 1080i/View_VideoRecentItems.xml              |   6 +-
 1080i/custom_menuItemTypeSelector.xml        |  36 +-
 1080i/custom_recentItemTypeSelector.xml      |  12 +-
 1080i/script-RCB-gameinfo.xml                |   4 +-
 1080i/script-Rom_Collection_Browser-main.xml |   2 +-
 addon.xml                                    |   2 +-
 colors/defaults.xml                          |   7 +-
 language/English/strings.po                  |   4 +
 59 files changed, 838 insertions(+), 884 deletions(-)

diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 8c28ec8..a6b2338 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -17,7 +17,7 @@
                 <width>24-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <!--title-->
diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index 85767c1..1ebe335 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -16,7 +16,7 @@
                 <width>18-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <!--title-->
@@ -101,7 +101,7 @@
                     <posy>4-row</posy>
                     <font>textbox</font>
                     <width>12-col-gutter</width>
-                    <height>340</height>
+                    <height>6-row</height>
                     <label>$INFO[ListItem.Property(Addon.Description)]</label>
                     <autoscroll delay="5000" time="1000" repeat="10000"/>
                 </control>
@@ -136,7 +136,7 @@
                             <width>5-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
-                            <font>menuTitle</font>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label]</label>
                         </control>
@@ -149,7 +149,7 @@
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
-                            <colordiffuse>500</colordiffuse>
+                            <colordiffuse>highlight</colordiffuse>
                             <include>spinFocusIcon</include>
                         </control>
                         <control type="image">
@@ -178,7 +178,7 @@
                             <width>5-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
-                            <font>menuTitle</font>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>-</shadowcolor>
diff --git a/1080i/DialogAddonSettings.xml b/1080i/DialogAddonSettings.xml
index 05efd25..1ec3dc8 100644
--- a/1080i/DialogAddonSettings.xml
+++ b/1080i/DialogAddonSettings.xml
@@ -31,7 +31,7 @@
                 <width>20-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
 
diff --git a/1080i/DialogButtonMenu.xml b/1080i/DialogButtonMenu.xml
index 19074de..56f2a1d 100644
--- a/1080i/DialogButtonMenu.xml
+++ b/1080i/DialogButtonMenu.xml
@@ -38,7 +38,7 @@
                         <aspectratio scalediffuse="false">scale</aspectratio>
                         <texture border="0">colors/white.png</texture>
                         <bordersize>0</bordersize>
-                        <colordiffuse>500</colordiffuse>
+                        <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>12</posx>
diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml
index 2d433e3..a85de43 100644
--- a/1080i/DialogContextMenu.xml
+++ b/1080i/DialogContextMenu.xml
@@ -12,7 +12,7 @@
         </control>
         <control type="button" id="1000">
             <description>Buttons</description>
-            <texturefocus colordiffuse="500">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
             <width>6-col</width>
         </control>
diff --git a/1080i/DialogExtendedProgressBar.xml b/1080i/DialogExtendedProgressBar.xml
index a740d58..c3cbc39 100644
--- a/1080i/DialogExtendedProgressBar.xml
+++ b/1080i/DialogExtendedProgressBar.xml
@@ -21,7 +21,7 @@
                     <width>24</width>
                     <height>3-row</height>
                     <texture>colors/white.png</texture>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="image">
                     <posx>0</posx>
diff --git a/1080i/DialogKaiToast.xml b/1080i/DialogKaiToast.xml
index 0305876..299af5d 100644
--- a/1080i/DialogKaiToast.xml
+++ b/1080i/DialogKaiToast.xml
@@ -23,7 +23,7 @@
                     <width>24</width>
                     <height>3-row</height>
                     <texture>colors/white.png</texture>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="image">
                     <posx>0</posx>
diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml
index feacc5d..4e48748 100644
--- a/1080i/DialogKeyboard.xml
+++ b/1080i/DialogKeyboard.xml
@@ -61,7 +61,7 @@
                         <onup>312</onup>
                         <ondown>302</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -79,7 +79,7 @@
                         <onup>312</onup>
                         <ondown>302</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -96,7 +96,7 @@
                         <onup>312</onup>
                         <ondown>120</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -111,7 +111,7 @@
                         <onup>312</onup>
                         <ondown>121</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -126,7 +126,7 @@
                         <onup>312</onup>
                         <ondown>122</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -141,7 +141,7 @@
                         <onup>312</onup>
                         <ondown>123</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -156,7 +156,7 @@
                         <onup>312</onup>
                         <ondown>124</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -171,7 +171,7 @@
                         <onup>312</onup>
                         <ondown>125</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -186,7 +186,7 @@
                         <onup>312</onup>
                         <ondown>126</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -201,7 +201,7 @@
                         <onup>312</onup>
                         <ondown>127</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -216,7 +216,7 @@
                         <onup>312</onup>
                         <ondown>128</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -231,7 +231,7 @@
                         <onup>312</onup>
                         <ondown>129</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -246,7 +246,7 @@
                         <onup>312</onup>
                         <ondown>130</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -261,7 +261,7 @@
                         <onup>312</onup>
                         <ondown>131</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -282,7 +282,7 @@
                         <onup>300</onup>
                         <ondown>303</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textureradioonfocus>-</textureradioonfocus>
                         <textureradioonnofocus>-</textureradioonnofocus>
                         <textureradioofffocus>-</textureradioofffocus>
@@ -306,7 +306,7 @@
                         <onup>100</onup>
                         <ondown>140</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -322,7 +322,7 @@
                         <onup>101</onup>
                         <ondown>141</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -338,7 +338,7 @@
                         <onup>102</onup>
                         <ondown>142</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -354,7 +354,7 @@
                         <onup>103</onup>
                         <ondown>143</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -370,7 +370,7 @@
                         <onup>104</onup>
                         <ondown>144</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -386,7 +386,7 @@
                         <onup>105</onup>
                         <ondown>145</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -402,7 +402,7 @@
                         <onup>106</onup>
                         <ondown>146</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -418,7 +418,7 @@
                         <onup>107</onup>
                         <ondown>147</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -434,7 +434,7 @@
                         <onup>108</onup>
                         <ondown>148</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -450,7 +450,7 @@
                         <onup>109</onup>
                         <ondown>149</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -466,7 +466,7 @@
                         <onup>110</onup>
                         <ondown>150</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -482,7 +482,7 @@
                         <onup>111</onup>
                         <ondown>151</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -504,7 +504,7 @@
                         <onup>302</onup>
                         <ondown>304</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textureradioonfocus>-</textureradioonfocus>
                         <textureradioonnofocus>-</textureradioonnofocus>
                         <textureradioofffocus>-</textureradioofffocus>
@@ -529,7 +529,7 @@
                         <onup>120</onup>
                         <ondown>160</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -545,7 +545,7 @@
                         <onup>121</onup>
                         <ondown>161</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -561,7 +561,7 @@
                         <onup>122</onup>
                         <ondown>162</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -577,7 +577,7 @@
                         <onup>123</onup>
                         <ondown>163</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -593,7 +593,7 @@
                         <onup>124</onup>
                         <ondown>164</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -609,7 +609,7 @@
                         <onup>125</onup>
                         <ondown>165</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -625,7 +625,7 @@
                         <onup>126</onup>
                         <ondown>166</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -641,7 +641,7 @@
                         <onup>127</onup>
                         <ondown>167</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -657,7 +657,7 @@
                         <onup>128</onup>
                         <ondown>168</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -673,7 +673,7 @@
                         <onup>129</onup>
                         <ondown>169</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -689,7 +689,7 @@
                         <onup>130</onup>
                         <ondown>170</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -705,7 +705,7 @@
                         <onup>131</onup>
                         <ondown>171</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -727,7 +727,7 @@
                         <onup>303</onup>
                         <ondown>309</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textureradioonfocus>-</textureradioonfocus>
                         <textureradioonnofocus>-</textureradioonnofocus>
                         <textureradioofffocus>-</textureradioofffocus>
@@ -749,7 +749,7 @@
                         <width>2-col</width>
                         <height>1-col</height>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <label>IP</label>
                         <textoffsetx>0</textoffsetx>
                         <onleft>304</onleft>
@@ -771,7 +771,7 @@
                         <onup>140</onup>
                         <ondown>32</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -787,7 +787,7 @@
                         <onup>141</onup>
                         <ondown>32</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -803,7 +803,7 @@
                         <onup>142</onup>
                         <ondown>32</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -819,7 +819,7 @@
                         <onup>143</onup>
                         <ondown>32</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -835,7 +835,7 @@
                         <onup>144</onup>
                         <ondown>32</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -851,7 +851,7 @@
                         <onup>145</onup>
                         <ondown>32</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -867,7 +867,7 @@
                         <onup>146</onup>
                         <ondown>305</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -883,7 +883,7 @@
                         <onup>147</onup>
                         <ondown>306</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -899,7 +899,7 @@
                         <onup>148</onup>
                         <ondown>8</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -915,7 +915,7 @@
                         <onup>149</onup>
                         <ondown>8</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -931,7 +931,7 @@
                         <onup>150</onup>
                         <ondown>8</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -947,7 +947,7 @@
                         <onup>151</onup>
                         <ondown>111</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -969,7 +969,7 @@
                         <onup>304</onup>
                         <ondown>312</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
                         <align>center</align>
@@ -983,7 +983,7 @@
                         <height>1-col</height>
                         <label>20182</label>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -1006,7 +1006,7 @@
                         <onup>171</onup>
                         <ondown>312</ondown>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -1021,7 +1021,7 @@
                         <height>1-col</height>
                         <label>&lt;</label>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
@@ -1039,7 +1039,7 @@
                         <height>1-col</height>
                         <label>&gt;</label>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                        <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                         <textoffsetx>0</textoffsetx>
                         <focusedcolor>selected</focusedcolor>
                         <textcolor>textActive</textcolor>
diff --git a/1080i/DialogMuteBug.xml b/1080i/DialogMuteBug.xml
index 07a4c49..4226d89 100644
--- a/1080i/DialogMuteBug.xml
+++ b/1080i/DialogMuteBug.xml
@@ -24,7 +24,7 @@
                     <width>24</width>
                     <height>3-row</height>
                     <texture>colors/white.png</texture>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="image">
                     <posx>0</posx>
diff --git a/1080i/DialogNumeric.xml b/1080i/DialogNumeric.xml
index b5c72c4..62f6866 100644
--- a/1080i/DialogNumeric.xml
+++ b/1080i/DialogNumeric.xml
@@ -55,7 +55,7 @@
                     <onup>20</onup>
                     <ondown>14</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -72,7 +72,7 @@
                     <onup>10</onup>
                     <ondown>15</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -89,7 +89,7 @@
                     <onup>22</onup>
                     <ondown>16</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -107,7 +107,7 @@
                     <onup>21</onup>
                     <ondown>21</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                     <font>buttonTitle</font>
@@ -126,7 +126,7 @@
                     <onup>11</onup>
                     <ondown>17</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -143,7 +143,7 @@
                     <onup>12</onup>
                     <ondown>18</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -160,7 +160,7 @@
                     <onup>13</onup>
                     <ondown>19</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -178,7 +178,7 @@
                     <onup>23</onup>
                     <ondown>23</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                     <font>buttonTitle</font>
@@ -197,7 +197,7 @@
                     <onup>14</onup>
                     <ondown>20</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -214,7 +214,7 @@
                     <onup>15</onup>
                     <ondown>10</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -231,7 +231,7 @@
                     <onup>16</onup>
                     <ondown>22</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -249,7 +249,7 @@
                     <onup>17</onup>
                     <ondown>11</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -266,7 +266,7 @@
                     <onup>18</onup>
                     <ondown>12</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
@@ -283,7 +283,7 @@
                     <onup>19</onup>
                     <ondown>13</ondown>
                     <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
-                    <texturefocus colordiffuse="keyboardActive">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
                     <focusedcolor>selected</focusedcolor>
                     <textcolor>textActive</textcolor>
                 </control>
diff --git a/1080i/DialogPVRGroupManager.xml b/1080i/DialogPVRGroupManager.xml
index 463d103..c87d369 100644
--- a/1080i/DialogPVRGroupManager.xml
+++ b/1080i/DialogPVRGroupManager.xml
@@ -86,7 +86,7 @@
                     <posy>0</posy>
                     <width>6-col</width>
                     <font>itemSubTitle</font>
-                    <textcolor>textAccented</textcolor>
+                    <textcolor>highlight</textcolor>
                 </control>
                 <control type="panel" id="12">
                     <posx>0</posx>
@@ -152,7 +152,7 @@
                     <posy>0</posy>
                     <width>6-col</width>
                     <font>itemSubTitle</font>
-                    <textcolor>textAccented</textcolor>
+                    <textcolor>highlight</textcolor>
                 </control>
                 <control type="panel" id="11">
                     <posx>0</posx>
diff --git a/1080i/DialogPVRGuideInfo.xml b/1080i/DialogPVRGuideInfo.xml
index 298f8ca..f0a9091 100644
--- a/1080i/DialogPVRGuideInfo.xml
+++ b/1080i/DialogPVRGuideInfo.xml
@@ -14,109 +14,118 @@
         </control>
         <control type="group">
             <posx>col-7-begin</posx>
-            <posy>row-4-begin</posy>
+            <posy>row-5-begin</posy>
             <include>modalDialogInOut</include>
-            <!--channel / duration-->
-            <control type="label">
-                <description>Channel name</description>
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>12-col</width>
-                <font>itemSubTitle</font>
-                <label>$INFO[ListItem.channelname]</label>
-            </control>
             <!--title-->
             <control type="label">
                 <description>Programme title</description>
                 <posx>0</posx>
-                <posy>58</posy>
+                <posy>0</posy>
                 <width>12-col</width>
                 <align>left</align>
                 <font>mediumStrong</font>
-                <textcolor>textActive</textcolor>
+                <textcolor>highlight</textcolor>
                 <label>$INFO[ListItem.Title]</label>
-                
-                
             </control>
             <control type="label">
                 <description>Channel name</description>
                 <posx>0</posx>
-                <posy>118</posy>
+                <posy>2-row</posy>
                 <width>12-col</width>
-                <font>itemSubTitle</font>
-                <label>[B]$INFO[ListItem.starttime] - $INFO[ListItem.endtime] ($INFO[ListItem.duration])[/B]</label>
+                <font>itemTitle</font>
+                <label>$INFO[ListItem.starttime] - $INFO[ListItem.endtime]</label>
             </control>
             <!--synopsis-->
             <control type="textbox">
                 <posx>0</posx>
-                <posy>178</posy>
-                <font>textboxExtraLeading</font>
+                <posy>4-row</posy>
+                <font>textbox</font>
                 <width>12-col</width>
                 <align>left</align>
                 <textcolor>textActive</textcolor>
                 <height>340</height>
-                <label>[B]$INFO[ListItem.plot][/B]</label>
+                <label>$INFO[ListItem.plot]</label>
                 <autoscroll delay="10000" time="1000" repeat="10000"/>
             </control>
             <!--View / record buttons-->
             <control type="list" id="9000">
                 <posx>0</posx>
-                <posy>10-row</posy>
+                <posy>18-row</posy>
                 <width>12-col</width>
-                <height>1-row</height>
+                <height>2-row</height>
                 <itemgap>3</itemgap>
                 <orientation>horizontal</orientation>
-                <itemlayout width="6-col" height="1-row">
+                <itemlayout width="6-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
+                        <posy>0</posy>
                         <width>6-col</width>
-                        <height>53</height>
+                        <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/black.png</texture>
                     </control>
                     <control type="label">
-                        <posx>24</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <align>center</align>
                         <font>symbol</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
-                        <posx>1-col</posx>
-                        <posy>2</posy>
-                        <width>5-col</width>
-                        <font>menuTitle</font>
+                        <posx>1-col-indent</posx>
+                        <posy>0</posy>
+                        <width>6-col</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
                 </itemlayout>
-                <focusedlayout width="6-col" height="1-row">
+                <focusedlayout width="6-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
-                        <width>6-col</width>
-                        <height>53</height>
+                        <posy>0</posy>
+                        <width>1-col-textbox</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                        <include>spinFocusIcon</include>
+                    </control>
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>5-col</width>
+                        <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                     </control>
                     <control type="label">
-                        <posx>24</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <align>center</align>
                         <font>symbol</font>
-                        <textcolor>black</textcolor>
+                        <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
-                        <posx>1-col</posx>
-                        <posy>2</posy>
-                        <width>5-col</width>
-                        <font>menuTitle</font>
+                        <posx>1-col-indent</posx>
+                        <posy>0</posy>
+                        <width>6-col</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
                         <textcolor>black</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
diff --git a/1080i/DialogProgress.xml b/1080i/DialogProgress.xml
index fcc7dd1..e1615dc 100644
--- a/1080i/DialogProgress.xml
+++ b/1080i/DialogProgress.xml
@@ -26,7 +26,7 @@
                     <width>24</width>
                     <height>3-row</height>
                     <texture>colors/white.png</texture>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="image">
                     <posx>0</posx>
diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml
index ec2caf5..51fa830 100644
--- a/1080i/DialogSeekBar.xml
+++ b/1080i/DialogSeekBar.xml
@@ -5,60 +5,57 @@
     <visible>!Window.IsActive(5901) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
     <controls>
         <control type="group">
-            <posx>col-1-begin</posx>
-            <posy>row-9-begin</posy>
+            <posx>0</posx>
+            <posy>row-13-begin</posy>
             <!--animations-->
             <animation type="Windowopen">
                 <effect type="fade" start="0" end="100" delay="0" time="200"/>
             </animation>
             <animation type="Windowclose">
                 <effect type="fade" start="100" end="0" delay="0" time="200"/>
-                <effect type="slide" start="0,0" end="0,50" tween="cubic" easing="out" time="300"/>
             </animation>
             <!--background-->
             <control type="image">
-                <posx>-200</posx>
-                <posy>-12</posy>
-                <width>2500</width>
-                <height>175</height>
+                <posx>0</posx>
+                <posy>-16</posy>
+                <width>fullscreenWidth</width>
+                <height>6-row</height>
                 <aspectratio>stretch</aspectratio>
                 <texture>colors/black.png</texture>
                 <colordiffuse>99FFFFFF</colordiffuse>
             </control>
             <control type="label">
                 <visible>Player.Playing | player.seeking</visible>
-                <posx>3-col</posx>
-                <posy>-13</posy>
+                <posx>col-3-begin</posx>
+                <posy>0</posy>
                 <width>16-col-gutter</width>
                 <font>smallStrong</font>
-                <textcolor>textActive</textcolor>
+                <textcolor>highlight</textcolor>
                 <label>31120</label>
-                <shadowcolor>-</shadowcolor>
             </control>
             <control type="label">
                 <visible>Player.Paused + !Player.Caching</visible>
-                <posx>3-col</posx>
-                <posy>-13</posy>
+                <posx>col-3-begin</posx>
+                <posy>0</posy>
                 <width>16-col-gutter</width>
                 <font>smallStrong</font>
-                <textcolor>textActive</textcolor>
+                <textcolor>highlight</textcolor>
                 <label>112</label>
-                <shadowcolor>-</shadowcolor>
             </control>
             <control type="label">
                 <description>buffering</description>
-                <posx>3-col</posx>
-                <posy>-13</posy>
+                <posx>col-3-begin</posx>
+                <posy>0</posy>
                 <width>16-col-gutter</width>
                 <font>smallStrong</font>
-                <textcolor>textActive</textcolor>
+                <textcolor>highlight</textcolor>
                 <label>$LOCALIZE[15107] $INFO[Player.CacheLevel]%</label>
                 <visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
             </control>
             <control type="label">
                 <visible>System.HasMediaDVD</visible>
                 <posx>21-col</posx>
-                <posy>-13</posy>
+                <posy>0</posy>
                 <width>4-col-gutter</width>
                 <font>smallStrong</font>
                 <align>right</align>
@@ -69,34 +66,33 @@
             <control type="label">
                 <visible>!Player.Caching</visible>
                 <posx>5-col</posx>
-                <posy>-13</posy>
+                <posy>0</posy>
                 <width>12-col</width>
                 <font>smallMedium</font>
                 <textcolor>textActive</textcolor>
-                <label>[UPPERCASE]$INFO[VideoPlayer.TVShowTitle][/UPPERCASE]</label>
+                <label>$INFO[VideoPlayer.TVShowTitle]</label>
                 <shadowcolor>-</shadowcolor>
             </control>
             <control type="label">
-                <posx>3-col</posx>
-                <posy>31</posy>
+                <posx>col-3-begin</posx>
+                <posy>1-row</posy>
                 <width>18-col</width>
+                <height>2-row</height>
+                <aligny>center</aligny>
                 <font>largeTitle</font>
                 <textcolor>textActive</textcolor>
                 <label>$INFO[Player.Title]</label>
-                <shadowcolor>-</shadowcolor>
-
-
             </control>
             <control type="progress">
                 <description>Progress Bar</description>
-                <posx>3-col</posx>
-                <posy>94</posy>
+                <posx>col-3-begin</posx>
+                <posy>114</posy>
                 <width>18-col</width>
                 <info>Player.Progress</info>
             </control>
             <control type="label">
-                <posx>3-col</posx>
-                <posy>110</posy>
+                <posx>col-3-begin</posx>
+                <posy>4-row</posy>
                 <width>24-col</width>
                 <font>smallStrong</font>
                 <textcolor>textActive</textcolor>
@@ -105,7 +101,7 @@
             </control>
             <control type="label">
                 <posx>350</posx>
-                <posy>110</posy>
+                <posy>4-row</posy>
                 <width>24-col</width>
                 <font>smallStrong</font>
                 <textcolor>textActive</textcolor>
@@ -113,8 +109,8 @@
                 <shadowcolor>-</shadowcolor>
             </control>
             <control type="label">
-                <posx>1512</posx>
-                <posy>110</posy>
+                <right>col-3-begin</right>
+                <posy>4-row</posy>
                 <width>24-col</width>
                 <font>smallStrong</font>
                 <align>right</align>
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index 0cd0db3..aa43f1c 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -18,7 +18,7 @@
                     <width>18-col</width>
                     <height>2-row</height>
                     <texture>colors/white.png</texture>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
                 <control type="image">
@@ -186,10 +186,10 @@
                 <!--larger thumbnail-->
                 <control type="image">
                     <posx>12-col-indent</posx>
-                    <posy>2-row</posy>
+                    <posy>3-row</posy>
                     <width>6-col-gutter</width>
                     <height>6-col-gutter</height>
-                    <aspectratio scalediffuse="false" align="left" aligny="center">keep</aspectratio>
+                    <aspectratio scalediffuse="false" align="center" aligny="center">keep</aspectratio>
                     <texture border="0">$INFO[container(6).Listitem.icon]</texture>
                     <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
                     <bordersize>3</bordersize>
@@ -208,12 +208,21 @@
                 <control type="panel" id="9999">
                     <visible>control.isvisible(3) | control.isvisible(5)</visible>
                     <posx>12-col</posx>
-                    <posy>13-row</posy>
+                    <posy>19-row</posy>
                     <width>6-col</width>
                     <height>6-row</height>
                     <orientation>vertical</orientation>
                     <onleft>9000</onleft>
                     <itemlayout width="6-col" height="2-row">
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>1-col-textbox</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/black.png</texture>
+                            <colordiffuse>textboxInactive</colordiffuse>
+                        </control>
                         <control type="label">
                             <posx>0</posx>
                             <posy>0</posy>
@@ -226,13 +235,22 @@
                             <label>$INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
+                        <control type="image">
+                            <posx>1-col</posx>
+                            <posy>0</posy>
+                            <width>5-col</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/black.png</texture>
+                            <colordiffuse>textboxInactive</colordiffuse>
+                        </control>
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
                             <width>5-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
-                            <font>menuTitle</font>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>-</shadowcolor>
@@ -246,7 +264,7 @@
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
-                            <colordiffuse>500</colordiffuse>
+                            <colordiffuse>highlight</colordiffuse>
                             <include>spinFocusIcon</include>
                         </control>
                         <control type="image">
@@ -275,7 +293,7 @@
                             <width>5-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
-                            <font>menuTitle</font>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>-</shadowcolor>
diff --git a/1080i/DialogSlider.xml b/1080i/DialogSlider.xml
index 1553db0..f5eca38 100644
--- a/1080i/DialogSlider.xml
+++ b/1080i/DialogSlider.xml
@@ -22,7 +22,7 @@
                     <width>24</width>
                     <height>3-row</height>
                     <texture>colors/white.png</texture>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="image">
                     <posx>0</posx>
diff --git a/1080i/DialogSongInfo.xml b/1080i/DialogSongInfo.xml
index 44c6ce6..84936e8 100644
--- a/1080i/DialogSongInfo.xml
+++ b/1080i/DialogSongInfo.xml
@@ -32,7 +32,7 @@
                 <posy>1-row</posy>
                 <width>6-col</width>
                 <font>itemTitle</font>
-                <label>[COLOR textAccented]$INFO[ListItem.artist,, ][/COLOR]$INFO[ListItem.Album]</label>
+                <label>[COLOR highlight]$INFO[ListItem.artist,, ][/COLOR]$INFO[ListItem.Album]</label>
                 <textcolor>textActive</textcolor>
             </control>
             <!--song ratings-->
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index 0174c3a..5fb8fba 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -58,7 +58,7 @@
                 <width>12-col</width>
                 <height>2-row</height>
                 <font>itemTitle</font>
-                <textcolor>textAccented</textcolor>
+                <textcolor>highlight</textcolor>
                 <wrapmultiline>true</wrapmultiline>
             </control>
             <!-- ** Required ** Do not change <id>or<type>-->
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index f91ebbf..da91352 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -71,7 +71,7 @@
                 <width>10-col</width>
                 <height>row-5-begin</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
@@ -95,7 +95,7 @@
                         <posy>0</posy>
                         <width>4-col-gutter</width>
                         <font>itemSubTitle</font>
-                        <textcolor>textAccented</textcolor>
+                        <textcolor>highlight</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
@@ -238,7 +238,7 @@
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
-                        <colordiffuse>500</colordiffuse>
+                        <colordiffuse>highlight</colordiffuse>
                         <include>spinFocusIcon</include>
                     </control>
                     <control type="image">
@@ -342,48 +342,30 @@
                 <posx>col-7-begin</posx>
                 <posy>row-15-begin</posy>
                 <!--titles-->
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>12-col</width>
-                    <height>3-row</height>
-                    <texture>colors/white.png</texture>
-                    <colordiffuse>500</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
                 <control type="label">
                     <description>Episode title</description>
-                    <posx>12</posx>
+                    <posx>0</posx>
                     <posy>0</posy>
                     <width>12-col-gutter</width>
                     <height>3-row</height>
                     <align>left</align>
                     <aligny>center</aligny>
-                    <font>regularStrong</font>
-                    <textcolor>textActive</textcolor>
+                    <font>mediumStrong</font>
+                    <textcolor>highlight</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <label>$INFO[ListItem.Label]</label>
                     <wrapmultiline>true</wrapmultiline>
                 </control>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>3-row</posy>
-                    <width>12-col</width>
-                    <height>1-row</height>
-                    <texture>colors/white.png</texture>
-                    <colordiffuse>ffffffff</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
                 <control type="label">
-                    <posx>12</posx>
+                    <posx>0</posx>
                     <posy>3-row</posy>
                     <width>12-col-gutter</width>
                     <align>left</align>
                     <aligny>center</aligny>
-                    <font>itemSubTitle</font>
-                    <textcolor>black</textcolor>
+                    <font>itemTitle</font>
+                    <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
-                    <label>$INFO[listitem.duration,, $LOCALIZE[31018]  |  ]$INFO[ListItem.Premiered,$LOCALIZE[20416] ,,]$INFO[listitem.mpaa,  |  $LOCALIZE[31174] ,]</label>
+                    <label>$INFO[listitem.duration,, $LOCALIZE[31018]]</label>
                 </control>
                 <!--synopsis-->
                 <control type="textbox">
@@ -446,7 +428,7 @@
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
-                            <colordiffuse>500</colordiffuse>
+                            <colordiffuse>highlight</colordiffuse>
                             <include>spinFocusIcon</include>
                         </control>
                         <control type="image">
diff --git a/1080i/DialogVolumeBar.xml b/1080i/DialogVolumeBar.xml
index 176d46a..e0e16db 100644
--- a/1080i/DialogVolumeBar.xml
+++ b/1080i/DialogVolumeBar.xml
@@ -18,7 +18,7 @@
                     <width>24</width>
                     <height>3-row</height>
                     <texture>colors/white.png</texture>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="image">
                     <posx>0</posx>
diff --git a/1080i/DialogYesNo.xml b/1080i/DialogYesNo.xml
index f2cb307..7874cdb 100644
--- a/1080i/DialogYesNo.xml
+++ b/1080i/DialogYesNo.xml
@@ -14,6 +14,17 @@
             <control type="group">
                 <posx>col-9-begin</posx>
                 <posy>0</posy>
+                 <control type="image">
+                    <posx>-36</posx>
+                    <posy>-36</posy>
+                    <width>9-col</width>
+                    <height>8-row</height>
+                    <texture>colors/black.png</texture>
+                    <aspectratio>stretch</aspectratio>
+                    <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                    <bordersize>3</bordersize>
+                    <colordiffuse>ffffffff</colordiffuse>
+                </control>
                 <control type="label" id="1">
                     <description>heading</description>
                     <posx>0</posx>
@@ -47,14 +58,18 @@
                 <!--selection buttons-->
                 <control type="button" id="10">
                     <description>No</description>
-                    <texturefocus colordiffuse="500">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                    <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
                     <focusedcolor>textActive</focusedcolor>
+                    <align>center</align>
                     <label>106</label>
                 </control>
                 <control type="button" id="11">
                     <description>Yes</description>
-                    <texturefocus colordiffuse="500">colors/white.png</texturefocus>
+                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                    <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
                     <focusedcolor>textActive</focusedcolor>
+                    <align>center</align>
                     <label>107</label>
                 </control>
             </control>
diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml
index f111270..55b9a97 100644
--- a/1080i/FileManager.xml
+++ b/1080i/FileManager.xml
@@ -81,7 +81,7 @@
                         <info>ListItem.Label2</info>
                         <font>itemTitle</font>
                         <shadowcolor>-</shadowcolor>
-                        <textcolor>textAccented</textcolor>
+                        <textcolor>highlight</textcolor>
                     </control>
                 </itemlayout>
                 <focusedlayout height="1-row" width="12-col-gutter">
@@ -162,7 +162,7 @@
                         <info>ListItem.Label2</info>
                         <font>itemTitle</font>
                         <shadowcolor>-</shadowcolor>
-                        <textcolor>textAccented</textcolor>
+                        <textcolor>highlight</textcolor>
                     </control>
                 </itemlayout>
                 <focusedlayout height="1-row" width="12-col-gutter">
diff --git a/1080i/Font.xml b/1080i/Font.xml
index 94a0e2c..9623e23 100644
--- a/1080i/Font.xml
+++ b/1080i/Font.xml
@@ -96,7 +96,7 @@
         <!--element specific-->
         <font>
             <name>textbox</name>
-            <filename>roboto/regular.ttf</filename>
+            <filename>roboto/medium.ttf</filename>
             <size>30</size>
             <linespacing>1.1</linespacing>
         </font>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 04592b8..16bde75 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -10,6 +10,7 @@
         <include>globalBackground</include>
         <!--home background-->
         <control type="image">
+            <visible>false</visible>
             <include>dimensionsFullscreen</include>
             <aspectratio scalediffuse="false">scale</aspectratio>
             <texture border="0">$INFO[skin.string(homeBackground)]</texture>
@@ -24,7 +25,7 @@
         </control>
         <!--browse controls-->
         <control type="group">
-            <posx>0</posx>
+            <posx>24</posx>
             <posy>row-1-begin</posy>
             <control type="list" id="9000">
                 <posx>0</posx>
@@ -43,7 +44,7 @@
                         <width>1-col-textbox</width>
                         <height>1-col-textbox</height>
                         <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture border="0">colors/black.png</texture>
+                        <texture diffuse="masks/circle.png" border="0">colors/black.png</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>textboxInactive</colordiffuse>
                     </control>
@@ -68,9 +69,9 @@
                             <width>2-col-textbox</width>
                             <height>2-col-textbox</height>
                             <aspectratio scalediffuse="false">scale</aspectratio>
-                            <texture border="0">colors/white.png</texture>
+                            <texture diffuse="masks/circle.png" border="0">colors/white.png</texture>
                             <bordersize>0</bordersize>
-                            <colordiffuse>500</colordiffuse>
+                            <colordiffuse>highlight</colordiffuse>
                             <animation type="focus" loop="false" reversible="false">
                                 <effect type="rotatey" start="0" end="-15" center="70" tween="back" easing="out" time="300"/>
                                 <effect type="rotatey" start="0" end="15" center="70" tween="back" easing="out" delay="300" time="300"/>
@@ -78,7 +79,7 @@
                         </control>
                         <control type="label">
                             <posx>0</posx>
-                            <posy>0</posy>
+                            <posy>-2</posy>
                             <width>2-col-textbox</width>
                             <height>2-col-textbox</height>
                             <align>center</align>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index b0e6e81..fd30eb0 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -47,12 +47,6 @@
             <colordiffuse>background</colordiffuse>
             <aspectratio>stretch</aspectratio>
         </control>
-        <control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>vignette.png</texture>
-            <colordiffuse>ffffffff</colordiffuse>
-            <aspectratio>stretch</aspectratio>
-        </control>
     </include>
     <!--date and time-->
     <include name="dateTime">
@@ -119,10 +113,6 @@
      <!--conditional positioning for progress dialogs (avoid overlaps)-->
     <include name="progressPosition1"><posy>row-2-begin</posy></include>
     <include name="progressPosition2"><posy>row-6-begin</posy></include>
-    <!--scroll suppression for low power mode-->
-    <!--text scrolling suppression for low power mode-->
-    <include name="scrollSuppressionActive"><scroll>False</scroll></include>
-    <include name="scrollSuppressionInactive"><scroll>True</scroll></include>
    <!--debugging-->
     <include name="DialogID">
         <posx>15</posx>
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index 60cde55..26ab70d 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -17,7 +17,7 @@
                 <width>col-7-begin</width>
                 <height>fullscreenHeight</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="list" id="9001">
@@ -37,7 +37,7 @@
                         <height>2-row</height>
                         <font>menuTitle</font>
                         <aligny>center</aligny>
-                        <textcolor>50</textcolor>
+                        <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
@@ -49,7 +49,7 @@
                         <width>col-7-begin</width>
                         <height>2-row</height>
                         <texture>colors/white.png</texture>
-                        <colordiffuse>50</colordiffuse>
+                        <colordiffuse>textActive</colordiffuse>
                         <aspectratio>stretch</aspectratio>
                     </control>
                     <control type="label">
@@ -59,7 +59,7 @@
                         <height>2-row</height>
                         <font>menuTitle</font>
                         <aligny>center</aligny>
-                        <textcolor>500</textcolor>
+                        <textcolor>highlight</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
@@ -84,7 +84,7 @@
                 <width>col-7-begin</width>
                 <height>fullscreenHeight</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <!--menu items-->
diff --git a/1080i/Includes_hubMenuSubItems.xml b/1080i/Includes_hubMenuSubItems.xml
index abc937d..7a79879 100644
--- a/1080i/Includes_hubMenuSubItems.xml
+++ b/1080i/Includes_hubMenuSubItems.xml
@@ -8,10 +8,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-7-begin</textoffsetx>
             <label>31123</label>
@@ -24,10 +24,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>137</label>
@@ -42,10 +42,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>137</label>
@@ -57,10 +57,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>103</label>
@@ -73,10 +73,10 @@
             <width>col-7-begin</width>
             <width>4-col</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
         </control>
@@ -85,10 +85,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>31119</label>
@@ -101,10 +101,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>31041</label>
@@ -116,10 +116,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>31175</label>
@@ -131,10 +131,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>653</label>
@@ -147,10 +147,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
         </control>
@@ -162,10 +162,10 @@
             <width>col-7-begin</width>
             <font>menuTitle</font>
             <textoffsetx>col-1-begin</textoffsetx>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <onclick>right</onclick>
             <onclick>Filter</onclick>
@@ -177,10 +177,10 @@
             <width>col-7-begin</width>
             <font>menuTitle</font>
             <textoffsetx>col-1-begin</textoffsetx>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <onclick>right</onclick>
             <onclick>xbmc.mastermode</onclick>
@@ -197,10 +197,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>31123</label>
@@ -213,10 +213,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>137</label>
@@ -229,10 +229,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>103</label>
@@ -245,10 +245,10 @@
             <width>col-7-begin</width>
             <width>4-col</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
         </control>
@@ -256,10 +256,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>31041</label>
@@ -271,10 +271,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>31175</label>
@@ -285,10 +285,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>653</label>
@@ -300,10 +300,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>191</label>
@@ -313,10 +313,10 @@
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
-            <textcolor>50</textcolor>
-            <focusedcolor>500</focusedcolor>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>589</label>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index eec8bf7..294d34e 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -33,10 +33,10 @@
         <value condition="Window.IsActive(musicfiles) + SubString(container.foldername,playlists)">$LOCALIZE[20011]</value>
         <value condition="Window.IsActive(musicfiles) + !Substring(Container.folderpath,plugin)">$LOCALIZE[31077]</value>
         <value condition="Substring(Container.folderpath,plugin)">$INFO[container.foldername]</value>
-        <value condition="Container.Content(movies)">$LOCALIZE[20342] [COLOR textAccented]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
-        <value condition="Container.Content(seasons) | Container.Content(tvshows) | Container.Content(episodes)">$LOCALIZE[20343] [COLOR textAccented]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
+        <value condition="Container.Content(movies)">$LOCALIZE[20342] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
+        <value condition="Container.Content(seasons) | Container.Content(tvshows) | Container.Content(episodes)">$LOCALIZE[20343] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
         <value condition="Container.Content(addons)">$LOCALIZE[31010]</value>
-        <value condition="Container.Content(albums)">$LOCALIZE[31037] [COLOR textAccented]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
+        <value condition="Container.Content(albums)">$LOCALIZE[31037] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
         <value condition="Container.Content(songs)">$LOCALIZE[31182]</value>
         <value condition="!isEmpty(container.foldername)">$INFO[container.foldername]</value>
         <value>$LOCALIZE[14022]</value>
diff --git a/1080i/LoginScreen.xml b/1080i/LoginScreen.xml
index 6e62ace..8524611 100644
--- a/1080i/LoginScreen.xml
+++ b/1080i/LoginScreen.xml
@@ -32,7 +32,7 @@
                         <height>1-row</height>
                         <font>itemTitle</font>
                         <align>center</align>
-                        <textcolor>textAccented</textcolor>
+                        <textcolor>highlight</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
diff --git a/1080i/MyMusicPlaylist.xml b/1080i/MyMusicPlaylist.xml
index 6775e13..c0dacbb 100644
--- a/1080i/MyMusicPlaylist.xml
+++ b/1080i/MyMusicPlaylist.xml
@@ -47,7 +47,7 @@
                             <width>auto</width>
                             <font>pageTitle</font>
                             <label> ($LOCALIZE[31133])</label>
-                            <textcolor>textAccented</textcolor>
+                            <textcolor>highlight</textcolor>
                         </control>
                     </control>
                     <!--source subtitle-->
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index f09a21b..8fa8254 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -46,7 +46,7 @@
                     <posy>0</posy>
                     <width>14-col</width>
                     <font>pageTitle</font>
-                    <label>$LOCALIZE[31006] [COLOR textAccented]$LOCALIZE[31078][/COLOR]</label>
+                    <label>$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31078][/COLOR]</label>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="label">
@@ -55,7 +55,7 @@
                     <posy>0</posy>
                     <width>14-col</width>
                     <font>pageTitle</font>
-                    <label>$LOCALIZE[31164] [COLOR textAccented]$LOCALIZE[31078][/COLOR]</label>
+                    <label>$LOCALIZE[31164] [COLOR highlight]$LOCALIZE[31078][/COLOR]</label>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="label">
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 10dd03b..4f69e1b 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -58,7 +58,7 @@
                             <width>2-row</width>
                             <height>2-row</height>
                             <aspectratio scalediffuse="false">scale</aspectratio>
-                            <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
+                            <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
                         </control>
                         <control type="label">
                             <posx>1-col-indent</posx>
@@ -77,7 +77,7 @@
                             <width>284</width>
                             <height>2-row</height>
                             <texture>colors/white.png</texture>
-                            <colordiffuse>500</colordiffuse>
+                            <colordiffuse>highlight</colordiffuse>
                         </control>
                         <control type="image">
                             <posx>0</posx>
@@ -85,7 +85,7 @@
                             <width>2-row</width>
                             <height>2-row</height>
                             <aspectratio scalediffuse="false">scale</aspectratio>
-                            <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
+                            <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
                             <include>spinFocusIcon</include>
                         </control>
                         <control type="label">
@@ -123,7 +123,7 @@
                             <width>139</width>
                             <height>2-row</height>
                             <texture border="2">colors/white.png</texture>
-                            <colordiffuse>500</colordiffuse>
+                            <colordiffuse>highlight</colordiffuse>
                         </control>
                         <control type="label" id="1">
                             <width>120</width>
@@ -159,7 +159,7 @@
                     <posy>0</posy>
                     <width>14-col</width>
                     <font>pageTitle</font>
-                    <label>$LOCALIZE[31006] [COLOR textAccented]$LOCALIZE[31080][/COLOR]</label>
+                    <label>$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31080][/COLOR]</label>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="label">
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 7e0bc37..c996e11 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -35,7 +35,7 @@
                         <posy>0</posy>
                         <width>14-col</width>
                         <font>pageTitle</font>
-                        <label>$LOCALIZE[31006] [COLOR textAccented]$LOCALIZE[31165][/COLOR]</label>
+                        <label>$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR]</label>
                         <textcolor>textActive</textcolor>
                     </control>
                     <control type="label">
diff --git a/1080i/ProfileSettings.xml b/1080i/ProfileSettings.xml
index e13a128..23d29e8 100644
--- a/1080i/ProfileSettings.xml
+++ b/1080i/ProfileSettings.xml
@@ -42,7 +42,7 @@
                 <width>12-col</width>
                 <align>center</align>
                 <font>itemSubTitle</font>
-                <textcolor>textAccented</textcolor>
+                <textcolor>highlight</textcolor>
             </control>
             <control type="button" id="6000">
                 <description>Profile switch</description>
diff --git a/1080i/Settings.xml b/1080i/Settings.xml
index 7e66385..401ae0d 100644
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@@ -17,7 +17,7 @@
                 <width>18-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml
index d1e84f9..5dea174 100644
--- a/1080i/SettingsCategory.xml
+++ b/1080i/SettingsCategory.xml
@@ -27,7 +27,7 @@
                 <width>18-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
@@ -73,7 +73,7 @@
                     <textcolor>textActive</textcolor>
                     <focusedcolor>black</focusedcolor>
                     <texturefocus>colors/white.png</texturefocus>
-                    <texturenofocus colordiffuse="500">colors/white.png</texturenofocus>
+                    <texturenofocus colordiffuse="highlight">colors/white.png</texturenofocus>
                     <textoffsetx>12</textoffsetx>
                     <textoffsety>0</textoffsety>
                     <onclick>SettingsLevelChange</onclick>
diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml
index b9af051..22a5f65 100644
--- a/1080i/SettingsProfile.xml
+++ b/1080i/SettingsProfile.xml
@@ -50,7 +50,7 @@
                 <align>left</align>
                 <font>itemTitle</font>
                 <label>$LOCALIZE[31107]: $INFO[System.ProfileName]</label>
-                <textcolor>textAccented</textcolor>
+                <textcolor>highlight</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
             <!--dialog controls-->
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 61f25e2..7ffa270 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -17,7 +17,7 @@
                 <width>20-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <!--title-->
@@ -59,7 +59,7 @@
                             <width>4-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
-                            <font>menuTitle</font>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>-</shadowcolor>
@@ -91,7 +91,7 @@
                             <width>4-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
-                            <font>menuTitle</font>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>-</shadowcolor>
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 675ba55..9105168 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -1,174 +1,160 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol always="true">8000</defaultcontrol>
+    <defaultcontrol always="true">8001</defaultcontrol>
     <include>fadeInOut</include>
     <controls>
         <control type="group">
-            <posx>col-13-begin</posx>
-            <posy>row-3-begin</posy>
+            <posx>0</posx>
+            <posy>0</posy>
             <!--fade out if audio / video menu active-->
             <animation type="Conditional" condition="Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels)">
                 <effect type="fade" start="100" end="0" time="200" tween="sine" easing="in"/>
             </animation>
-            <!--content imagery-->
-            <control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>12-col</width>
-                <height>10-row</height>
-                <aspectratio aligny="center">scale</aspectratio>
-                <texture fallback="colors/offblack.png">$INFO[player.art(fanart)]</texture>
-            </control>
             <!--content title-->
             <control type="image">
                 <posx>0</posx>
-                <posy>10-row</posy>
-                <width>12-col</width>
-                <height>4-row</height>
+                <posy>24-row</posy>
+                <width>fullscreenWidth</width>
+                <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="label" id="20">
-                <posx>12</posx>
-                <posy>10-row</posy>
-                <width>24-col</width>
-                <font>smallStrong</font>
+            <control type="label">
+                <posx>col-1-begin</posx>
+                <posy>24-row</posy>
+                <width>16-col</width>
+                <height>2-row</height>
+                <font>pageTitle</font>
                 <textcolor>textActive</textcolor>
-                <label fallback="31136">$INFO[VideoPlayer.ChannelNumber,,]$INFO[VideoPlayer.ChannelName,. ,]$INFO[Videoplayer.tvshowTitle]$INFO[Videoplayer.season, • $LOCALIZE[31011] ]$INFO[Videoplayer.episode, • $LOCALIZE[31040] ]</label>
-                <scroll>false</scroll>
+                <label>[UPPERCASE]$INFO[videoplayer.Title][/UPPERCASE]</label>
             </control>
             <control type="label">
-                <posx>12</posx>
-                <posy>11-row</posy>
-                <width>12-col-gutter</width>
+                <right>96</right>
+                <posy>24-row</posy>
+                <width>8-col</width>
                 <height>2-row</height>
-                <font>largeTitle</font>
+                <font>pageTitle</font>
+                <align>right</align>
                 <textcolor>textActive</textcolor>
-                <label>$INFO[videoplayer.Title]</label>
-                <include condition="Skin.HasSetting(lowPowerMode)">scrollSuppressionActive</include>
-                <include condition="!Skin.HasSetting(lowPowerMode)">scrollSuppressionInactive</include>
+                <label>$INFO[Videoplayer.time] / $INFO[Videoplayer.duration]</label>
+                <scroll>false</scroll>
             </control>
             <control type="image">
                 <posx>0</posx>
-                <posy>14-row</posy>
-                <width>12-col</width>
-                <height>6-row</height>
+                <posy>26-row</posy>
+                <width>fullscreenWidth</width>
+                <height>4-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>textboxInactive</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="textbox">
-                <posx>12</posx>
-                <posy>516</posy>
-                <width>12-col-gutter</width>
-                <height>5-row</height>
+                <posx>col-1-begin</posx>
+                <posy>26-row</posy>
                 <font>textbox</font>
+                <width>24-col</width>
                 <textcolor>textActive</textcolor>
-                <label fallback="31009">$INFO[Videoplayer.plot]</label>
-                <include condition="Skin.HasSetting(lowPowerMode)">scrollSuppressionActive</include>
-                <include condition="!Skin.HasSetting(lowPowerMode)">scrollSuppressionInactive</include>
-                <scrollspeed>60</scrollspeed>
-            </control>
-            <control type="label">
-                <posx>12</posx>
-                <posy>462</posy>
-                <width>8-col</width>
-                <height>1-row</height>
-                <font>itemTitle</font>
-                <textcolor>textActive</textcolor>
-                <label>$INFO[Videoplayer.time] / $INFO[Videoplayer.duration]</label>
-                <scroll>false</scroll>
-                <shadowcolor>-</shadowcolor>
+                <height>3-row</height>
+                <label>$INFO[videoplayer.plot]</label>
+                <autoscroll delay="10000" time="1000" repeat="10000"/>
             </control>
 
             <!--subtitles etc-->
             <control type="list" id="8001">
-                <posx>0</posx>
-                <posy>20-row</posy>
-                <width>12-col</width>
+                <posx>col-9-begin</posx>
+                <posy>0</posy>
+                <width>24-col</width>
                 <height>2-row</height>
                 <itemgap>0</itemgap>
                 <orientation>horizontal</orientation>
-                <ondown>control.setfocus(8000,0)</ondown>
-                <itemlayout width="3-col" height="2-row">
+                <itemlayout width="4-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>3-col</width>
+                        <width>1-col-textbox</width>
                         <height>2-row</height>
-                        <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>ccFFFFFF</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/black.png</texture>
                     </control>
-                    <control type="label">
-                        <posx>12</posx>
+                    <control type="image">
+                        <posx>1-col</posx>
                         <posy>0</posy>
                         <width>3-col</width>
                         <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/black.png</texture>
+                    </control>
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>1-col</width>
+                        <height>2-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
+                        <font>symbol</font>
+                        <textcolor>textActive</textcolor>
+                        <label>$INFO[ListItem.label2]</label>
+                    </control>
+                    <control type="label">
+                        <posx>1-col-indent</posx>
+                        <posy>-1</posy>
+                        <width>3-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
                         <font>buttonTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
                     </control>
                 </itemlayout>
-                <focusedlayout width="3-col" height="2-row">
+                <focusedlayout width="4-col" height="2-row">
                     <control type="image">
-                        <visible>control.hasfocus(8001)</visible>
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>3-col</width>
+                        <width>1-col</width>
                         <height>2-row</height>
-                        <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture border="0">colors/white.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                        <include>spinFocusIcon</include>
                     </control>
                     <control type="image">
-                        <visible>!control.hasfocus(8001)</visible>
-                        <posx>0</posx>
+                        <posx>1-col</posx>
                         <posy>0</posy>
                         <width>3-col</width>
                         <height>2-row</height>
-                        <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>ccFFFFFF</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
                     </control>
                     <control type="label">
-                        <visible>control.hasfocus(8001)</visible>
-                        <posx>12</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
-                        <width>3-col-textbox</width>
+                        <width>1-col</width>
                         <height>2-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
+                        <font>symbol</font>
+                        <textcolor>textActive</textcolor>
+                        <label>$INFO[ListItem.label2]</label>
+                        <shadowcolor>-</shadowcolor>
+                    </control>
+                    <control type="label">
+                        <posx>1-col-indent</posx>
+                        <posy>-1</posy>
+                        <width>5-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
                         <font>buttonTitle</font>
                         <textcolor>black</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
-                    <control type="label">
-                        <visible>!control.hasfocus(8001)</visible>
-                        <posx>12</posx>
-                        <posy>0</posy>
-                        <width>3-col-textbox</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>menuTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
                 </focusedlayout>
                 <content>
                     <item>
                         <description>Subtitles</description>
                         <label>24012</label>
+                        <label2></label2>
                         <thumb>-</thumb>
                         <onclick>Close</onclick>
                         <onclick>activateWindow(5901)</onclick>
@@ -176,176 +162,28 @@
                     <item>
                         <description>Audio Settings</description>
                         <label>292</label>
+                        <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(124)</onclick>
                     </item>
                     <item>
                         <description>Video Settings</description>
                         <label>444</label>
+                        <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(123)</onclick>
                     </item>
                     <item>
                         <description>Bookmarks</description>
                         <label>298</label>
+                        <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(125)</onclick>
                     </item>
                 </content>
             </control>
 
-            <!--player controls-->
-            <control type="list" id="8000">
-                <posx>0</posx>
-                <posy>795</posy>
-                <width>24-col</width>
-                <height>1-col</height>
-                <itemgap>0</itemgap>
-                <orientation>horizontal</orientation>
-                <onup>control.setfocus(8001,0)</onup>
-                <itemlayout width="1-col" height="1-col">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>1-col-textbox</height>
-                        <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>ccFFFFFF</colordiffuse>
-                    </control>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>1-col-textbox</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>symbol</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.label]</label>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="1-col" height="1-col">
-                    <control type="image">
-                        <visible>control.hasfocus(8000)</visible>
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>1-col-textbox</height>
-                        <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture border="0">colors/white.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <visible>!control.hasfocus(8000)</visible>
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>1-col-textbox</height>
-                        <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>ccFFFFFF</colordiffuse>
-                    </control>
-                    <control type="label">
-                        <visible>control.hasfocus(8000)</visible>
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>1-col-textbox</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>symbol</font>
-                        <textcolor>black</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.label]</label>
-                    </control>
-                    <control type="label">
-                        <visible>!control.hasfocus(8000)</visible>
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>1-col-textbox</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>symbol</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.label]</label>
-                    </control>
-                </focusedlayout>
-                <content>
-                    <item>
-                        <description>Menu: EPG (PVR content) / DVD Menu (Disc playback in progress)</description>
-                        <label></label>
-                        <thumb>-</thumb>
-                        <onclick condition="System.HasMediaDVD + !Pvr.IsPlayingTv">PlayerControl(ShowVideoMenu)</onclick>
-                        <onclick condition="Pvr.IsPlayingTv">ActivateWindow(PVROSDChannels)</onclick>
-                        <onclick condition="!System.HasMediaDVD + !Pvr.IsPlayingTv">Notification($LOCALIZE[31172],$LOCALIZE[31173])</onclick>
-                    </item>
-                    <item>
-                        <description>Previous</description>
-                        <label></label>
-                        <thumb>-</thumb>
-                        <onclick>PlayerControl(previous)</onclick>
-                    </item>
-                    <item>
-                        <description>Rewind</description>
-                        <label></label>
-                        <thumb>-</thumb>
-                        <onclick>PlayerControl(rewind)</onclick>
-                    </item>
-                    <item>
-                        <description>Stop</description>
-                        <label></label>
-                        <thumb>-</thumb>
-                        <onclick>PlayerControl(stop)</onclick>
-                    </item>
-                    <item>
-                        <visible>Player.Playing | player.forwarding | player.rewinding</visible>
-                        <description>Play/Pause</description>
-                        <label></label>
-                        <thumb>-</thumb>
-                        <onclick>PlayerControl(play)</onclick>
-                    </item>
-                    <item>
-                        <visible>Player.Paused</visible>
-                        <description>Pause</description>
-                        <label></label>
-                        <thumb>-</thumb>
-                        <onclick>PlayerControl(play)</onclick>
-                    </item>
-                    <item>
-                        <description>Fast forward</description>
-                        <label></label>
-                        <thumb>-</thumb>
-                        <onclick>PlayerControl(forward)</onclick>
-                    </item>
-                    <item>
-                        <description>Next Chapter</description>
-                        <label></label>
-                        <thumb>-</thumb>
-                        <onclick>PlayerControl(next)</onclick>
-                    </item>
-                    <item>
-                        <enable>System.GetBool(pvrmanager.enabled) + Player.CanRecord</enable>
-                        <description>Record (PVR only)</description>
-                        <label></label>
-                        <thumb>-</thumb>
-                        <onclick>PlayerControl(record)</onclick>
-                    </item>
-                    <item>
-                        <enable></enable>
-                        <description>Teletext</description>
-                        <label></label>
-                        <thumb>-</thumb>
-                        <onclick>ActivateWindow(Teletext)</onclick>
-                    </item>
-                </content>
-            </control>
+
         </control>
         <!--debugging-->
         <include>DebugGrid</include>
diff --git a/1080i/View_Addons.xml b/1080i/View_Addons.xml
index c21b972..1ed4847 100644
--- a/1080i/View_Addons.xml
+++ b/1080i/View_Addons.xml
@@ -43,28 +43,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>4-col-gutter</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>258</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="0">colors/black.png</texture>
+                            <colordiffuse>ccFFFFFF</colordiffuse>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>2-row</posy>
+                            <width>240</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>regularStrong</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.label]</label>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>3-row</posy>
+                            <width>240</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.Property(Addon.Summary)]</label>
+                        </control>
+                        <control type="grouplist">
+                            <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">
-                                <posx>12</posx>
-                                <posy>248</posy>
-                                <width>7-row</width>
-                                <align>left</align>
-                                <angle>90</angle>
-                                <aligny>top</aligny>
-                                <font>itemTitle</font>
-                                <textcolor>white</textcolor>
-                                <label>$INFO[ListItem.label]</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>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 60087e5..020afc8 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -9,8 +9,9 @@
             <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>
+                <texture background="true" border="0">$INFO[Listitem.art(fanart)]</texture>
                 <fadetime>1500</fadetime>
+                <colordiffuse>22ffffff</colordiffuse>
             </control>
             <control type="image">
                 <texture>vignette.png</texture>
@@ -57,39 +58,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>3-row</width>
-                            <height>4-col-gutter</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>258</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">colors/black.png</texture>
+                        <colordiffuse>ccFFFFFF</colordiffuse>
+                    </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>2-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>3-row</posy>
+                        <width>240</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <label>$INFO[ListItem.Artist]</label>
+                    </control>
+                    <control type="grouplist">
+                        <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">
-                            <posx>12</posx>
-                            <posy>248</posy>
-                            <width>7-row</width>
-                            <align>left</align>
-                            <angle>90</angle>
-                            <aligny>top</aligny>
-                            <font>itemTitle</font>
-                            <textcolor>white</textcolor>
-                            <label>[B]$INFO[ListItem.title][/B]</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">
-                            <posx>54</posx>
-                            <posy>248</posy>
-                            <width>7-row</width>
-                            <align>left</align>
-                            <angle>90</angle>
-                            <aligny>top</aligny>
-                            <font>itemSubTitle</font>
-                            <textcolor>white</textcolor>
-                            <label>$INFO[ListItem.artist]</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/1080i/View_Artists.xml b/1080i/View_Artists.xml
index 1016a34..f7fcb1c 100644
--- a/1080i/View_Artists.xml
+++ b/1080i/View_Artists.xml
@@ -2,22 +2,6 @@
 <includes>
     <!--Artist browser-->
     <include name="artist">
-        <!--fanart-->
-        <control type="group">
-            <visible>container.content(artists)</visible>
-            <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>
-                <fadetime>1500</fadetime>
-            </control>
-            <control type="image">
-                <texture>vignette.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-        </control>
-
         <control type="panel" id="53">
             <visible>container.content(artists) | container.content(genres)</visible>
             <posx>col-1-begin</posx>
@@ -31,6 +15,7 @@
             <pagecontrol>60</pagecontrol>
             <itemlayout width="8-col" height="2-row">
                 <control type="image">
+                    <visible>false</visible>
                     <posx>1-col</posx>
                     <posy>0</posy>
                     <width>7-col-gutter</width>
@@ -45,7 +30,7 @@
                     <width>2-row</width>
                     <height>2-row</height>
                     <aspectratio scalediffuse="false">scale</aspectratio>
-                    <texture>$INFO[Listitem.thumb]</texture>
+                    <texture diffuse="masks/circle.png">$INFO[Listitem.thumb]</texture>
                 </control>
                 <control type="label">
                     <posx>1-col-indent</posx>
@@ -67,7 +52,7 @@
                     <height>2-row</height>
                     <aspectratio>stretch</aspectratio>
                     <texture>colors/white.png</texture>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="image">
                     <posx>0</posx>
@@ -75,7 +60,7 @@
                     <width>2-row</width>
                     <height>2-row</height>
                     <aspectratio scalediffuse="false">scale</aspectratio>
-                    <texture>$INFO[Listitem.thumb]</texture>
+                    <texture diffuse="masks/circle.png">$INFO[Listitem.thumb]</texture>
                     <include>spinFocusIcon</include>
                 </control>
                 <control type="label">
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 39a3e91..282fab0 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -11,7 +11,7 @@
                 <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>
+                <bordertexture border="0" colordiffuse="highlight">colors/white.png</bordertexture>
                 <bordersize>0,0,6,0</bordersize>
                 <colordiffuse>ffffffff</colordiffuse>
             </control>
@@ -115,7 +115,7 @@
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                         <bordersize>0</bordersize>
-                        <colordiffuse>500</colordiffuse>
+                        <colordiffuse>highlight</colordiffuse>
                         <include>spinFocusIcon</include>
                     </control>
                     <control type="label">
@@ -139,7 +139,7 @@
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                         <bordersize>0</bordersize>
-                        <colordiffuse>500</colordiffuse>
+                        <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
@@ -184,11 +184,11 @@
                 <itemlayout width="24-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <posy>3</posy>
+                        <width>66</width>
+                        <height>66</height>
+                        <aspectratio scalediffuse="false">stretch</aspectratio>
+                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
                     </control>
                     <control type="image">
                         <posx>1-col</posx>
@@ -214,12 +214,15 @@
                 <focusedlayout width="24-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
-                        <include>spinFocusIcon</include>
+                        <posy>3</posy>
+                        <width>66</width>
+                        <height>66</height>
+                        <aspectratio scalediffuse="false">stretch</aspectratio>
+                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <animation type="focus" loop="false" reversible="false">
+                            <effect type="fade" time="500"/>
+                            <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                        </animation>
                     </control>
                     <control type="image">
                         <posx>1-col</posx>
@@ -228,7 +231,7 @@
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
-                        <colordiffuse>500</colordiffuse>
+                        <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
diff --git a/1080i/View_Files.xml b/1080i/View_Files.xml
index 74043ca..cf7c8cd 100644
--- a/1080i/View_Files.xml
+++ b/1080i/View_Files.xml
@@ -59,7 +59,7 @@
                     <height>2-row</height>
                     <aspectratio>stretch</aspectratio>
                     <texture border="0">colors/white.png</texture>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="label">
                     <posx>1-col-indent</posx>
diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml
index 0476123..99eba18 100644
--- a/1080i/View_LiveTVChannels.xml
+++ b/1080i/View_LiveTVChannels.xml
@@ -14,7 +14,7 @@
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>5-col-textbox</width>
+                        <width>23-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/black.png</texture>
@@ -22,16 +22,16 @@
                     </control>
                     <control type="image">
                         <posx>0</posx>
-                        <posy>0</posy>
-                        <width>2-row</width>
-                        <height>2-row</height>
+                        <posy>3</posy>
+                        <width>66</width>
+                        <height>66</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
                         <posy>0</posy>
-                        <width>5-col-gutter</width>
+                        <width>3-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
@@ -39,40 +39,22 @@
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.Label]</label>
                     </control>
-                    <control type="image">
-                        <posx>6-col</posx>
-                        <posy>0</posy>
-                        <width>2-col</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <colordiffuse>textboxInactive</colordiffuse>
-                    </control>
                     <control type="label">
-                        <posx>6-col</posx>
+                        <posx>4-col-gutter</posx>
                         <posy>0</posy>
-                        <width>2-col-gutter</width>
+                        <width>2-col-textbox</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <align>right</align>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.starttime]</label>
-                    </control>
-                    <control type="image">
-                        <posx>8-col</posx>
-                        <posy>0</posy>
-                        <width>7-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <colordiffuse>textboxInactive</colordiffuse>
+                        <label>[B]$INFO[ListItem.starttime][/B]</label>
                     </control>
                     <control type="label">
-                        <posx>8-col</posx>
+                        <posx>6-col</posx>
                         <posy>0</posy>
-                        <width>7-col-gutter</width>
+                        <width>8-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
@@ -80,40 +62,22 @@
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.Title]</label>
                     </control>
-                    <control type="image">
-                        <posx>15-col</posx>
-                        <posy>0</posy>
-                        <width>2-col</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <colordiffuse>textboxInactive</colordiffuse>
-                    </control>
                     <control type="label">
-                        <posx>15-col-gutter</posx>
+                        <posx>14-col-gutter</posx>
                         <posy>0</posy>
                         <width>2-col-textbox</width>
                         <height>2-row</height>
-                        <align>right</align>
                         <aligny>center</aligny>
+                        <align>right</align>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.nextstarttime]</label>
-                    </control>
-                    <control type="image">
-                        <posx>17-col</posx>
-                        <posy>0</posy>
-                        <width>7-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <colordiffuse>textboxInactive</colordiffuse>
+                        <label>[B]$INFO[ListItem.nextstarttime][/B]</label>
                     </control>
                     <control type="label">
-                        <posx>17-col</posx>
+                        <posx>16-col</posx>
                         <posy>0</posy>
-                        <width>7-col-gutter</width>
+                        <width>8-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
@@ -126,25 +90,28 @@
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>5-col-textbox</width>
+                        <width>23-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
-                        <colordiffuse>500</colordiffuse>
+                        <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="image">
                         <posx>0</posx>
-                        <posy>0</posy>
-                        <width>2-row</width>
-                        <height>2-row</height>
+                        <posy>3</posy>
+                        <width>66</width>
+                        <height>66</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
-                        <include>spinFocusIcon</include>
+                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <animation type="focus" loop="false" reversible="false">
+                            <effect type="fade" time="500"/>
+                            <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                        </animation>
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
                         <posy>0</posy>
-                        <width>5-col-gutter</width>
+                        <width>3-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
@@ -152,40 +119,22 @@
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.Label]</label>
                     </control>
-                    <control type="image">
-                        <posx>6-col</posx>
-                        <posy>0</posy>
-                        <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>6-col</posx>
+                        <posx>4-col-gutter</posx>
                         <posy>0</posy>
-                        <width>2-col-gutter</width>
+                        <width>2-col-textbox</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <align>right</align>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.starttime]</label>
-                    </control>
-                    <control type="image">
-                        <posx>8-col</posx>
-                        <posy>0</posy>
-                        <width>7-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/white.png</texture>
-                        <colordiffuse>500</colordiffuse>
+                        <label>[B]$INFO[ListItem.starttime][/B]</label>
                     </control>
                     <control type="label">
-                        <posx>8-col</posx>
+                        <posx>6-col</posx>
                         <posy>0</posy>
-                        <width>7-col-gutter</width>
+                        <width>8-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
@@ -193,40 +142,22 @@
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.Title]</label>
                     </control>
-                    <control type="image">
-                        <posx>15-col</posx>
-                        <posy>0</posy>
-                        <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-gutter</posx>
+                        <posx>14-col-gutter</posx>
                         <posy>0</posy>
                         <width>2-col-textbox</width>
                         <height>2-row</height>
-                        <align>right</align>
                         <aligny>center</aligny>
+                        <align>right</align>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.nextstarttime]</label>
-                    </control>
-                    <control type="image">
-                        <posx>17-col</posx>
-                        <posy>0</posy>
-                        <width>7-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/white.png</texture>
-                        <colordiffuse>500</colordiffuse>
+                        <label>[B]$INFO[ListItem.nextstarttime][/B]</label>
                     </control>
                     <control type="label">
-                        <posx>17-col</posx>
+                        <posx>16-col</posx>
                         <posy>0</posy>
-                        <width>7-col-gutter</width>
+                        <width>8-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 3ebb5c9..b5661ed 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -10,8 +10,9 @@
                 <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>
-                    <fadetime>1500</fadetime>
+                    <texture background="true" border="0">$INFO[Listitem.art(fanart)]</texture>
+                    <fadetime>500</fadetime>
+                    <colordiffuse>22ffffff</colordiffuse>
                 </control>
                 <control type="image">
                     <texture>vignette.png</texture>
diff --git a/1080i/View_MusicFiles.xml b/1080i/View_MusicFiles.xml
index 4f82557..962b662 100644
--- a/1080i/View_MusicFiles.xml
+++ b/1080i/View_MusicFiles.xml
@@ -63,7 +63,7 @@
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
-                        <colordiffuse>500</colordiffuse>
+                        <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml
index db5fae4..aab3c82 100644
--- a/1080i/View_MusicRecentItems.xml
+++ b/1080i/View_MusicRecentItems.xml
@@ -3,9 +3,8 @@
     <include name="musicRecentItems">
          <control type="group" id="9300">
                 <animation type="Conditional" condition="controlgroup(9301).hasfocus">
-                    <effect type="zoom" end="205" time="200" center="auto" tween="linear" easing="out"/>
-                    <effect type="fade" start="100" end="30" time="200"/>
-                    <effect type="slide" start="0,0" end="0,0" time="200"/>
+                    <effect type="fade" start="100" end="5" time="200"/>
+                    <effect type="slide" start="0,0" end="0,-100" time="200"/>
                 </animation>
             <control type="label">
                 <posx>col-1-begin</posx>
@@ -52,39 +51,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>3-row</width>
-                                <height>4-col-gutter</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>258</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="0">colors/black.png</texture>
+                            <colordiffuse>ccFFFFFF</colordiffuse>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>2-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>3-row</posy>
+                            <width>240</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.Artist]</label>
+                        </control>
+                        <control type="grouplist">
+                            <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">
-                                <posx>12</posx>
-                                <posy>248</posy>
-                                <width>7-row</width>
-                                <align>left</align>
-                                <angle>90</angle>
-                                <aligny>top</aligny>
-                                <font>itemTitle</font>
-                                <textcolor>white</textcolor>
-                                <label>[B]$INFO[ListItem.title][/B]</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">
-                                <posx>54</posx>
-                                <posy>248</posy>
-                                <width>7-row</width>
-                                <align>left</align>
-                                <angle>90</angle>
-                                <aligny>top</aligny>
-                                <font>itemSubTitle</font>
-                                <textcolor>white</textcolor>
-                                <label>$INFO[ListItem.artist]</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>
@@ -94,7 +127,7 @@
 
         <control type="group" id="9301">
             <animation type="Conditional" condition="controlgroup(9301).hasfocus">
-                <effect type="slide" start="0,0" end="0,-688" time="200"/>
+                <effect type="slide" start="0,0" end="0,-580" time="200"/>
             </animation>
             <control type="label">
                 <posx>col-1-begin</posx>
@@ -141,39 +174,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>3-row</width>
-                                <height>4-col-gutter</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>258</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="0">colors/black.png</texture>
+                            <colordiffuse>ccFFFFFF</colordiffuse>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>2-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>3-row</posy>
+                            <width>240</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.Artist]</label>
+                        </control>
+                        <control type="grouplist">
+                            <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">
-                                <posx>12</posx>
-                                <posy>248</posy>
-                                <width>7-row</width>
-                                <align>left</align>
-                                <angle>90</angle>
-                                <aligny>top</aligny>
-                                <font>itemTitle</font>
-                                <textcolor>white</textcolor>
-                                <label>[B]$INFO[ListItem.title][/B]</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">
-                                <posx>54</posx>
-                                <posy>248</posy>
-                                <width>7-row</width>
-                                <align>left</align>
-                                <angle>90</angle>
-                                <aligny>top</aligny>
-                                <font>itemSubTitle</font>
-                                <textcolor>white</textcolor>
-                                <label>$INFO[ListItem.artist]</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/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 5f75df6..0f3b3e7 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -43,27 +43,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.season,$LOCALIZE[31011]]</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>$VAR[itemDetail]</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>10-row</width>
-                                <align>left</align>
-                                <angle>90</angle>
-                                <font>itemTitle</font>
-                                <textcolor>white</textcolor>
-                                <label>$INFO[ListItem.season,$LOCALIZE[31011] , • ]$VAR[itemDetail]</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>
@@ -80,7 +126,7 @@
                     <include>dimensionsFullscreen</include>
                     <aspectratio scalediffuse="false">stretch</aspectratio>
                     <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
-                    <bordertexture border="6" colordiffuse="500">colors/white.png</bordertexture>
+                    <bordertexture border="6" colordiffuse="highlight">colors/white.png</bordertexture>
                     <bordersize>0,0,0,6</bordersize>
                     <colordiffuse>ffffffff</colordiffuse>
                 </control>
@@ -90,21 +136,12 @@
             <control type="group">
                 <posx>col-1-begin</posx>
                 <posy>row-2-begin</posy>
-                <control type="image">
-                    <posx>-96</posx>
-                    <posy>11-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>11-row</posy>
                     <width>24-col</width>
                     <height>2-row</height>
-                    <font>medium</font>
+                    <font>largeStrong</font>
                     <textcolor>textActive</textcolor>
                     <label>$INFO[container.foldername]</label>
                 </control>
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index a685d94..5715e0e 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -62,7 +62,7 @@
                 <font>regularStrong</font>
                 <textcolor>textActive</textcolor>
                 <shadowcolor>-</shadowcolor>
-                <label>[COLOR textAccented]$INFO[ListItem.Artist] $INFO[ListItem.Year,(,)][/COLOR]</label>
+                <label>$INFO[ListItem.Artist] $INFO[ListItem.Year,(,)]</label>
             </control>
         </control>
 
@@ -174,7 +174,7 @@
                     <aspectratio>stretch</aspectratio>
                     <texture>colors/white.png</texture>
                     <bordersize>0</bordersize>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                     <include>spinFocusIcon</include>
                 </control>
                 <control type="label">
@@ -197,7 +197,7 @@
                     <aspectratio>stretch</aspectratio>
                     <texture>colors/white.png</texture>
                     <bordersize>0</bordersize>
-                    <colordiffuse>500</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="label">
                     <posx>1-col-indent</posx>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 78efb99..1a22631 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -12,7 +12,8 @@
                     <include>dimensionsFullscreen</include>
                     <aspectratio scalediffuse="false">stretch</aspectratio>
                     <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
-                    <fadetime>1500</fadetime>
+                    <fadetime>500</fadetime>
+                    <colordiffuse>99ffffff</colordiffuse>
                 </control>
                 <control type="image">
                     <texture>vignette.png</texture>
@@ -32,6 +33,7 @@
                 <onright>60</onright>
                 <ondown>50</ondown>
                 <onup>50</onup>
+                <onback>activateWindow(home)</onback>
                 <pagecontrol>60</pagecontrol>
                 <itemlayout width="12-col" height="3-row">
                     <control type="image">
@@ -116,7 +118,7 @@
                         <height>3-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
-                        <colordiffuse>500</colordiffuse>
+                        <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml
index 755bcf1..71e6f1f 100644
--- a/1080i/View_VideoRecentItems.xml
+++ b/1080i/View_VideoRecentItems.xml
@@ -3,8 +3,8 @@
     <include name="videoRecentItems">
         <control type="group" id="9300">
             <animation type="Conditional" condition="controlgroup(9301).hasfocus">
-                <effect type="zoom" end="205" time="200" center="auto" tween="linear" easing="out"/>
-                <effect type="fade" start="100" end="30" time="200"/>
+                <effect type="fade" start="100" end="5" time="200"/>
+                <effect type="slide" start="0,0" end="0,-100" time="200"/>
             </animation>
             <control type="label">
                 <visible>SubString(skin.string(videoHomeItemsMoviesSource),recentmovies)</visible>
@@ -149,7 +149,7 @@
 
         <control type="group" id="9301">
             <animation type="Conditional" condition="controlgroup(9301).hasfocus">
-                <effect type="slide" start="0,0" end="0,-504" time="200"/>
+                <effect type="slide" start="0,0" end="0,-360" time="200"/>
             </animation>
             <control type="label">
                 <visible>SubString(skin.string(videoHomeItemsEpisodesSource),recentepisodes)</visible>
diff --git a/1080i/custom_menuItemTypeSelector.xml b/1080i/custom_menuItemTypeSelector.xml
index f6e7003..ddd70b9 100644
--- a/1080i/custom_menuItemTypeSelector.xml
+++ b/1080i/custom_menuItemTypeSelector.xml
@@ -23,7 +23,7 @@
                 <width>col-7-begin</width>
                 <height>fullscreenHeight</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <!--titles-->
@@ -44,9 +44,9 @@
                     <height>2-row</height>
                     <width>col-7-begin</width>
                     <font>menuTitle</font>
-                    <textcolor>50</textcolor>
-                    <focusedcolor>500</focusedcolor>
-                    <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
                     <texturenofocus>-</texturenofocus>
                     <textoffsetx>col-1-begin</textoffsetx>
                     <label>31085</label>
@@ -63,9 +63,9 @@
                     <height>2-row</height>
                     <width>col-7-begin</width>
                     <font>menuTitle</font>
-                    <textcolor>50</textcolor>
-                    <focusedcolor>500</focusedcolor>
-                    <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
                     <texturenofocus>-</texturenofocus>
                     <textoffsetx>col-1-begin</textoffsetx>
                     <label>31086</label>
@@ -82,9 +82,9 @@
                     <height>2-row</height>
                     <width>col-7-begin</width>
                     <font>menuTitle</font>
-                    <textcolor>50</textcolor>
-                    <focusedcolor>500</focusedcolor>
-                    <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
                     <texturenofocus>-</texturenofocus>
                     <textoffsetx>col-1-begin</textoffsetx>
                     <label>31091</label>
@@ -102,9 +102,9 @@
                     <height>2-row</height>
                     <width>col-7-begin</width>
                     <font>menuTitle</font>
-                    <textcolor>50</textcolor>
-                    <focusedcolor>500</focusedcolor>
-                    <texturefocus colordiffuse="50">colors/white.png</texturefocus>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
                     <texturenofocus>-</texturenofocus>
                     <textoffsetx>col-1-begin</textoffsetx>
                     <label>31092</label>
@@ -134,7 +134,7 @@
                         <aligny>center</aligny>
                         <font>symbol</font>
                         <label></label>
-                        <textcolor>50</textcolor>
+                        <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
@@ -144,7 +144,7 @@
                         <height>2-row</height>
                         <font>menuTitle</font>
                         <aligny>center</aligny>
-                        <textcolor>50</textcolor>
+                        <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
@@ -156,7 +156,7 @@
                         <width>col-7-begin</width>
                         <height>2-row</height>
                         <texture>colors/white.png</texture>
-                        <colordiffuse>50</colordiffuse>
+                        <colordiffuse>textActive</colordiffuse>
                         <aspectratio>stretch</aspectratio>
                     </control>
                     <control type="label">
@@ -167,7 +167,7 @@
                         <aligny>center</aligny>
                         <font>symbol</font>
                         <label></label>
-                        <textcolor>500</textcolor>
+                        <textcolor>highlight</textcolor>
                         <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
@@ -177,7 +177,7 @@
                         <height>2-row</height>
                         <font>menuTitle</font>
                         <aligny>center</aligny>
-                        <textcolor>500</textcolor>
+                        <textcolor>highlight</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
diff --git a/1080i/custom_recentItemTypeSelector.xml b/1080i/custom_recentItemTypeSelector.xml
index 8b6cd7b..acb58b6 100644
--- a/1080i/custom_recentItemTypeSelector.xml
+++ b/1080i/custom_recentItemTypeSelector.xml
@@ -18,7 +18,7 @@
                 <width>col-7-begin</width>
                 <height>fullscreenHeight</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>500</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <!--titles-->
@@ -41,7 +41,7 @@
                         <aligny>center</aligny>
                         <font>symbol</font>
                         <label></label>
-                        <textcolor>50</textcolor>
+                        <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
@@ -51,7 +51,7 @@
                         <height>2-row</height>
                         <font>menuTitle</font>
                         <aligny>center</aligny>
-                        <textcolor>50</textcolor>
+                        <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
@@ -63,7 +63,7 @@
                         <width>col-7-begin</width>
                         <height>2-row</height>
                         <texture>colors/white.png</texture>
-                        <colordiffuse>50</colordiffuse>
+                        <colordiffuse>textActive</colordiffuse>
                         <aspectratio>stretch</aspectratio>
                     </control>
                     <control type="label">
@@ -75,7 +75,7 @@
                         <aligny>center</aligny>
                         <font>symbol</font>
                         <label></label>
-                        <textcolor>500</textcolor>
+                        <textcolor>highlight</textcolor>
                         <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
@@ -85,7 +85,7 @@
                         <height>2-row</height>
                         <font>menuTitle</font>
                         <aligny>center</aligny>
-                        <textcolor>500</textcolor>
+                        <textcolor>highlight</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
diff --git a/1080i/script-RCB-gameinfo.xml b/1080i/script-RCB-gameinfo.xml
index 0dfd801..fbdeb1c 100644
--- a/1080i/script-RCB-gameinfo.xml
+++ b/1080i/script-RCB-gameinfo.xml
@@ -86,7 +86,7 @@
                             <width>6-col-gutter</width>
                             <font>itemSubTitle</font>
                             <textcolor>textActive</textcolor>
-                            <label>[COLOR textAccented]$INFO[ListItem.label][/COLOR] $INFO[ListItem.label2]</label>
+                            <label>[COLOR highlight]$INFO[ListItem.label][/COLOR] $INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                     </itemlayout>
@@ -97,7 +97,7 @@
                             <width>6-col-gutter</width>
                             <font>itemSubTitle</font>
                             <textcolor>textActive</textcolor>
-                            <label>[COLOR textAccented]$INFO[ListItem.label][/COLOR] $INFO[ListItem.label2]</label>
+                            <label>[COLOR highlight]$INFO[ListItem.label][/COLOR] $INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                     </focusedlayout>
diff --git a/1080i/script-Rom_Collection_Browser-main.xml b/1080i/script-Rom_Collection_Browser-main.xml
index 99dc17a..6e0d4ce 100644
--- a/1080i/script-Rom_Collection_Browser-main.xml
+++ b/1080i/script-Rom_Collection_Browser-main.xml
@@ -74,7 +74,7 @@
                         <posy>0</posy>
                         <width>14-col</width>
                         <font>pageTitle</font>
-                        <label>$LOCALIZE[31156] [COLOR textAccented]$INFO[ListItem.Property(console)][/COLOR]</label>
+                        <label>$LOCALIZE[31156] [COLOR highlight]$INFO[ListItem.Property(console)][/COLOR]</label>
                         <textcolor>textActive</textcolor>
                     </control>
                     <!--source subtitle-->
diff --git a/addon.xml b/addon.xml
index 5f65672..6db271f 100644
--- a/addon.xml
+++ b/addon.xml
@@ -11,7 +11,7 @@
     </extension>
     <extension point="xbmc.addon.metadata">
         <summary lang="en">A skin for Kodi from theDeadman</summary>
-        <description lang="en">TBC</description>
+        <description lang="en">Made in Bristol U.K.</description>
         <platform>all</platform>
         <license></license>
         <forum></forum>
diff --git a/colors/defaults.xml b/colors/defaults.xml
index 4911cfb..7d2f359 100644
--- a/colors/defaults.xml
+++ b/colors/defaults.xml
@@ -4,22 +4,17 @@
     <color name="selected">fff0f0f0</color>
     <color name="unselected">ff919191</color>
     <color name="disabled">ff515151</color>
-    <color name="textAccented">ffa1a1a1</color>
 
     <!--new scheme-->
     <color name="background">ff222222</color>
+    <color name="highlight">ffee3343</color>
     <color name="overlay">44ffffff</color>
     <color name="textActive">fff0f0f0</color>
     <color name="textDisabled">ff757575</color>
     <color name="menuDisabled">ffEF9A9A</color>
     <color name="textboxInactive">99FFFFFF</color>
-    <color name="textAccented">FFE91E63</color>
 
-    <color name="keyboardActive">ffE91E63</color>
     <color name="keyboardInactive">aa212121</color>
     <color name="keyboardAccent">ffBDBDBD</color>
 
-    <color name="500">ffE91E63</color>
-
-    <color name="50">ffFFEBEE</color>
 </colors>
\ No newline at end of file
diff --git a/language/English/strings.po b/language/English/strings.po
index 0db0086..9576d1e 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -679,4 +679,8 @@ msgstr ""
 
 msgctxt "#31184"
 msgid "Info"
+msgstr ""
+
+msgctxt "#31185"
+msgid "Open"
 msgstr ""
\ No newline at end of file