From bbcc479360f846bd09f81a4c5df78fbb591dd562 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Wed, 6 May 2015 21:04:44 +0100
Subject: [PATCH] various

---
 1080i/Includes_animations.xml                |   2 +-
 1080i/Includes_hubMenuSubItems.xml           |   2 +-
 1080i/script-RCB-contextmenu.xml             | 109 +--
 1080i/script-RCB-gameinfo.xml                |  39 +-
 1080i/script-Rom_Collection_Browser-main.xml | 842 +++++++++----------
 addon.xml                                    |   2 +-
 6 files changed, 462 insertions(+), 534 deletions(-)

diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml
index 3fc383c..0faf27b 100644
--- a/1080i/Includes_animations.xml
+++ b/1080i/Includes_animations.xml
@@ -61,7 +61,7 @@
         </animation>
     </include>
     <include name="modalDialogContentShift">
-        <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus">
+        <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
             <effect type="zoom" end="300" time="200" center="auto" tween="linear" easing="out"/>
             <effect type="fade" start="100" end="30" time="200"/>
         </animation>
diff --git a/1080i/Includes_hubMenuSubItems.xml b/1080i/Includes_hubMenuSubItems.xml
index d815934..f751fba 100644
--- a/1080i/Includes_hubMenuSubItems.xml
+++ b/1080i/Includes_hubMenuSubItems.xml
@@ -13,7 +13,7 @@
             <disabledcolor>menuDisabled</disabledcolor>
             <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
-            <textoffsetx>col-7-begin</textoffsetx>
+            <textoffsetx>col-1-begin</textoffsetx>
             <label>31123</label>
             <onclick>right</onclick>
             <onclick>ActivateWindow(videoplaylist)</onclick>
diff --git a/1080i/script-RCB-contextmenu.xml b/1080i/script-RCB-contextmenu.xml
index 360ad37..b99d7a3 100644
--- a/1080i/script-RCB-contextmenu.xml
+++ b/1080i/script-RCB-contextmenu.xml
@@ -6,158 +6,113 @@
         <include>modalDialog</include>
         <control type="grouplist" id="7000">
             <posx>col-10-begin</posx>
-            <posy>2-row</posy>
-            <height>15-row</height>
+            <posy>4-row</posy>
+            <height>20-row</height>
             <itemgap>0</itemgap>
             <control type="button" id="5110">
                 <description>button import games</description>
                 <label>$ADDON[script.games.rom.collection.browser 32500]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5121">
                 <description>button rescrape game</description>
                 <label>$ADDON[script.games.rom.collection.browser 32501]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5122">
                 <description>button rescrape selection</description>
                 <label>$ADDON[script.games.rom.collection.browser 32502]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5111">
                 <description>button add rom collection</description>
                 <label>$ADDON[script.games.rom.collection.browser 32503]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5112">
                 <description>button edit rom collection</description>
                 <label>$ADDON[script.games.rom.collection.browser 32504]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5117">
                 <description>button edit offline scraper</description>
                 <label>$ADDON[script.games.rom.collection.browser 32505]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5113">
                 <description>button edit command</description>
                 <label>$ADDON[script.games.rom.collection.browser 32506]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5118">
                 <description>button game as favorite</description>
                 <label>$ADDON[script.games.rom.collection.browser 32507]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5119">
                 <description>button selection as favorite</description>
                 <label>$ADDON[script.games.rom.collection.browser 32508]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5120">
                 <description>button export nfo files</description>
                 <label>$ADDON[script.games.rom.collection.browser 32509]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5114">
                 <description>button delete rom</description>
                 <label>$ADDON[script.games.rom.collection.browser 32510]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5115">
                 <description>button delete rom collection</description>
                 <label>$ADDON[script.games.rom.collection.browser 32511]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5116">
                 <description>button clean database</description>
                 <label>$ADDON[script.games.rom.collection.browser 32512]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5223">
                 <description>button open settings</description>
                 <label>$ADDON[script.games.rom.collection.browser 32513]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
             <control type="button" id="5224">
                 <description>button set gameclient</description>
                 <label>$ADDON[script.games.rom.collection.browser 32514]</label>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <focusedcolor>textActive</focusedcolor>
                 <width>6-col</width>
-                <textcolor>unselected</textcolor>
-                <focusedcolor>selected</focusedcolor>
-                <font>itemTitle</font>
-                <textoffsetx>12</textoffsetx>
-                <texturefocus>UIControls/textButtonFO.png</texturefocus>
             </control>
         </control>
         <!--debugging-->
diff --git a/1080i/script-RCB-gameinfo.xml b/1080i/script-RCB-gameinfo.xml
index fbdeb1c..e50a6c6 100644
--- a/1080i/script-RCB-gameinfo.xml
+++ b/1080i/script-RCB-gameinfo.xml
@@ -2,11 +2,7 @@
 <window>
     <onload>control.setfocus(3000)</onload>
     <allowoverlay>no</allowoverlay>
-    <coordinates>
-        <system>1</system>
-        <posx>0</posx>
-        <posy>0</posy>
-    </coordinates>
+    <include>fadeInOut</include>
     <controls>
         <control type="group">
             <!--background / fanart-->
@@ -20,11 +16,12 @@
             </control>
             <control type="image">
                 <include>dimensionsFullscreen</include>
-                <texture>backgrounds/vignette.png</texture>
+                <texture>vignette.png</texture>
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
         </control>
+
         <control type="group">
             <!--animations-->
             <include>modalDialogInOut</include>
@@ -43,40 +40,27 @@
                     <bordersize>3</bordersize>
                 </control>
             </control>
+
             <!--content-->
             <control type="group">
                 <posx>col-7-begin</posx>
-                <posy>row-11-begin</posy>
+                <posy>row-17-begin</posy>
                 <!--titles-->
-                <control type="label">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>12-col</width>
-                    <align>left</align>
-                    <font>itemSubTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor>-</shadowcolor>
-                    
-                
-                    <label>$INFO[ListItem.Property(console)]</label>
-                </control>
                 <control type="label">
                     <description>Title</description>
                     <posx>0</posx>
-                    <posy>1-row</posy>
+                    <posy>0</posy>
                     <width>12-col</width>
-                    <align>left</align>
                     <font>mediumStrong</font>
-                    
-                
                     <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
-                    <label>$INFO[ListItem.Label]</label>
+                    <label>[COLOR highlight]$INFO[ListItem.Property(console)][/COLOR] $INFO[ListItem.Label]</label>
                 </control>
+
                 <!--details-->
                 <control type="panel">
                     <posx>0</posx>
-                    <posy>120</posy>
+                    <posy>2-row</posy>
                     <width>12-col</width>
                     <height>6-row</height>
                     <itemlayout width="6-col" height="45">
@@ -84,7 +68,7 @@
                             <posx>0</posx>
                             <posy>0</posy>
                             <width>6-col-gutter</width>
-                            <font>itemSubTitle</font>
+                            <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>[COLOR highlight]$INFO[ListItem.label][/COLOR] $INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
@@ -95,7 +79,7 @@
                             <posx>0</posx>
                             <posy>0</posy>
                             <width>6-col-gutter</width>
-                            <font>itemSubTitle</font>
+                            <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>[COLOR highlight]$INFO[ListItem.label][/COLOR] $INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
@@ -195,6 +179,7 @@
                     <description>Messages</description>
                 </control>
                 <control type="button" id="3001">
+                    <visible>false</visible>
                     <description>autoplay video</description>
                     <onfocus>XBMC.PlayMedia($ESCINFO[ListItem.Property(gameplayinfo)],1)</onfocus>
                 </control>
diff --git a/1080i/script-Rom_Collection_Browser-main.xml b/1080i/script-Rom_Collection_Browser-main.xml
index e55d308..f92058c 100644
--- a/1080i/script-Rom_Collection_Browser-main.xml
+++ b/1080i/script-Rom_Collection_Browser-main.xml
@@ -13,48 +13,6 @@
             <!--shift page for certain modal dialogs-->
             <include>modalDialogContentShift</include>
 
-            <!-- Console menu-->
-            <control type="list" id="500">
-                <posx>0</posx>
-                <posy>row-8-begin</posy>
-                <width>3-col</width>
-                <height>12-row</height>
-                <orientation>vertical</orientation>
-                <preloaditems>2</preloaditems>
-                <onleft>62</onleft>
-                <onright>9999</onright>
-                <itemlayout width="4-col" height="43">
-                    <control type="label">
-                        <posx>14</posx>
-                        <posy>0</posy>
-                        <width>3-col-gutter</width>
-                        <font>menuTitle</font>
-                        <label>$INFO[ListItem.Label]</label>
-                        <textcolor>unselected</textcolor>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="4-col" height="43">
-                    <control type="label">
-                        <visible>Control.HasFocus(500)</visible>
-                        <posx>1</posx>
-                        <posy>0</posy>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
-                        <label>[ $INFO[ListItem.Label] ]</label>
-                        <textcolor>textActive</textcolor>
-                    </control>
-                    <control type="label">
-                        <visible>!Control.HasFocus(500)</visible>
-                        <posx>14</posx>
-                        <posy>0</posy>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
-                        <label>$INFO[ListItem.Label]</label>
-                        <textcolor>unselected</textcolor>
-                    </control>
-                </focusedlayout>
-            </control>
-
             <!--Main content listing-->
             <control type="group" id="9999">
                 <control type="panel" id="50">
@@ -177,419 +135,449 @@
         <!--end of page container group-->
         </control>
 
+        <!-- Console menu-->
+        <control type="group" id="9000">
+            <animation type="Conditional" condition="controlgroup(9000).hasfocus">
+                <effect type="fade" start="0" end="100" time="300"/>
+                <effect type="slide" start="-200" end="0" tween="sine" easing="out" time="400"/>
+            </animation>
+            <animation type="Conditional" condition="!controlgroup(9000).hasfocus">
+                <effect type="fade" start="100" end="0" time="300"/>
+                <effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
+            </animation>
+            <control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>col-7-begin</width>
+                <height>fullscreenHeight</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <!--logo-->
+            <control type="image">
+                <posx>col-1-begin</posx>
+                <posy>row-1-begin</posy>
+                <width>1-col</width>
+                <height>1-col</height>
+                <texture>kodilogo.png</texture>
+                <colordiffuse>textActive</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+                <animation type="Conditional" condition="controlgroup(9000).hasfocus">
+                    <effect type="rotatey" start="0" end="-15" center="132" tween="back" easing="out" delay="600" time="300"/>
+                    <effect type="rotatey" start="0" end="15" center="132" tween="back" easing="out" delay="900" time="300"/>
+                </animation>
+            </control>
+            <control type="list" id="500">
+                <posx>0</posx>
+                <posy>row-4-begin</posy>
+                <width>8-col</width>
+                <height>24-row</height>
+                <orientation>vertical</orientation>
+                <onleft>9002</onleft>
+                <onright>9999</onright>
+                <onback>activateWindow(home)</onback>
+                <itemlayout width="col-7-begin" height="2-row">
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>7-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="col-7-begin" height="2-row">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>col-7-begin</width>
+                        <height>2-row</height>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>textActive</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                    </control>
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>8-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>highlight</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </focusedlayout>
+            </control>
+        </control>
 
         <!--sorting and misc controls-->
         <control type="group" id="61">
-            <!--animations-->
-            <animation type="Conditional" condition="!controlgroup(61).hasfocus">
-                <effect type="fade" start="100" end="0" time="200"/>
+            <animation type="Conditional" condition="!controlgroup(9002).hasfocus | window.isactive(5900) | window.isactive(5000)">
+                <effect type="fade" start="100" end="0" time="300"/>
+                <effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
             </animation>
-            <animation type="Conditional" condition="controlgroup(61).hasfocus">
-                <effect type="fade" start="0" end="100" time="200"/>
+            <animation type="Conditional" condition="controlgroup(9002).hasfocus">
+                <effect type="fade" start="0" end="100" time="300"/>
+                <effect type="slide" start="-200" end="0" tween="sine" easing="out" time="400"/>
             </animation>
-            <!--overlay-->
             <control type="image">
-                <include>dimensionsFullscreen</include>
-                <texture>backgrounds/vignette.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>col-7-begin</width>
+                <height>fullscreenHeight</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <!--titles-->
-            <control type="group">
-                <posx>24</posx>
-                <posy>111</posy>
-                <animation type="Conditional" condition="controlgroup(62).hasfocus">
-                    <effect type="fade" start="0" end="100" time="300"/>
-                    <effect type="slide" start="-100" end="0" tween="sine" easing="out" time="400"/>
+            <!--logo-->
+            <control type="image">
+                <posx>col-1-begin</posx>
+                <posy>row-1-begin</posy>
+                <width>1-col</width>
+                <height>1-col</height>
+                <texture>kodilogo.png</texture>
+                <colordiffuse>textActive</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+                <animation type="Conditional" condition="controlgroup(9000).hasfocus">
+                    <effect type="rotatey" start="0" end="-15" center="132" tween="back" easing="out" delay="600" time="300"/>
+                    <effect type="rotatey" start="0" end="15" center="132" tween="back" easing="out" delay="900" time="300"/>
                 </animation>
-                <animation type="Conditional" condition="!controlgroup(62).hasfocus">
-                    <effect type="fade" start="100" end="0" time="300"/>
-                    <effect type="slide" start="0" end="-100" tween="sine" easing="out" time="400"/>
-                </animation>
-                <!--menu-->
-                <control type="image">
-                    <posx>-96</posx>
-                    <posy>-111</posy>
-                    <width>col-5-begin</width>
-                    <height>fullscreenHeight</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture>colors/white.png</texture>
-                    <colordiffuse>ffffffff</colordiffuse>
-                    <bordersize>0</bordersize>
+            </control>
+            <control type="grouplist" id="9002">
+                <posx>0</posx>
+                <posy>row-4-begin</posy>
+                <width>col-7-begin</width>
+                <height>27-row</height>
+                <itemgap>0</itemgap>
+                <onright>9000</onright>
+                <onup>9002</onup>
+                <ondown>9002</ondown>
+                <control type="button" id="1100">
+                    <description>Search</description>
+                    <label>31124</label>
+                    <height>2-row</height>
+                    <width>col-7-begin</width>
+                    <font>menuTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <disabledcolor>menuDisabled</disabledcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
+                    <texturenofocus>-</texturenofocus>
+                    <textoffsetx>col-1-begin</textoffsetx>
                 </control>
-                <!--titles-->
-                <control type="label">
-                    <description>video</description>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>14-col</width>
-                    <font>pageTitle</font>
-                    <label>31156</label>
-                    <textcolor>black</textcolor>
-                    <shadowcolor>-</shadowcolor>
+                <control type="button" id="2000">
+                    <description>Genre</description>
+                    <label>$ADDON[script.games.rom.collection.browser 32401]: $INFO[control.getlabel(600)] </label>
+                    <height>2-row</height>
+                    <width>col-7-begin</width>
+                    <font>menuTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <disabledcolor>menuDisabled</disabledcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
+                    <texturenofocus>-</texturenofocus>
+                    <textoffsetx>col-1-begin</textoffsetx>
+                    <onclick>control.setfocus(600)</onclick>
                 </control>
-                <control type="label">
-                    <posx>0</posx>
-                    <posy>45</posy>
-                    <width>24-col</width>
-                    <font>regular</font>
-                    <label>33063</label>
-                    <textcolor>black</textcolor>
-                    <shadowcolor>-</shadowcolor>
+                <control type="button" id="2001">
+                    <description>Year</description>
+                    <label>$ADDON[script.games.rom.collection.browser 32400]: $INFO[control.getlabel(700)] </label>
+                    <height>2-row</height>
+                    <width>col-7-begin</width>
+                    <font>menuTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <disabledcolor>menuDisabled</disabledcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
+                    <texturenofocus>-</texturenofocus>
+                    <textoffsetx>col-1-begin</textoffsetx>
+                    <onclick>control.setfocus(700)</onclick>
                 </control>
-                <control type="grouplist" id="62">
-                    <posx>-12</posx>
-                    <posy>166</posy>
-                    <width>4-col</width>
-                    <height>12-row</height>
-                    <itemgap>0</itemgap>
-                    <onright>9000</onright>
-                    <onup>62</onup>
-                    <ondown>62</ondown>
-                    <control type="button" id="1100">
-                        <description>Search</description>
-                        <label>31124</label>
-                        <height>54</height>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
-                        <textcolor>black</textcolor>
-                        <focusedcolor>selected</focusedcolor>
-                        <texturefocus>colors/black.png</texturefocus>
-                        <texturenofocus>colors/unselected.png</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
-                    </control>
-                    <control type="button" id="2000">
-                        <description>Genre</description>
-                        <label>$ADDON[script.games.rom.collection.browser 32401]: $INFO[control.getlabel(600)] </label>
-                        <height>54</height>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
-                        <textcolor>black</textcolor>
-                        <focusedcolor>selected</focusedcolor>
-                        <texturefocus>colors/black.png</texturefocus>
-                        <texturenofocus>colors/unselected.png</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
-                        <onclick>control.setfocus(600)</onclick>
-                    </control>
-                    <control type="button" id="2001">
-                        <description>Year</description>
-                        <label>$ADDON[script.games.rom.collection.browser 32400]: $INFO[control.getlabel(700)] </label>
-                        <height>54</height>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
-                        <textcolor>black</textcolor>
-                        <focusedcolor>selected</focusedcolor>
-                        <texturefocus>colors/black.png</texturefocus>
-                        <texturenofocus>colors/unselected.png</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
-                        <onclick>control.setfocus(700)</onclick>
-                    </control>
-                    <control type="button" id="2002">
-                        <description>Publisher</description>
-                        <label>$ADDON[script.games.rom.collection.browser 32402]: $INFO[control.getlabel(800)] </label>
-                        <height>54</height>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
-                        <textcolor>black</textcolor>
-                        <focusedcolor>selected</focusedcolor>
-                        <texturefocus>colors/black.png</texturefocus>
-                        <texturenofocus>colors/unselected.png</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
-                        <onclick>control.setfocus(800)</onclick>
-                    </control>
-                    <control type="button" id="2003">
-                        <description>Character</description>
-                        <label>$ADDON[script.games.rom.collection.browser 32407]: $INFO[control.getlabel(900)] </label>
-                        <height>54</height>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
-                        <textcolor>black</textcolor>
-                        <focusedcolor>selected</focusedcolor>
-                        <texturefocus>colors/black.png</texturefocus>
-                        <texturenofocus>colors/unselected.png</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
-                        <onclick>control.setfocus(900)</onclick>
-                    </control>
-                    <control type="radiobutton" id="1000">
-                        <description>Favourites filter</description>
-                        <height>54</height>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
-                        <textcolor>black</textcolor>
-                        <focusedcolor>selected</focusedcolor>
-                        <texturefocus>colors/black.png</texturefocus>
-                        <texturenofocus>colors/unselected.png</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
-                        <label>$ADDON[script.games.rom.collection.browser 32404]:</label>
-                    </control>
-                    <control type="button" id="4001">
-                        <description>Missing info filter</description>
-                        <height>54</height>
-                        <width>4-col</width>
-                        <font>menuTitle</font>
-                        <textcolor>black</textcolor>
-                        <focusedcolor>selected</focusedcolor>
-                        <texturefocus>colors/black.png</texturefocus>
-                        <texturenofocus>colors/unselected.png</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
-                        <label>$ADDON[script.games.rom.collection.browser 32409]</label>
-                    </control>
+                <control type="button" id="2002">
+                    <description>Publisher</description>
+                    <label>$ADDON[script.games.rom.collection.browser 32402]: $INFO[control.getlabel(800)] </label>
+                    <height>2-row</height>
+                    <width>col-7-begin</width>
+                    <font>menuTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <disabledcolor>menuDisabled</disabledcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
+                    <texturenofocus>-</texturenofocus>
+                    <textoffsetx>col-1-begin</textoffsetx>
+                    <onclick>control.setfocus(800)</onclick>
+                </control>
+                <control type="button" id="2003">
+                    <description>Character</description>
+                    <label>$ADDON[script.games.rom.collection.browser 32407]: $INFO[control.getlabel(900)] </label>
+                    <height>2-row</height>
+                    <width>col-7-begin</width>
+                    <font>menuTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <disabledcolor>menuDisabled</disabledcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
+                    <texturenofocus>-</texturenofocus>
+                    <textoffsetx>col-1-begin</textoffsetx>
+                    <onclick>control.setfocus(900)</onclick>
+                </control>
+                <control type="radiobutton" id="1000">
+                    <description>Favourites filter</description>
+                    <height>2-row</height>
+                    <width>col-7-begin</width>
+                    <font>menuTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <disabledcolor>menuDisabled</disabledcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
+                    <texturenofocus>-</texturenofocus>
+                    <textoffsetx>col-1-begin</textoffsetx>
+                    <label>$ADDON[script.games.rom.collection.browser 32404]:</label>
+                </control>
+                <control type="button" id="4001">
+                    <description>Missing info filter</description>
+                    <height>2-row</height>
+                    <width>col-7-begin</width>
+                    <font>menuTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <focusedcolor>highlight</focusedcolor>
+                    <disabledcolor>menuDisabled</disabledcolor>
+                    <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
+                    <texturenofocus>-</texturenofocus>
+                    <textoffsetx>col-1-begin</textoffsetx>
+                    <label>$ADDON[script.games.rom.collection.browser 32409]</label>
                 </control>
             </control>
         </control>
+
         <!-- filter controls -->
         <control type="group" id="100">
-            <!--animations-->
-            <animation type="Conditional" condition="!control.hasfocus(600) + !control.hasfocus(700) + !control.hasfocus(800) + !control.hasfocus(900)">
+            <animation type="Conditional" condition="!controlgroup(100).hasfocus">
                 <effect type="fade" start="100" end="0" time="300"/>
-                <effect type="slide" start="0" end="-100" tween="sine" easing="out" time="400"/>
+                <effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
             </animation>
-            <animation type="Conditional" condition="control.hasfocus(600) | control.hasfocus(700) | control.hasfocus(800) | control.hasfocus(900)">
+            <animation type="Conditional" condition="controlgroup(100).hasfocus">
                 <effect type="fade" start="0" end="100" time="300"/>
-                <effect type="slide" start="-100" end="0" tween="sine" easing="out" time="400"/>
+                <effect type="slide" start="-200" end="0" tween="sine" easing="out" time="400"/>
             </animation>
-            <!--overlay-->
             <control type="image">
-                <include>dimensionsFullscreen</include>
-                <texture>backgrounds/vignette.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <!--menu-->
-            <control type="image">
-                <posx>-96</posx>
+                <posx>0</posx>
                 <posy>0</posy>
-                <width>col-5-begin</width>
+                <width>col-7-begin</width>
                 <height>fullscreenHeight</height>
-                <aspectratio>stretch</aspectratio>
                 <texture>colors/white.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <bordersize>0</bordersize>
+                <colordiffuse>highlight</colordiffuse>
+                <aspectratio>stretch</aspectratio>
             </control>
-            <!--titles-->
-            <control type="group">
-                <posx>24</posx>
-                <posy>111</posy>
-                <!--menu-->
-                <control type="image">
-                    <posx>-96</posx>
-                    <posy>-111</posy>
-                    <width>col-5-begin</width>
-                    <height>fullscreenHeight</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture>colors/white.png</texture>
-                    <colordiffuse>ffffffff</colordiffuse>
-                    <bordersize>0</bordersize>
-                </control>
-                <!--titles-->
-                <control type="label">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>14-col</width>
-                    <font>pageTitle</font>
-                    <label>31156</label>
-                    <textcolor>black</textcolor>
-                    <shadowcolor>-</shadowcolor>
-                </control>
-                <control type="label">
-                    <posx>0</posx>
-                    <posy>45</posy>
-                    <width>24-col</width>
-                    <font>regular</font>
-                    <label>33063</label>
-                    <textcolor>black</textcolor>
-                    <shadowcolor>-</shadowcolor>
-                </control>
-                <!--genre-->
-                <control type="list" id="600">
-                    <visible allowhiddenfocus="true">Control.HasFocus(600)</visible>
-                    <posx>-12</posx>
-                    <posy>166</posy>
-                    <width>4-col</width>
-                    <height>12-row</height>
-                    <onleft>61</onleft>
-                    <onright>61</onright>
-                    <scrolltime tween="sine" easing="inout">300</scrolltime>
-                    <itemlayout height="1-row" width="4-col">
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>1-row</height>
-                            <font>menuTitle</font>
-                            <textcolor>black</textcolor>
-                            <selectedcolor>black</selectedcolor>
-                            <info>ListItem.Label</info>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </itemlayout>
-                    <focusedlayout height="1-row" width="4-col">
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>4-col</width>
-                            <height>54</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="0">colors/black.png</texture>
-                            <bordersize>0</bordersize>
-                            <colordiffuse>ffFFFFFF</colordiffuse>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>1-row</height>
-                            <font>menuTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
-                            <info>ListItem.Label</info>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </focusedlayout>
-                </control>
-                <!-- Year filter -->
-                <control type="list" id="700">
-                    <visible allowhiddenfocus="true">Control.HasFocus(700)</visible>
-                    <posx>-12</posx>
-                    <posy>166</posy>
-                    <width>4-col</width>
-                    <height>12-row</height>
-                    <onleft>61</onleft>
-                    <onright>61</onright>
-                    <scrolltime tween="sine" easing="inout">300</scrolltime>
-                    <itemlayout height="1-row" width="4-col">
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>1-row</height>
-                            <font>menuTitle</font>
-                            <textcolor>black</textcolor>
-                            <selectedcolor>black</selectedcolor>
-                            <info>ListItem.Label</info>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </itemlayout>
-                    <focusedlayout height="1-row" width="4-col">
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>4-col</width>
-                            <height>54</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="0">colors/black.png</texture>
-                            <bordersize>0</bordersize>
-                            <colordiffuse>ffFFFFFF</colordiffuse>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>1-row</height>
-                            <font>menuTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
-                            <info>ListItem.Label</info>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </focusedlayout>
-                </control>
-                <!-- Publisher filter -->
-                <control type="list" id="800">
-                    <visible allowhiddenfocus="true">Control.HasFocus(800)</visible>
-                    <posx>-12</posx>
-                    <posy>166</posy>
-                    <width>4-col</width>
-                    <height>12-row</height>
-                    <onleft>61</onleft>
-                    <onright>61</onright>
-                    <scrolltime tween="sine" easing="inout">300</scrolltime>
-                    <itemlayout height="1-row" width="4-col">
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>1-row</height>
-                            <font>menuTitle</font>
-                            <textcolor>black</textcolor>
-                            <selectedcolor>black</selectedcolor>
-                            <info>ListItem.Label</info>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </itemlayout>
-                    <focusedlayout height="1-row" width="4-col">
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>4-col</width>
-                            <height>54</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="0">colors/black.png</texture>
-                            <bordersize>0</bordersize>
-                            <colordiffuse>ffFFFFFF</colordiffuse>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>1-row</height>
-                            <font>menuTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
-                            <info>ListItem.Label</info>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </focusedlayout>
-                </control>
-                <!-- Character filter-->
-                <control type="list" id="900">
-                    <visible allowhiddenfocus="true">Control.HasFocus(900)</visible>
-                    <posx>-12</posx>
-                    <posy>166</posy>
-                    <width>4-col</width>
-                    <height>12-row</height>
-                    <onleft>61</onleft>
-                    <onright>61</onright>
-                    <scrolltime tween="sine" easing="inout">300</scrolltime>
-                    <itemlayout height="1-row" width="4-col">
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>1-row</height>
-                            <font>menuTitle</font>
-                            <textcolor>black</textcolor>
-                            <selectedcolor>black</selectedcolor>
-                            <info>ListItem.Label</info>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </itemlayout>
-                    <focusedlayout height="1-row" width="4-col">
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>4-col</width>
-                            <height>54</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="0">colors/black.png</texture>
-                            <bordersize>0</bordersize>
-                            <colordiffuse>ffFFFFFF</colordiffuse>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>1-row</height>
-                            <font>menuTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
-                            <info>ListItem.Label</info>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </focusedlayout>
-                </control>
+            <!--logo-->
+            <control type="image">
+                <posx>col-1-begin</posx>
+                <posy>row-1-begin</posy>
+                <width>1-col</width>
+                <height>1-col</height>
+                <texture>kodilogo.png</texture>
+                <colordiffuse>textActive</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+                <animation type="Conditional" condition="controlgroup(9000).hasfocus">
+                    <effect type="rotatey" start="0" end="-15" center="132" tween="back" easing="out" delay="600" time="300"/>
+                    <effect type="rotatey" start="0" end="15" center="132" tween="back" easing="out" delay="900" time="300"/>
+                </animation>
+            </control>
+            <!--genre-->
+            <control type="list" id="600">
+                <visible allowhiddenfocus="true">Control.HasFocus(600)</visible>
+                <posx>0</posx>
+                <posy>row-4-begin</posy>
+                <width>8-col</width>
+                <height>24-row</height>
+                <orientation>vertical</orientation>
+                <onleft>9002</onleft>
+                <onright>9999</onright>
+                <onback>activateWindow(home)</onback>
+                <itemlayout width="col-7-begin" height="2-row">
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>7-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="col-7-begin" height="2-row">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>col-7-begin</width>
+                        <height>2-row</height>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>textActive</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                    </control>
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>8-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>highlight</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </focusedlayout>
+            </control>
+            <!-- Year filter -->
+            <control type="list" id="700">
+                <visible allowhiddenfocus="true">Control.HasFocus(700)</visible>
+                <posx>0</posx>
+                <posy>row-4-begin</posy>
+                <width>8-col</width>
+                <height>24-row</height>
+                <orientation>vertical</orientation>
+                <onleft>9002</onleft>
+                <onright>9999</onright>
+                <onback>activateWindow(home)</onback>
+                <itemlayout width="col-7-begin" height="2-row">
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>7-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="col-7-begin" height="2-row">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>col-7-begin</width>
+                        <height>2-row</height>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>textActive</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                    </control>
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>8-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>highlight</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </focusedlayout>
+            </control>
+            <!-- Publisher filter -->
+            <control type="list" id="800">
+                <visible allowhiddenfocus="true">Control.HasFocus(800)</visible>
+                <posx>0</posx>
+                <posy>row-4-begin</posy>
+                <width>8-col</width>
+                <height>24-row</height>
+                <orientation>vertical</orientation>
+                <onleft>9002</onleft>
+                <onright>9999</onright>
+                <onback>activateWindow(home)</onback>
+                <itemlayout width="col-7-begin" height="2-row">
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>7-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="col-7-begin" height="2-row">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>col-7-begin</width>
+                        <height>2-row</height>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>textActive</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                    </control>
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>8-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>highlight</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </focusedlayout>
+            </control>
+            <!-- Character filter-->
+            <control type="list" id="900">
+                <visible allowhiddenfocus="true">Control.HasFocus(900)</visible>
+                <posx>0</posx>
+                <posy>row-4-begin</posy>
+                <width>8-col</width>
+                <height>24-row</height>
+                <orientation>vertical</orientation>
+                <onleft>9002</onleft>
+                <onright>9999</onright>
+                <onback>activateWindow(home)</onback>
+                <itemlayout width="col-7-begin" height="2-row">
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>7-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="col-7-begin" height="2-row">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>col-7-begin</width>
+                        <height>2-row</height>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>textActive</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                    </control>
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>8-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>highlight</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </focusedlayout>
             </control>
         </control>
+
         <!-- Busy indicator -->
         <control type="group">
             <visible>!isempty(control.getlabel(4000))</visible>
diff --git a/addon.xml b/addon.xml
index 0083e6f..7d49608 100644
--- a/addon.xml
+++ b/addon.xml
@@ -6,7 +6,7 @@
         <import addon="script.artistslideshow" version="1.5.0"/>
         <import addon="script.maximinimalism.functions" version="1.0.0"/>
     </requires>
-    <extension point="xbmc.gui.skin" defaultthemename="textures.xbt" debugging="false">
+    <extension point="xbmc.gui.skin" debugging="false">
         <res width="1920" height="1080" aspect="16:9" default="true" folder="1080i" />
     </extension>
     <extension point="xbmc.addon.metadata">