diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index 3db8e4c..8ad6aa7 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -48,6 +48,7 @@
                     <posy>276</posy>
                     <height>672</height>
                     <onleft>9999</onleft>
+                    <onright>9002</onright>
                 </control>
             </control>
 
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index 4382345..2789efc 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -37,6 +37,7 @@
                     <posy>row-5-begin</posy>
                     <height>22-row</height>
                     <onleft>9999</onleft>
+                    <onright>9002</onright>
                 </control>
             </control>
 
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 5fc28fb..d999a87 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -186,6 +186,7 @@
                     <posy>row-5-begin</posy>
                     <height>21-row</height>
                     <onleft>9999</onleft>
+                    <onright>9002</onright>
                 </control>
             </control>
 
diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml
index 29f3134..88a6299 100644
--- a/1080i/MyPics.xml
+++ b/1080i/MyPics.xml
@@ -28,6 +28,7 @@
                     <posy>row-5-begin</posy>
                     <height>826</height>
                     <onleft>9999</onleft>
+                    <onright>9002</onright>
                 </control>
             </control>
             <!--Folder titles-->
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index cd6cbe9..a694585 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -58,6 +58,7 @@
                     <posy>row-5-begin</posy>
                     <height>23-row</height>
                     <onleft>9999</onleft>
+                    <onright>9002</onright>
                 </control>
             </control>
 
diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml
index 265237d..171818b 100644
--- a/1080i/MyWeather.xml
+++ b/1080i/MyWeather.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol always="true">3</defaultcontrol>
+    <defaultcontrol always="true">100</defaultcontrol>
     <include>fadeInOut</include>
     <controls>
         <!--background-->
@@ -222,13 +222,14 @@
         </control>
 
         <!--location control-->
-        <control type="spincontrolex" id="3">
+        <control type="button" id="100">
             <description>change location button</description>
             <left>-100</left>
             <top>-100</top>
             <width>6-col</width>
-            <onright>action(select)</onright>
-            <onleft>action(select)</onleft>
+            <onclick>noop</onclick>
+            <onright>Weather.LocationNext</onright>
+            <onleft>Weather.LocationPrevious</onleft>
         </control>
 
         <!--debugging-->
diff --git a/1080i/script-globalsearch-main.xml b/1080i/script-globalsearch-main.xml
index 7bf06c1..5def2f5 100644
--- a/1080i/script-globalsearch-main.xml
+++ b/1080i/script-globalsearch-main.xml
@@ -3,7 +3,7 @@
 
     <include>fadeInOut</include>
     <controls>
-        <include>globalBackground</include>
+        <include>modalDialog</include>
         <include>dateTime</include>
         <!--main group id-->
         <control type="group" id="100">
@@ -85,38 +85,21 @@
                 <posx>0</posx>
                 <posy>4-row</posy>
                 <width>24-col</width>
-                <height>23-row</height>
+                <height>21-row</height>
                 <orientation>horizontal</orientation>
+                <scrolltime tween="cubic" easing="out">600</scrolltime>
 
                 <!--col 1: movies-->
                 <control type="group" id="119">
-                    <width>6-col-textbox</width>
+                    <width>8-col</width>
                     <!--header-->
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2-row</posy>
-                        <width>6-col</width>
-                        <height>24-row</height>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
                     <control type="label">
-                        <posx>12</posx>
-                        <posy>0</posy>
+                        <posx>0</posx>
+                        <posy>-12</posy>
                         <width>8-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>dialogTitle</font>
+                        <font>regularStrong</font>
                         <label>$LOCALIZE[342]</label>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -127,15 +110,23 @@
                     <control type="panel" id="111">
                         <posx>0</posx>
                         <posy>2-row</posy>
-                        <width>6-col</width>
+                        <width>8-col</width>
                         <height>22-row</height>
                         <onleft>181</onleft>
                         <onright>121</onright>
-                        <itemlayout width="6-col" height="75">
+                        <itemlayout width="8-col" height="2-row">
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            </control>
                             <control type="label">
-                                <posx>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
@@ -144,23 +135,36 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout width="6-col" height="75">
+                        <focusedlayout width="8-col" height="2-row">
                             <control type="image">
-                                <posx>0</posx>
+                                <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>6-col</width>
+                                <width>7-col-gutter</width>
                                 <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
+                                <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
+                            </control>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <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>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
-                                <textcolor>black</textcolor>
+                                <textcolor>textActive</textcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
@@ -169,33 +173,15 @@
                 </control>
                 <!--tv shows-->
                 <control type="group" id="129">
-                    <width>6-col-textbox</width>
+                    <width>8-col</width>
                     <!--header-->
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2-row</posy>
-                        <width>6-col</width>
-                        <height>24-row</height>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
                     <control type="label">
-                        <posx>12</posx>
-                        <posy>0</posy>
+                        <posx>0</posx>
+                        <posy>-12</posy>
                         <width>8-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>dialogTitle</font>
+                        <font>regularStrong</font>
                         <label>$LOCALIZE[20343]</label>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -207,15 +193,23 @@
                     <control type="panel" id="121">
                         <posx>0</posx>
                         <posy>2-row</posy>
-                        <width>6-col</width>
+                        <width>8-col</width>
                         <height>22-row</height>
                         <onleft>111</onleft>
                         <onright>131</onright>
-                        <itemlayout width="6-col" height="75">
+                        <itemlayout width="8-col" height="2-row">
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            </control>
                             <control type="label">
-                                <posx>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
@@ -224,23 +218,36 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout width="6-col" height="75">
+                        <focusedlayout width="8-col" height="2-row">
                             <control type="image">
-                                <posx>0</posx>
+                                <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>6-col</width>
+                                <width>7-col-gutter</width>
                                 <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
+                                <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
+                            </control>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <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>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
-                                <textcolor>black</textcolor>
+                                <textcolor>textActive</textcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
@@ -249,33 +256,15 @@
                 </control>
                 <!--seasons-->
                 <control type="group" id="139">
-                    <width>6-col-textbox</width>
+                    <width>8-col</width>
                     <!--header-->
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2-row</posy>
-                        <width>6-col</width>
-                        <height>24-row</height>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
                     <control type="label">
-                        <posx>12</posx>
-                        <posy>0</posy>
+                        <posx>0</posx>
+                        <posy>-12</posy>
                         <width>8-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>dialogTitle</font>
+                        <font>regularStrong</font>
                         <label>$LOCALIZE[33054]</label>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -287,15 +276,23 @@
                     <control type="panel" id="131">
                         <posx>0</posx>
                         <posy>2-row</posy>
-                        <width>6-col</width>
+                        <width>8-col</width>
                         <height>22-row</height>
                         <onleft>121</onleft>
                         <onright>141</onright>
-                        <itemlayout width="6-col" height="75">
+                        <itemlayout width="8-col" height="2-row">
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            </control>
                             <control type="label">
-                                <posx>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
@@ -304,23 +301,36 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout width="6-col" height="75">
+                        <focusedlayout width="8-col" height="2-row">
                             <control type="image">
-                                <posx>0</posx>
+                                <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>6-col</width>
+                                <width>7-col-gutter</width>
                                 <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
+                                <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
+                            </control>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <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>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
-                                <textcolor>black</textcolor>
+                                <textcolor>textActive</textcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
@@ -329,32 +339,14 @@
                 </control>
                 <!--episodes-->
                 <control type="group" id="149">
-                    <width>6-col-textbox</width>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2-row</posy>
-                        <width>6-col</width>
-                        <height>24-row</height>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
+                    <width>8-col</width>
                     <control type="label">
-                        <posx>12</posx>
-                        <posy>0</posy>
+                        <posx>0</posx>
+                        <posy>-12</posy>
                         <width>8-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>dialogTitle</font>
+                        <font>regularStrong</font>
                         <label>$LOCALIZE[20360]</label>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -366,15 +358,23 @@
                     <control type="panel" id="141">
                         <posx>0</posx>
                         <posy>2-row</posy>
-                        <width>6-col</width>
+                        <width>8-col</width>
                         <height>22-row</height>
                         <onleft>131</onleft>
                         <onright>151</onright>
-                        <itemlayout width="6-col" height="75">
-                             <control type="label">
-                                <posx>12</posx>
+                        <itemlayout width="8-col" height="2-row">
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            </control>
+                            <control type="label">
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
@@ -383,23 +383,36 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout width="6-col" height="75">
+                        <focusedlayout width="8-col" height="2-row">
                             <control type="image">
-                                <posx>0</posx>
+                                <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>6-col</width>
+                                <width>7-col-gutter</width>
                                 <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
+                                <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
+                            </control>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <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>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
-                                <textcolor>black</textcolor>
+                                <textcolor>textActive</textcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
@@ -408,32 +421,14 @@
                 </control>
                 <!--music videos-->
                 <control type="group" id="159">
-                    <width>6-col-textbox</width>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2-row</posy>
-                        <width>6-col</width>
-                        <height>24-row</height>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
+                    <width>8-col</width>
                     <control type="label">
-                        <posx>12</posx>
-                        <posy>0</posy>
+                        <posx>0</posx>
+                        <posy>-12</posy>
                         <width>8-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>dialogTitle</font>
+                        <font>regularStrong</font>
                         <label>$LOCALIZE[20389]</label>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -445,15 +440,23 @@
                     <control type="panel" id="151">
                         <posx>0</posx>
                         <posy>2-row</posy>
-                        <width>6-col</width>
+                        <width>8-col</width>
                         <height>22-row</height>
                         <onleft>141</onleft>
                         <onright>161</onright>
-                        <itemlayout width="6-col" height="75">
+                        <itemlayout width="8-col" height="2-row">
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            </control>
                             <control type="label">
-                                <posx>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
@@ -462,23 +465,36 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout width="6-col" height="75">
+                        <focusedlayout width="8-col" height="2-row">
                             <control type="image">
-                                <posx>0</posx>
+                                <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>6-col</width>
+                                <width>7-col-gutter</width>
                                 <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
+                                <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
                             </control>
-                              <control type="label">
-                                <posx>12</posx>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <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>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
-                                <textcolor>black</textcolor>
+                                <textcolor>textActive</textcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
@@ -487,33 +503,15 @@
                 </control>
                 <!--artists-->
                 <control type="group" id="169">
-                    <width>6-col-textbox</width>
+                    <width>8-col</width>
                     <!--header-->
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2-row</posy>
-                        <width>6-col</width>
-                        <height>24-row</height>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
                     <control type="label">
-                        <posx>12</posx>
-                        <posy>0</posy>
+                        <posx>0</posx>
+                        <posy>-12</posy>
                         <width>8-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>dialogTitle</font>
+                        <font>regularStrong</font>
                         <label>$LOCALIZE[133]</label>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -525,15 +523,23 @@
                     <control type="panel" id="161">
                         <posx>0</posx>
                         <posy>2-row</posy>
-                        <width>6-col</width>
+                        <width>8-col</width>
                         <height>22-row</height>
                         <onleft>151</onleft>
                         <onright>171</onright>
-                        <itemlayout width="6-col" height="75">
+                        <itemlayout width="8-col" height="2-row">
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            </control>
                             <control type="label">
-                                <posx>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
@@ -542,23 +548,36 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout width="6-col" height="75">
+                        <focusedlayout width="8-col" height="2-row">
                             <control type="image">
-                                <posx>0</posx>
+                                <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>6-col</width>
+                                <width>7-col-gutter</width>
                                 <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
+                                <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
+                            </control>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <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>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
-                                <textcolor>black</textcolor>
+                                <textcolor>textActive</textcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
@@ -567,33 +586,15 @@
                 </control>
                 <!--albums-->
                 <control type="group" id="179">
-                    <width>6-col-textbox</width>
+                    <width>8-col</width>
                     <!--header-->
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2-row</posy>
-                        <width>6-col</width>
-                        <height>24-row</height>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
                     <control type="label">
-                        <posx>12</posx>
-                        <posy>0</posy>
+                        <posx>0</posx>
+                        <posy>-12</posy>
                         <width>8-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>dialogTitle</font>
+                        <font>regularStrong</font>
                         <label>$LOCALIZE[132]</label>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -605,15 +606,23 @@
                     <control type="panel" id="171">
                         <posx>0</posx>
                         <posy>2-row</posy>
-                        <width>6-col</width>
+                        <width>8-col</width>
                         <height>22-row</height>
                         <onleft>161</onleft>
                         <onright>181</onright>
-                        <itemlayout width="6-col" height="75">
+                        <itemlayout width="8-col" height="2-row">
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            </control>
                             <control type="label">
-                                <posx>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
@@ -622,23 +631,36 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout width="6-col" height="75">
+                        <focusedlayout width="8-col" height="2-row">
                             <control type="image">
-                                <posx>0</posx>
+                                <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>6-col</width>
+                                <width>7-col-gutter</width>
                                 <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
+                                <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
+                            </control>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <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>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
-                                <textcolor>black</textcolor>
+                                <textcolor>textActive</textcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
@@ -647,33 +669,15 @@
                 </control>
                 <!--songs-->
                 <control type="group" id="189">
-                    <width>6-col-textbox</width>
+                    <width>8-col</width>
                     <!--header-->
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2-row</posy>
-                        <width>6-col</width>
-                        <height>24-row</height>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
                     <control type="label">
-                        <posx>12</posx>
-                        <posy>0</posy>
+                        <posx>0</posx>
+                        <posy>-12</posy>
                         <width>8-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>dialogTitle</font>
+                        <font>regularStrong</font>
                         <label>$LOCALIZE[134]</label>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -685,15 +689,23 @@
                     <control type="panel" id="181">
                         <posx>0</posx>
                         <posy>2-row</posy>
-                        <width>6-col</width>
+                        <width>8-col</width>
                         <height>22-row</height>
                         <onleft>171</onleft>
                         <onright>111</onright>
-                        <itemlayout width="6-col" height="75">
+                        <itemlayout width="8-col" height="2-row">
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            </control>
                             <control type="label">
-                                <posx>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
@@ -702,23 +714,36 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout width="6-col" height="75">
+                        <focusedlayout width="8-col" height="2-row">
                             <control type="image">
-                                <posx>0</posx>
+                                <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>6-col</width>
+                                <width>7-col-gutter</width>
                                 <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
+                                <colordiffuse>$INFO[skin.string(highlightColor)]</colordiffuse>
+                            </control>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <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>12</posx>
+                                <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>6-col-gutter</width>
+                                <width>6-col</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
-                                <textcolor>black</textcolor>
+                                <textcolor>textActive</textcolor>
                                 <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>