diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..9b64177
Binary files /dev/null and b/.DS_Store differ
diff --git a/1080i/.DS_Store b/1080i/.DS_Store
new file mode 100644
index 0000000..2704034
Binary files /dev/null and b/1080i/.DS_Store differ
diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 7a85838..f77992f 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -23,14 +23,14 @@
 	            	<control type="panel" id="50">
 		                <posx>col-1-begin</posx>
 		                <posy>row-5-begin</posy>
-		                <width>15-col</width>
+		                <width>24-col</width>
 		                <height>23-row</height>
 		                <onleft>9000</onleft>
 		                <onright>60</onright>
 		                <ondown>50</ondown>
 		                <onup>50</onup>
 		                <pagecontrol>60</pagecontrol>
-		                <itemlayout width="15-col" height="2-row">
+		                <itemlayout width="8-col" height="2-row">
 		                    <control type="image">
 		                        <posx>0</posx>
 		                        <posy>3</posy>
@@ -38,179 +38,76 @@
 		                        <height>66</height>
 		                        <aspectratio scalediffuse="false">stretch</aspectratio>
 		                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-		                    </control>
-		                    <control type="image">
-		                        <posx>1-col</posx>
-		                        <posy>0</posy>
-		                        <width>12-col-textbox</width>
-		                        <height>69</height>
-		                        <aspectratio>stretch</aspectratio>
-		                        <texture border="0">colors/black.png</texture>
-		                        <colordiffuse>textboxInactive</colordiffuse>
 		                    </control>
 							<control type="image">
-		                        <posx>13-col</posx>
-		                        <posy>0</posy>
-		                        <width>1-col-textbox</width>
-		                        <height>69</height>
-		                        <aspectratio>stretch</aspectratio>
-		                        <texture border="0">colors/black.png</texture>
-		                        <colordiffuse>textboxInactive</colordiffuse>
-		                    </control>
-							<control type="image">
-		                        <posx>14-col</posx>
-		                        <posy>0</posy>
-		                        <width>1-col</width>
-		                        <height>69</height>
-		                        <aspectratio>stretch</aspectratio>
-		                        <texture border="0">colors/black.png</texture>
-		                        <colordiffuse>textboxInactive</colordiffuse>
-		                    </control>
-		                    <control type="label">
-		                        <posx>1-col-indent</posx>
-		                        <posy>0</posy>
-		                        <width>11-col-gutter</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <font>itemTitle</font>
-		                        <textcolor>textActive</textcolor>
-		                        <shadowcolor>-</shadowcolor>
-		                        <label>$INFO[ListItem.Label]</label>
-		                    </control>
-		                    <control type="label">
 								<visible>ListItem.AddonBroken</visible>
-		                        <posx>12-col-gutter</posx>
-		                        <posy>0</posy>
-		                        <width>2-col</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <align>right</align>
-		                        <font>symbolLarge</font>
-		                        <textcolor>textActive</textcolor>
-		                        <shadowcolor>-</shadowcolor>
-		                        <label></label>
-		                    </control>
-							<control type="label">
-								<visible>ListItem.Property(Addon.IsInstalled)</visible>
-		                        <posx>985</posx>
-		                        <posy>0</posy>
-		                        <width>1-col</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <align>right</align>
-		                        <font>symbolLarge</font>
-		                        <textcolor>textActive</textcolor>
-		                        <shadowcolor>-</shadowcolor>
-		                        <label></label>
-		                    </control>
-		                </itemlayout>
-		                <focusedlayout width="15-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/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-		                        <animation type="focus" loop="false" reversible="false">
+		                        <texture diffuse="masks/circle.png" border="0">colors/white.png</texture>
+								<colordiffuse>77ff0000</colordiffuse>
+		                    </control>
+		                    <control type="label">
+			                    <posx>1-col-indent</posx>
+			                    <posy>0</posy>
+			                    <width>6-col</width>
+			                    <height>2-row</height>
+			                    <aligny>center</aligny>
+			                    <font>itemTitle</font>
+			                    <textcolor>textActive</textcolor>
+			                    <shadowcolor>-</shadowcolor>
+			                    <label>$INFO[ListItem.Label]</label>
+			                </control>
+		                </itemlayout>
+		                <focusedlayout width="8-col" height="2-row">
+		                    <control type="group">
+								<animation type="focus" loop="false" reversible="false">
 		                            <effect type="fade" time="500"/>
 		                            <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
 		                        </animation>
-		                    </control>
+								<control type="image">
+			                        <posx>0</posx>
+			                        <posy>3</posy>
+			                        <width>66</width>
+			                        <height>66</height>
+			                        <aspectratio scalediffuse="false">stretch</aspectratio>
+			                        <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+			                    </control>
+								<control type="image">
+									<visible>ListItem.AddonBroken</visible>
+			                        <posx>0</posx>
+			                        <posy>3</posy>
+			                        <width>66</width>
+			                        <height>66</height>
+			                        <aspectratio scalediffuse="false">stretch</aspectratio>
+			                        <texture diffuse="masks/circle.png" border="0">colors/white.png</texture>
+									<colordiffuse>77ff0000</colordiffuse>
+			                    </control>
+							</control>
 		                    <control type="image">
 		                        <posx>1-col</posx>
 		                        <posy>0</posy>
-		                        <width>14-col</width>
+		                        <width>7-col</width>
 		                        <height>2-row</height>
 		                        <aspectratio>stretch</aspectratio>
 		                        <texture border="0">colors/white.png</texture>
 		                        <colordiffuse>highlight</colordiffuse>
 		                    </control>
 							<control type="label">
-		                        <posx>1-col-indent</posx>
-		                        <posy>0</posy>
-		                        <width>11-col-gutter</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <font>itemTitle</font>
-		                        <textcolor>textActive</textcolor>
-		                        <shadowcolor>-</shadowcolor>
-		                        <label>$INFO[ListItem.Label]</label>
-		                    </control>
-		                    <control type="label">
-								<visible>ListItem.AddonBroken</visible>
-		                        <posx>12-col-gutter</posx>
-		                        <posy>0</posy>
-		                        <width>2-col</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <align>right</align>
-		                        <font>symbolLarge</font>
-		                        <textcolor>textActive</textcolor>
-		                        <shadowcolor>-</shadowcolor>
-		                        <label></label>
-		                    </control>
-							<control type="label">
-								<visible>ListItem.Property(Addon.IsInstalled)</visible>
-		                        <posx>985</posx>
-		                        <posy>0</posy>
-		                        <width>1-col</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <align>right</align>
-		                        <font>symbolLarge</font>
-		                        <textcolor>textActive</textcolor>
-		                        <shadowcolor>-</shadowcolor>
-		                        <label></label>
-		                    </control>
+			                    <posx>1-col-indent</posx>
+			                    <posy>0</posy>
+			                    <width>6-col</width>
+			                    <height>2-row</height>
+			                    <aligny>center</aligny>
+			                    <font>itemTitle</font>
+			                    <textcolor>textActive</textcolor>
+			                    <shadowcolor>-</shadowcolor>
+			                    <label>$INFO[ListItem.Label]</label>
+			                </control>
 		                </focusedlayout>
 		            </control>
-	            </control>
-				<!--cover art-->
-	            <control type="group">
-	                <posx>col-17-begin</posx>
-	                <posy>222</posy>
-	                <control type="group">
-	                    <animation type="windowopen">
-	                        <effect type="fade" start="0" end="100" time="300" delay="700"/>
-	                        <effect type="slide" start="3-col" end="0" center="auto" tween="cubic" easing="out" time="400" delay="700"/>
-	                        <effect type="zoom" end="90" time="0"/>
-	                    </animation>
-	                    <control type="group">
-	                        <control type="image">
-	                            <posx>0</posx>
-	                            <posy>0</posy>
-	                            <width>8-col</width>
-	                            <height>8-col</height>
-	                            <aspectratio scalediffuse="false">stretch</aspectratio>
-	                            <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
-	                            <fadetime>200</fadetime>
-	                        </control>
-	                    </control>
-	                </control>
-					<control type="group">
-						<posy>13-row</posy>
-						<control type="label">
-			                <description>Addon Title</description>
-			                <visible>!isempty(ListItem.AddonCreator)</visible>
-			                <posx>0</posx>
-			                <posy>58</posy>
-			                <width>7-col</width>
-			                <height>2-row</height>
-			                <aligny>center</aligny>
-			                <font>mediumLight</font>
-			                <label>$INFO[ListItem.label]</label>
-			            </control>
-			            <control type="textbox" id="400">
-			                <posx>0</posx>
-			                <posy>4-row</posy>
-			                <font>textbox</font>
-			                <width>7-col</width>
-			                <height>178</height>
-			                <label>$INFO[ListItem.AddonDescription]</label>
-			                <autoscroll delay="5000" time="1000" repeat="10000"/>
-			            </control>
-					</control>		
 	            </control>
 	        </control>
 			<!--page scrollbar-->
@@ -219,8 +116,8 @@
 	            <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
 	            <control type="scrollbar" id="60">
                     <posx>48r</posx>
-                    <posy>row-5-begin</posy>
-                    <height>23-row</height>
+                    <posy>row-11-begin</posy>
+                    <height>9-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index 10a789c..8a7522e 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -6,7 +6,7 @@
         <!--About this addon-->
         <control type="group">
             <posx>col-4-begin</posx>
-            <posy>row-1-begin</posy>
+            <posy>row-4-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
@@ -34,7 +34,7 @@
                 <posx>0</posx>
                 <posy>2-row</posy>
                 <width>18-col</width>
-                <height>24-row</height>
+                <height>20-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
@@ -44,15 +44,15 @@
                 <posx>0</posx>
                 <posy>2-row</posy>
                 <width>18-col</width>
-                <height>10-row</height>
+                <height>8-row</height>
                 <aspectratio aligny="center">scale</aspectratio>
                 <texture fallback="colors/offblack.png">$INFO[ListItem.art(fanart)]</texture>
             </control>
 			<!--screenshots-->
 			<control type="panel" id="50">
-	            <posx>6-col</posx>
-	            <posy>3-row</posy>
-	            <width>12-col</width>
+	            <posx>1-col</posx>
+	            <posy>87</posy>
+	            <width>16-col</width>
 	            <height>8-row</height>
 	            <onleft>50</onleft>
 	            <onright>50</onright>
@@ -89,40 +89,30 @@
 	                </control>
 	            </focusedlayout>
 	        </control>
-			<control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>18-col</width>
-                <height>10-row</height>
-                <aspectratio aligny="center">scale</aspectratio>
-                <texture>vignette.png</texture>
-            </control>
-            <control type="image">
-                <posx>1-col</posx>
-                <posy>7-row</posy>
-                <width>2-col</width>
-                <height>2-col</height>
-                <aspectratio>stretch</aspectratio>
-                <texture fallback="colors/offblack.png">$INFO[ListItem.art(thumb)]</texture>
-                <bordertexture border="3" colordiffuse="07FFFFFF">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
-            </control>
             <control type="group">
                 <posx>6-col</posx>
-                <posy>12-row</posy>
+                <posy>10-row</posy>
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
                     <width>12-col</width>
-                    <height>14-row</height>
+                    <height>12-row</height>
                     <texture>colors/black.png</texture>
                     <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
+				<control type="image">
+	                <posx>12</posx>
+	                <posy>12</posy>
+	                <width>2-col-gutter</width>
+	                <height>2-col-gutter</height>
+	                <aspectratio>stretch</aspectratio>
+	                <texture fallback="colors/offblack.png">$INFO[ListItem.art(thumb)]</texture>
+	            </control>
                 <control type="label">
                     <description>Addon Title</description>
-                    <posx>12</posx>
-                    <posy>0</posy>
+                    <posx>2-col-indent</posx>
+                    <posy>12</posy>
                     <width>10-col-gutter</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
@@ -130,19 +120,19 @@
                     <label>$INFO[ListItem.addonname]</label>
                 </control>
                 <control type="label">
-                    <posx>12</posx>
+                    <posx>2-col-indent</posx>
                     <posy>2-row</posy>
                     <width>12-col-gutter</width>
-                    <font>small</font>
+                    <font>smallStrong</font>
                     <textcolor>highlight</textcolor>
-                    <label>[B]$INFO[ListItem.AddonCreator,$LOCALIZE[31082] ,][/B]</label>
+                    <label>$INFO[ListItem.AddonCreator,$LOCALIZE[31082] ,]</label>
                 </control>
                 <control type="textbox" id="400">
                     <posx>12</posx>
                     <posy>4-row</posy>
                     <font>textbox</font>
                     <width>12-col-gutter</width>
-                    <height>9-row</height>
+                    <height>7-row</height>
                     <label>$INFO[ListItem.AddonDescription]</label>
                     <autoscroll delay="5000" time="1000" repeat="10000"/>
                 </control>
@@ -151,7 +141,7 @@
             <control type="group">
                 <visible>!Window.IsVisible(AddonSettings) + !Window.IsActive(TextViewer)</visible>
                 <posx>0</posx>
-                <posy>12-row</posy>
+                <posy>10-row</posy>
                 <control type="list" id="8000">
                     <posx>0</posx>
                     <posy>0</posy>
diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml
index 1ee9a87..09c4b2a 100644
--- a/1080i/DialogMusicInfo.xml
+++ b/1080i/DialogMusicInfo.xml
@@ -282,7 +282,7 @@
                     <posy>24</posy>
                     <width>528</width>
                     <align>left</align>
-                    <height>3-row</height>
+                    <height>100</height>
                     <aligny>center</aligny>
                     <font>largeLight</font>
                     <textcolor>textActive</textcolor>
@@ -291,18 +291,18 @@
              </control>
                 <control type="label">
                     <posx>0</posx>
-                    <posy>-12</posy>
+                    <posy>-24</posy>
                     <width>528</width>
                     <align>left</align>
-                    <font>smallLight</font>
+                    <font>itemTitle</font>
                     <textcolor>textActive</textcolor>
-                    <label>$INFO[ListItem.artist,, ]$INFO[Listitem.year,(,)]</label>
+                    <label>$INFO[ListItem.artist]</label>
                     <shadowcolor>-</shadowcolor>
                 </control>
                 <!--synopsis-->
                 <control type="textbox">
                     <posx>0</posx>
-                    <posy>5-row</posy>
+                    <posy>168</posy>
                     <font>textbox</font>
                     <width>528</width>
                     <align>left</align>
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index 36b344a..3e230df 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -2,114 +2,63 @@
 <window>
     <defaultcontrol always="true">9000</defaultcontrol>
     <onload condition="!IntegerGreaterThan(container(3).numitems,0) + !IntegerGreaterThan(container(6).numitems,0)">control.SetFocus(9999)</onload>
-    <include>fadeInOut</include>
     <controls>
         <!--background-->
         <include>globalBackground</include>
-        <control type="group">
-            <!--animations-->
-            <include>modalDialogInOutVertical</include>
-            <control type="group">
-                <posx>col-4-begin</posx>
-                <posy>row-2-begin</posy>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>18-col</width>
-                    <height>2-row</height>
-                    <texture>colors/white.png</texture>
-                    <colordiffuse>highlight</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>18-col</width>
-                    <height>22-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-                <control type="image">
-                    <posx>6-col</posx>
-                    <posy>12-row</posy>
-                    <width>12-col</width>
-                    <height>12-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-                <control type="label" id="1">
-                    <posx>24</posx>
-                    <posy>0</posy>
-                    <width>16-col</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <font>dialogTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor>-</shadowcolor>
-                </control>
-                <control type="group" id="9000">
-                    <!--Info panel-->
-                    <control type="group">
-                        <posx>0</posx>
-                        <posy>2-row</posy>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>18-col</width>
-                            <height>10-row</height>
-                            <aspectratio aligny="center">scale</aspectratio>
-                            <texture>vignette.png</texture>
-                        </control>
-                        <control type="image">
-                            <posx>1-col</posx>
-                            <posy>1-row</posy>
-                            <width>4-col</width>
-                            <height>4-col</height>
-                            <aspectratio scalediffuse="false" align="center" aligny="center">keep</aspectratio>
-                            <texture border="0">$INFO[container(6).Listitem.icon]</texture>
-                            <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                            <bordersize>3</bordersize>
-                            <fadetime>200</fadetime>
-                        </control>
-                        <control type="label">
-                            <description>Addon Title</description>
-                            <posx>6-col-indent</posx>
-                            <posy>1-row</posy>
-                            <width>12-col-gutter</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>mediumStrong</font>
-                            <label>$INFO[container(6).ListItem.label]</label>
-                        </control>
-                        <control type="label">
-                            <posx>6-col-indent</posx>
-                            <posy>104</posy>
-                            <width>12-col-gutter</width>
-                            <font>itemSubTitle</font>
-                            <textcolor>highlight</textcolor>
-                            <label>$INFO[container(6).ListItem.AddonCreator]</label>
-                        </control>
-                        <control type="textbox" id="400">
-                            <posx>6-col-indent</posx>
-                            <posy>4-row</posy>
-                            <font>textbox</font>
-                            <width>12-col-gutter</width>
-                            <height>160</height>
-                            <label>$INFO[container(6).ListItem.AddonDescription]</label>
-                            <autoscroll delay="5000" time="1000" repeat="10000"/>
-                        </control>
-                    </control>
 
+        <control type="group">
+	        <control type="group">
+	            <posx>col-6-begin</posx>
+	            <posy>row-5-begin</posy>
+	            <!--animations-->
+	            <include>modalDialogInOut</include>
+	            <control type="image">
+	                <posx>0</posx>
+	                <posy>0</posy>
+	                <width>16-col</width>
+	                <height>2-row</height>
+	                <texture>colors/white.png</texture>
+	                <colordiffuse>highlight</colordiffuse>
+	                <aspectratio>stretch</aspectratio>
+	            </control>
+	            <control type="label" id="1">
+	                <posx>24</posx>
+	                <posy>0</posy>
+	                <width>16-col-gutter</width>
+	                <height>2-row</height>
+	                <aligny>center</aligny>
+	                <font>dialogTitle</font>
+	                <textcolor>textActive</textcolor>
+	                <shadowcolor>-</shadowcolor>
+	            </control>
+	            <control type="image">
+	                <posx>0</posx>
+	                <posy>2-row</posy>
+	                <width>16-col</width>
+	                <height>18-row</height>
+	                <texture>colors/black.png</texture>
+	                <colordiffuse>overlay</colordiffuse>
+	                <aspectratio>stretch</aspectratio>
+	            </control>
+	            <control type="image">
+	                <posx>12-col</posx>
+	                <posy>2-row</posy>
+	                <width>4-col</width>
+	                <height>18-row</height>
+	                <texture>colors/black.png</texture>
+	                <colordiffuse>overlay</colordiffuse>
+	                <aspectratio>stretch</aspectratio>
+	            </control>
+	
+				<control type="group" id="9000">
                     <!--Used in search from cast listing etc-->
                     <control type="panel" id="3">
-                        <posx>6-col-indent</posx>
-                        <posy>442</posy>
+                        <posx>0</posx>
+                        <posy>75</posy>
                         <width>12-col</width>
-                        <height>410</height>
-                        <onleft>9999</onleft>
-                        <itemlayout height="75" width="12-col">
+                        <height>18-row</height>
+                        <onright>9999</onright>
+                        <itemlayout height="72" width="12-col">
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
@@ -143,7 +92,7 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout height="75" width="12-col">
+                        <focusedlayout height="72" width="12-col">
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
@@ -159,7 +108,7 @@
                             <control type="image">
                                 <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>768</width>
+                                <width>11-col</width>
                                 <height>69</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
@@ -196,24 +145,24 @@
 
                     <!--skin selection etc-->
                     <control type="panel" id="6">
-                        <posx>6-col-indent</posx>
-                        <posy>442</posy>
+                        <posx>0</posx>
+                        <posy>75</posy>
                         <width>12-col</width>
-                        <height>410</height>
-                        <onleft>9999</onleft>
-                        <itemlayout height="75" width="6-col">
+                        <height>18-row</height>
+                        <onright>9999</onright>
+                        <itemlayout height="72" width="12-col">
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
                                 <width>69</width>
                                 <height>69</height>
                                 <aspectratio scalediffuse="false">stretch</aspectratio>
-                                <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
                             </control>
                             <control type="label">
                                 <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>324</width>
+                                <width>11-col-gutter</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
@@ -222,14 +171,14 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout height="75" width="6-col">
+                        <focusedlayout height="72" width="12-col">
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
                                 <width>69</width>
                                 <height>69</height>
                                 <aspectratio scalediffuse="false">stretch</aspectratio>
-                                <texture fallback="colors/white.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <texture fallback="colors/white.png" border="0">$INFO[Listitem.icon]</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"/>
@@ -238,7 +187,7 @@
                             <control type="image">
                                 <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>348</width>
+                                <width>11-col</width>
                                 <height>69</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
@@ -248,95 +197,93 @@
                             <control type="label">
                                 <posx>1-col-indent</posx>
                                 <posy>0</posy>
-                                <width>324</width>
+                                <width>11-col-gutter</width>
                                 <height>2-row</height>
                                 <aligny>center</aligny>
                                 <font>itemTitle</font>
                                 <textcolor>black</textcolor>
                                 <selectedcolor>black</selectedcolor>
-                                <shadowcolor>-</shadowcolor>
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </focusedlayout>
                     </control>
                 </control>
-
-                <control type="panel" id="9999">
-                    <visible>control.isvisible(3) | control.isvisible(5)</visible>
-                    <posx>0</posx>
-                    <posy>12-row</posy>
-                    <width>429</width>
-                    <height>6-row</height>
-                    <orientation>vertical</orientation>
-                    <onright>9000</onright>
-                    <itemlayout width="6-col" height="2-row">
-                        <control type="label">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>1-col</width>
-                            <height>2-row</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>symbolLarge</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label2]</label>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                        <control type="label">
-                            <posx>1-col-indent</posx>
-                            <posy>0</posy>
-                            <width>5-col-gutter</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>buttonTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label]</label>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </itemlayout>
-                    <focusedlayout width="6-col" height="2-row">
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>1-col</width>
-                            <height>2-row</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture>colors/white.png</texture>
-                            <colordiffuse>highlight</colordiffuse>
-                            <include>spinFocusIcon</include>
-                        </control>
-                        <control type="image">
-                            <posx>1-col</posx>
-                            <posy>0</posy>
-                            <width>5-col</width>
-                            <height>2-row</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture>colors/white.png</texture>
-                        </control>
-                        <control type="label">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>1-col</width>
-                            <height>2-row</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>symbolLarge</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label2]</label>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                        <control type="label">
-                            <posx>1-col-indent</posx>
-                            <posy>0</posy>
-                            <width>5-col-gutter</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>buttonTitle</font>
-                            <textcolor>black</textcolor>
-                            <label>$INFO[ListItem.label]</label>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </focusedlayout>
+				<!--OK / Cancel-->
+				<control type="panel" id="9999">              
+                    <posx>12-col</posx>
+	                <posy>2-row</posy>
+	                <width>4-col</width>
+	                <height>6-row</height>
+	                <orientation>vertical</orientation>
+	                <onleft>9000</onleft>
+	                <itemlayout width="4-col" height="2-row">
+	                    <control type="label">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>1-col</width>
+	                        <height>2-row</height>
+	                        <align>center</align>
+	                        <aligny>center</aligny>
+	                        <font>symbolLarge</font>
+	                        <textcolor>textActive</textcolor>
+	                        <label>$INFO[ListItem.label2]</label>
+	                        <shadowcolor>-</shadowcolor>
+	                    </control>
+	                    <control type="label">
+	                        <posx>1-col-indent</posx>
+	                        <posy>0</posy>
+	                        <width>5-col-gutter</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <font>buttonTitle</font>
+	                        <textcolor>textActive</textcolor>
+	                        <label>$INFO[ListItem.label]</label>
+	                        <shadowcolor>-</shadowcolor>
+	                    </control>
+	                </itemlayout>
+	                <focusedlayout width="4-col" height="2-row">
+	                    <control type="image">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>1-col</width>
+	                        <height>2-row</height>
+	                        <aspectratio>stretch</aspectratio>
+	                        <texture>colors/white.png</texture>
+	                        <colordiffuse>highlight</colordiffuse>
+	                        <include>spinFocusIcon</include>
+	                    </control>
+	                    <control type="image">
+	                        <posx>1-col</posx>
+	                        <posy>0</posy>
+	                        <width>5-col</width>
+	                        <height>2-row</height>
+	                        <aspectratio>stretch</aspectratio>
+	                        <texture>colors/white.png</texture>
+	                    </control>
+	                    <control type="label">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>1-col</width>
+	                        <height>2-row</height>
+	                        <align>center</align>
+	                        <aligny>center</aligny>
+	                        <font>symbolLarge</font>
+	                        <textcolor>textActive</textcolor>
+	                        <label>$INFO[ListItem.label2]</label>
+	                        <shadowcolor>-</shadowcolor>
+	                    </control>
+	                    <control type="label">
+	                        <posx>1-col-indent</posx>
+	                        <posy>0</posy>
+	                        <width>5-col-gutter</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <font>buttonTitle</font>
+	                        <textcolor>black</textcolor>
+	                        <label>$INFO[ListItem.label]</label>
+	                        <shadowcolor>-</shadowcolor>
+	                    </control>
+	                </focusedlayout>
                     <content>
                         <item id="1">
                             <description>Ok / manual / get more Button</description>
@@ -345,12 +292,12 @@
                             <thumb>-</thumb>
                             <onclick>SendClick(2000,5)</onclick>
                         </item>
-                        <item id="2">
-                            <description>Cancel Button</description>
-							<label>222</label>
+						<item id="2">
+						    <description>Cancel Button</description>
+                            <label>222</label>
                             <label2></label2>
                             <thumb>-</thumb>
-          					<onclick>SendClick(2000,7)</onclick>
+                            <onclick>PreviousMenu</onclick>
                         </item>
                     </content>
                 </control>
@@ -359,13 +306,10 @@
                     <control type="button" id="5">
                         <description>OK / Manual button</description>
                         <label>186</label>
-                    </control>
-					<control type="button" id="7">
-                        <description>Cancel</description>
-                        <label>222</label>
                     </control>
                 </control>
-            </control>
+	
+			</control>
         </control>
         <!--debugging-->
         <include>DebugGrid</include>
diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml
index 9ad0a86..205ac73 100644
--- a/1080i/FileBrowser.xml
+++ b/1080i/FileBrowser.xml
@@ -40,7 +40,7 @@
             <posx>col-6-begin</posx>
             <posy>row-3-begin</posy>
             <!--animations-->
-            <include>modalDialogInOutVertical</include>
+            <include>modalDialogInOut</include>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
@@ -65,7 +65,7 @@
                 <posx>0</posx>
                 <posy>2-row</posy>
                 <width>16-col</width>
-                <height>732</height>
+                <height>722</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
@@ -74,18 +74,18 @@
                 <posx>12-col</posx>
                 <posy>2-row</posy>
                 <width>4-col</width>
-                <height>732</height>
+                <height>722</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="panel" id="450">
-                <posx>6</posx>
-                <posy>78</posy>
+                <posx>0</posx>
+                <posy>75</posy>
                 <width>12-col</width>
                 <height>20-row</height>
                 <onright>9000</onright>
-                <itemlayout height="75" width="12-col">
+                <itemlayout height="72" width="12-col">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -110,7 +110,7 @@
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>780</width>
+                        <width>11-col</width>
                         <height>69</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml
index b3bb0a9..7b653b0 100644
--- a/1080i/FileManager.xml
+++ b/1080i/FileManager.xml
@@ -5,195 +5,183 @@
     <include>fadeInOut</include>
     <controls>
         <include>globalBackground</include>
-        <!--page title-->
-        <control type="group">
-            <posx>col-1-begin</posx>
-            <posy>row-1-begin</posy>
-            <control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>24-col</width>
-                <height>2-row</height>
-                <texture>colors/white.png</texture>
-                <colordiffuse>highlight</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <!--title-->
-            <control type="label">
-                <posx>24</posx>
-                <posy>0</posy>
-                <width>24-col</width>
-                <height>2-row</height>
-                <font>dialogTitle</font>
-                <label>10003</label>
-                <textcolor>textActive</textcolor>
-                <shadowcolor>-</shadowcolor>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>24-col</width>
-                <height>25-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-        </control>
+		<control type="group">
+			<!--animations-->
+            <include>modalDialogInOutVertical</include>
+        	<!--page title-->
+	        <control type="group">
+	            <posx>col-6-begin</posx>
+	            <posy>row-4-begin</posy>
+	            <control type="image">
+	                <posx>0</posx>
+	                <posy>0</posy>
+	                <width>16-col</width>
+	                <height>2-row</height>
+	                <texture>colors/white.png</texture>
+	                <colordiffuse>highlight</colordiffuse>
+	                <aspectratio>stretch</aspectratio>
+	            </control>
+	            <!--title-->
+	            <control type="label">
+	                <posx>24</posx>
+	                <posy>0</posy>
+	                <width>16-col</width>
+	                <height>2-row</height>
+	                <font>dialogTitle</font>
+	                <label>10003</label>
+	                <textcolor>textActive</textcolor>
+	                <shadowcolor>-</shadowcolor>
+	            </control>
+	            <control type="image">
+	                <posx>0</posx>
+	                <posy>2-row</posy>
+	                <width>16-col</width>
+	                <height>660</height>
+	                <texture>colors/black.png</texture>
+	                <colordiffuse>overlay</colordiffuse>
+	                <aspectratio>stretch</aspectratio>
+	            </control>
+	        </control>
 
-        <!--left panel-->
-        <control type="group">
-            <posx>col-1-begin</posx>
-            <posy>row-4-begin</posy>
-            <control type="label" id="101">
-                <description>Header Label</description>
-                <posx>24</posx>
-                <posy>0</posy>
-                <width>12-col</width>
-                <label>-</label>
-                <font>mediumStrong</font>
-                <shadowcolor>-</shadowcolor>
-            </control>
-            <control type="image">
-                <posx>12</posx>
-                <posy>2-row</posy>
-                <width>12-col-gutter</width>
-                <height>780</height>
-                <texture>colors/black.png</texture>
-                <bordersize>0</bordersize>
-                <colordiffuse>overlay</colordiffuse>
-            </control>
-            <!--left file list-->
-            <control type="list" id="20">
-                <posx>12</posx>
-                <posy>2-row</posy>
-                <width>12-col</width>
-                <height>21-row</height>
-                <onright>21</onright>
-                <itemlayout height="2-row" width="12-col">
-                    <control type="label">
-                        <posx>12</posx>
-                        <width>12-col-gutter</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <info>ListItem.Label</info>
-                        <font>itemTitle</font>
-                    </control>
-                    <control type="label">
-                        <posx>12r</posx>
-                        <width>3-col</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <align>right</align>
-                        <info>ListItem.Label2</info>
-                        <font>itemTitle</font>
-                        <textcolor>highlight</textcolor>
-                    </control>
-                </itemlayout>
-                <focusedlayout height="2-row" width="12-col">
-                    <control type="image">
-                        <width>12-col-gutter</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <animation effect="fade" start="100" end="50" condition="!Control.HasFocus(20)">Conditional</animation>
-                    </control>
-                    <control type="label">
-                        <posx>12</posx>
-                        <width>12-col-gutter</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <info>ListItem.Label</info>
-                        <font>itemTitle</font>
-                        <textcolor>black</textcolor>
-                    </control>
-                    <control type="label">
-                        <posx>12r</posx>
-                        <width>3-col</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <align>right</align>
-                        <info>ListItem.Label2</info>
-                        <font>itemTitle</font>
-                        <textcolor>black</textcolor>
-                    </control>
-                </focusedlayout>
-            </control>
-        </control>
-        <!--right panel-->
-        <control type="group">
-            <posx>972</posx>
-            <posy>row-4-begin</posy>
-            <control type="label" id="102">
-                <description>Header Label</description>
-                <posx>12</posx>
-                <posy>0</posy>
-                <width>12-col</width>
-                <label>-</label>
-                <font>mediumStrong</font>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>12-col-gutter</width>
-                <height>780</height>
-                <texture>colors/black.png</texture>
-                <bordersize>0</bordersize>
-                <colordiffuse>overlay</colordiffuse>
-            </control>
-            <control type="list" id="21">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>12-col-gutter</width>
-                <height>21-row</height>
-                <onleft>20</onleft>
-                <itemlayout height="2-row" width="12-col">
-                    <control type="label">
-                        <posx>12</posx>
-                        <width>12-col-gutter</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <info>ListItem.Label</info>
-                        <font>itemTitle</font>
-                    </control>
-                    <control type="label">
-                        <posx>12r</posx>
-                        <width>3-col</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <align>right</align>
-                        <info>ListItem.Label2</info>
-                        <font>itemTitle</font>
-                        <textcolor>highlight</textcolor>
-                    </control>
-                </itemlayout>
-                <focusedlayout height="2-row" width="12-col">
-                    <control type="image">
-                        <width>12-col-gutter</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <animation effect="fade" start="100" end="50" condition="Control.HasFocus(20)">Conditional</animation>
-                    </control>
-                    <control type="label">
-                        <posx>12</posx>
-                        <width>12-col-gutter</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <info>ListItem.Label</info>
-                        <font>itemTitle</font>
-                        <textcolor>black</textcolor>
-                    </control>
-                    <control type="label">
-                        <posx>12r</posx>
-                        <width>3-col</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <align>right</align>
-                        <info>ListItem.Label2</info>
-                        <font>itemTitle</font>
-                        <textcolor>black</textcolor>
-                    </control>
-                </focusedlayout>
-            </control>
-        </control>
+	        <!--left panel-->
+	        <control type="group">
+	            <posx>col-6-begin</posx>
+	            <posy>row-7-begin</posy>
+	            <control type="label" id="101">
+	                <description>Header Label</description>
+	                <posx>24</posx>
+	                <posy>0</posy>
+	                <width>8-col-gutter</width>
+	                <label>-</label>
+	                <font>settingsCategoryTitle</font>
+	                <textcolor>highlight</textcolor>
+	                <shadowcolor>-</shadowcolor>
+	            </control>
+	            <!--left file list-->
+	            <control type="list" id="20">
+	                <posx>12</posx>
+	                <posy>2-row</posy>
+	                <width>8-col</width>
+	                <height>15-row</height>
+	                <onright>21</onright>
+	                <itemlayout height="2-row" width="8-col">
+	                    <control type="label">
+	                        <posx>12</posx>
+	                        <width>8-col-gutter</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <info>ListItem.Label</info>
+	                        <font>itemTitle</font>
+	                    </control>
+	                    <control type="label">
+	                        <posx>12r</posx>
+	                        <width>3-col</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <align>right</align>
+	                        <info>ListItem.Label2</info>
+	                        <font>itemTitle</font>
+	                        <textcolor>highlight</textcolor>
+	                    </control>
+	                </itemlayout>
+	                <focusedlayout height="2-row" width="8-col">
+	                    <control type="image">
+	                        <width>8-col-gutter</width>
+	                        <height>2-row</height>
+	                        <texture>colors/white.png</texture>
+	                        <animation effect="fade" start="100" end="50" condition="!Control.HasFocus(20)">Conditional</animation>
+	                    </control>
+	                    <control type="label">
+	                        <posx>12</posx>
+	                        <width>8-col-gutter</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <info>ListItem.Label</info>
+	                        <font>itemTitle</font>
+	                        <textcolor>black</textcolor>
+	                    </control>
+	                    <control type="label">
+	                        <posx>12r</posx>
+	                        <width>3-col</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <align>right</align>
+	                        <info>ListItem.Label2</info>
+	                        <font>itemTitle</font>
+	                        <textcolor>black</textcolor>
+	                    </control>
+	                </focusedlayout>
+	            </control>
+	        </control>
+	        <!--right panel-->
+	        <control type="group">
+	            <posx>col-14-begin</posx>
+	            <posy>row-7-begin</posy>
+	            <control type="label" id="102">
+	                <description>Header Label</description>
+	                <posx>12</posx>
+	                <posy>0</posy>
+	                <width>8-col-gutter</width>
+	                <label>-</label>
+	                <font>settingsCategoryTitle</font>
+	                <textcolor>highlight</textcolor>
+	            </control>
+	            <control type="list" id="21">
+	                <posx>0</posx>
+	                <posy>2-row</posy>
+	                <width>8-col</width>
+	                <height>15-row</height>
+	                <onleft>20</onleft>
+	                <itemlayout height="2-row" width="8-col">
+	                    <control type="label">
+	                        <posx>12</posx>
+	                        <width>8-col-gutter</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <info>ListItem.Label</info>
+	                        <font>itemTitle</font>
+	                    </control>
+	                    <control type="label">
+	                        <posx>12r</posx>
+	                        <width>3-col</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <align>right</align>
+	                        <info>ListItem.Label2</info>
+	                        <font>itemTitle</font>
+	                        <textcolor>highlight</textcolor>
+	                    </control>
+	                </itemlayout>
+	                <focusedlayout height="2-row" width="8-col">
+	                    <control type="image">
+	                        <width>8-col-gutter</width>
+	                        <height>2-row</height>
+	                        <texture>colors/white.png</texture>
+	                        <animation effect="fade" start="100" end="50" condition="Control.HasFocus(20)">Conditional</animation>
+	                    </control>
+	                    <control type="label">
+	                        <posx>12</posx>
+	                        <width>8-col-gutter</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <info>ListItem.Label</info>
+	                        <font>itemTitle</font>
+	                        <textcolor>black</textcolor>
+	                    </control>
+	                    <control type="label">
+	                        <posx>12r</posx>
+	                        <width>3-col</width>
+	                        <height>2-row</height>
+	                        <aligny>center</aligny>
+	                        <align>right</align>
+	                        <info>ListItem.Label2</info>
+	                        <font>itemTitle</font>
+	                        <textcolor>black</textcolor>
+	                    </control>
+	                </focusedlayout>
+	            </control>
+	        </control>
+		</control>
         <!--debugging-->
         <include>DebugGrid</include>
         <control type="label">
diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml
index 9e650ce..bfb498c 100644
--- a/1080i/View_MusicRecentItems.xml
+++ b/1080i/View_MusicRecentItems.xml
@@ -179,10 +179,10 @@
                 <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
 	                <effect type="fade" start="100" end="0" time="200"/>
 	            </animation>
-	            <posx>col-1-begin</posx>
+	            <posx>60</posx>
 	            <posy>678</posy>
 	            <width>24-col</width>
-	            <height>2-row</height>
+	            <height>84</height>
 	            <onleft>9000</onleft>
 	            <ondown>9998</ondown>
 	            <onback>9000</onback>
@@ -191,37 +191,39 @@
 	                <control type="label">
 	                    <posx>0</posx>
 	                    <posy>0</posy>
-	                    <width>4-col-gutter</width>
+	                    <width>4-col</width>
 	                    <height>2-row</height>
 	                    <font>itemTitle</font>
+	                    <aligny>center</aligny>
+	                    <align>center</align>
 	                    <textcolor>44FFFFFF</textcolor>
 	                    <shadowcolor>-</shadowcolor>
 	                    <label>$INFO[ListItem.property(textTitle)]</label>
 	                </control>
 	            </itemlayout>
-	            <focusedlayout width="4-col" height="2-row">
+	            <focusedlayout width="4-col" height="78">
+	                <control type="image">
+	                    <posx>0</posx>
+	                    <posy>56</posy>
+	                    <width>4-col-textbox</width>
+	                    <height>9</height>
+	                    <texture>colors/white.png</texture>
+	                    <colordiffuse>highlight</colordiffuse>
+	                    <aspectratio>stretch</aspectratio>
+	                    <animation effect="fade" start="100" end="20" time="750" condition="Control.HasFocus(9123)" pulse="true">Conditional</animation>
+	                </control>
 	                <control type="label">
-						<visible>Control.HasFocus(9123)</visible>
 	                    <posx>0</posx>
 	                    <posy>0</posy>
-	                    <width>4-col-gutter</width>
+	                    <width>4-col</width>
 	                    <height>2-row</height>
 	                    <font>itemTitle</font>
+	                    <aligny>center</aligny>
+	                    <align>center</align>
 	                    <textcolor>textActive</textcolor>
 	                    <shadowcolor>-</shadowcolor>
 	                    <label>$INFO[ListItem.property(textTitle)]</label>
 						<animation effect="fade" start="100" end="20" time="750" condition="Control.HasFocus(9123)" pulse="true">Conditional</animation>
-	                </control>
-					<control type="label">
-						<visible>!Control.HasFocus(9123)</visible>
-	                    <posx>0</posx>
-	                    <posy>0</posy>
-	                    <width>4-col-gutter</width>
-	                    <height>2-row</height>
-	                    <font>itemTitle</font>
-	                    <selectedcolor>textActive</selectedcolor>
-	                    <shadowcolor>-</shadowcolor>
-	                    <label>$INFO[ListItem.property(textTitle)]</label>
 	                </control>
 	            </focusedlayout>
                 <content>
diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml
index b69f7a8..ad22b58 100644
--- a/1080i/View_VideoRecentItems.xml
+++ b/1080i/View_VideoRecentItems.xml
@@ -91,6 +91,7 @@
                 <orientation>horizontal</orientation>
                 <onback>control.setfocus(9000)</onback>
                 <content>$INFO[control.getlabel(9123)]</content>
+                <oninfo>RunScript(script.skin.helper.service,action=showinfo,movieid=$INFO[container(9998).listitem.dbid])</oninfo>
                 <itemlayout width="228" height="312">
                     <control type="image">
                         <posx>0</posx>
@@ -209,6 +210,7 @@
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
                 <onclick>activatewindow(Video,videodb://tvshows/titles/$INFO[listitem.dbid])</onclick>
                 <onclick>Control.SetFocus(50)</onclick>
+                <oninfo>RunScript(script.skin.helper.service,action=showinfo,tvshowid=$INFO[container(9998).listitem.dbid])</oninfo>
                 <itemlayout width="228" height="312">
                     <control type="image">
                         <posx>0</posx>
@@ -316,10 +318,10 @@
             <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
                 <effect type="fade" start="100" end="0" time="200"/>
             </animation>
-            <posx>col-1-begin</posx>
+            <posx>60</posx>
             <posy>636</posy>
             <width>24-col</width>
-            <height>2-row</height>
+            <height>84</height>
             <onleft>9000</onleft>
             <ondown>9998</ondown>
             <onback>9000</onback>
@@ -328,37 +330,39 @@
                 <control type="label">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>4-col-gutter</width>
+                    <width>4-col</width>
                     <height>2-row</height>
                     <font>itemTitle</font>
+                    <aligny>center</aligny>
+                    <align>center</align>
                     <textcolor>44FFFFFF</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <label>$INFO[ListItem.property(textTitle)]</label>
                 </control>
             </itemlayout>
-            <focusedlayout width="4-col" height="2-row">
+            <focusedlayout width="4-col" height="78">
+                <control type="image">
+                    <posx>0</posx>
+                    <posy>56</posy>
+                    <width>4-col-textbox</width>
+                    <height>9</height>
+                    <texture>colors/white.png</texture>
+                    <colordiffuse>highlight</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                    <animation effect="fade" start="100" end="20" time="750" condition="Control.HasFocus(9123)" pulse="true">Conditional</animation>
+                </control>
                 <control type="label">
-					<visible>Control.HasFocus(9123)</visible>
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>4-col-gutter</width>
+                    <width>4-col</width>
                     <height>2-row</height>
                     <font>itemTitle</font>
+                    <aligny>center</aligny>
+                    <align>center</align>
                     <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <label>$INFO[ListItem.property(textTitle)]</label>
 					<animation effect="fade" start="100" end="20" time="750" condition="Control.HasFocus(9123)" pulse="true">Conditional</animation>
-                </control>
-				<control type="label">
-					<visible>!Control.HasFocus(9123)</visible>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>4-col-gutter</width>
-                    <height>2-row</height>
-                    <font>itemTitle</font>
-                    <selectedcolor>textActive</selectedcolor>
-                    <shadowcolor>-</shadowcolor>
-                    <label>$INFO[ListItem.property(textTitle)]</label>
                 </control>
             </focusedlayout>
             <content>
diff --git a/1080i/script-skinshortcuts-includes.xml b/1080i/script-skinshortcuts-includes.xml
index 57d446f..45a3bba 100644
--- a/1080i/script-skinshortcuts-includes.xml
+++ b/1080i/script-skinshortcuts-includes.xml
@@ -3,22 +3,6 @@
 	<include name="skinshortcuts-mainmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[10005]</label>
-			<label2>Common menu item</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">music</property>
-			<property name="defaultID">music</property>
-			<onclick>ActivateWindow(Music)</onclick>
-			<property name="path">ActivateWindow(Music)</property>
-			<property name="list">Music</property>
-			<visible>StringCompare(System.ProfileName,Master user)</visible>
-			<property name="submenuVisibility">music</property>
-			<property name="group">mainmenu</property>
-			<property name="hasSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
 			<label>$LOCALIZE[12600]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -34,6 +18,22 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">False</property>
 		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<label>$LOCALIZE[10002]</label>
+			<label2>Common menu item</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">pictures</property>
+			<property name="defaultID">pictures</property>
+			<onclick>ActivateWindow(Pictures)</onclick>
+			<property name="path">ActivateWindow(Pictures)</property>
+			<property name="list">Pictures</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">pictures</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
 			<label>$ADDON[script.skinshortcuts 32022]</label>
@@ -120,6 +120,22 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
+			<label>$LOCALIZE[10005]</label>
+			<label2>Common menu item</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">music</property>
+			<property name="defaultID">music</property>
+			<onclick>ActivateWindow(Music)</onclick>
+			<property name="path">ActivateWindow(Music)</property>
+			<property name="list">Music</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">music</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<label>$LOCALIZE[10001]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -134,8 +150,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">False</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<label>$ADDON[script.skinshortcuts 32032]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -151,8 +167,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<label>$LOCALIZE[10004]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -172,47 +188,17 @@
 	<include name="skinshortcuts-submenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[744]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<label>$LOCALIZE[1039]</label>
+			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
 			<thumb />
-			<property name="labelID">744</property>
-			<property name="defaultID">744</property>
-			<onclick>ActivateWindow(Music,Files,Return)</onclick>
-			<property name="path">ActivateWindow(Music,Files,Return)</property>
-			<property name="list">Files</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9000).ListItem.Property(submenuVisibility),music)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
-			<label>$LOCALIZE[15100]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">15100</property>
-			<property name="defaultID">15100</property>
-			<onclick>ActivateWindow(Music,MusicLibrary,return)</onclick>
-			<property name="path">ActivateWindow(Music,MusicLibrary,return)</property>
-			<property name="list">MusicLibrary</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9000).ListItem.Property(submenuVisibility),music)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
-			<label>$LOCALIZE[1038]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1038</property>
-			<property name="defaultID">1038</property>
-			<onclick>ActivateWindow(Music,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Music,Addons,return)</property>
+			<property name="labelID">1039</property>
+			<property name="defaultID">1039</property>
+			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9000).ListItem.Property(submenuVisibility),music)</visible>
-			<property name="group">music</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9000).ListItem.Property(submenuVisibility),pictures)</visible>
+			<property name="group">pictures</property>
 			<property name="isSubmenu">True</property>
 		</item>
 		<item id="1">
@@ -533,6 +519,51 @@
 			<property name="group">tvshows</property>
 			<property name="isSubmenu">True</property>
 		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files,Return)</onclick>
+			<property name="path">ActivateWindow(Music,Files,Return)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9000).ListItem.Property(submenuVisibility),music)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<label>$LOCALIZE[15100]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">15100</property>
+			<property name="defaultID">15100</property>
+			<onclick>ActivateWindow(Music,MusicLibrary,return)</onclick>
+			<property name="path">ActivateWindow(Music,MusicLibrary,return)</property>
+			<property name="list">MusicLibrary</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9000).ListItem.Property(submenuVisibility),music)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<label>$LOCALIZE[1038]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1038</property>
+			<property name="defaultID">1038</property>
+			<onclick>ActivateWindow(Music,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Music,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9000).ListItem.Property(submenuVisibility),music)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<label>$ADDON[script.skinshortcuts 32033]</label>
@@ -610,106 +641,46 @@
 			<property name="isSubmenu">True</property>
 		</item>
 	</include>
-	<include name="skinshortcuts-group-music">
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[744]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">744</property>
-			<property name="defaultID">744</property>
-			<onclick>ActivateWindow(Music,Files,Return)</onclick>
-			<property name="path">ActivateWindow(Music,Files,Return)</property>
-			<property name="list">Files</property>
-			<visible>StringCompare(System.ProfileName,Master user)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
-			<label>$LOCALIZE[15100]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">15100</property>
-			<property name="defaultID">15100</property>
-			<onclick>ActivateWindow(Music,MusicLibrary,return)</onclick>
-			<property name="path">ActivateWindow(Music,MusicLibrary,return)</property>
-			<property name="list">MusicLibrary</property>
-			<visible>StringCompare(System.ProfileName,Master user)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
-			<label>$LOCALIZE[1038]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1038</property>
-			<property name="defaultID">1038</property>
-			<onclick>ActivateWindow(Music,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Music,Addons,return)</property>
-			<property name="list">Addons</property>
-			<visible>StringCompare(System.ProfileName,Master user)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
-	</include>
-	<include name="skinshortcuts-group-alt-music">
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[744]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">744</property>
-			<property name="defaultID">744</property>
-			<onclick>ActivateWindow(Music,Files,Return)</onclick>
-			<property name="path">ActivateWindow(Music,Files,Return)</property>
-			<property name="list">Files</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),music)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
-			<label>$LOCALIZE[15100]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">15100</property>
-			<property name="defaultID">15100</property>
-			<onclick>ActivateWindow(Music,MusicLibrary,return)</onclick>
-			<property name="path">ActivateWindow(Music,MusicLibrary,return)</property>
-			<property name="list">MusicLibrary</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),music)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
-			<label>$LOCALIZE[1038]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1038</property>
-			<property name="defaultID">1038</property>
-			<onclick>ActivateWindow(Music,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Music,Addons,return)</property>
-			<property name="list">Addons</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),music)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
-	</include>
 	<include name="skinshortcuts-group-weather">
 		<description>No items</description>
 	</include>
 	<include name="skinshortcuts-group-alt-weather">
 		<description>No items</description>
 	</include>
+	<include name="skinshortcuts-group-pictures">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<label>$LOCALIZE[1039]</label>
+			<label2>$ADDON[script.skinshortcuts 32020]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1039</property>
+			<property name="defaultID">1039</property>
+			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">pictures</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-alt-pictures">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<label>$LOCALIZE[1039]</label>
+			<label2>$ADDON[script.skinshortcuts 32020]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1039</property>
+			<property name="defaultID">1039</property>
+			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),pictures)</visible>
+			<property name="group">pictures</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
 	<include name="skinshortcuts-group-livetv">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
@@ -1368,6 +1339,100 @@
 			<property name="isSubmenu">True</property>
 		</item>
 	</include>
+	<include name="skinshortcuts-group-music">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files,Return)</onclick>
+			<property name="path">ActivateWindow(Music,Files,Return)</property>
+			<property name="list">Files</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<label>$LOCALIZE[15100]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">15100</property>
+			<property name="defaultID">15100</property>
+			<onclick>ActivateWindow(Music,MusicLibrary,return)</onclick>
+			<property name="path">ActivateWindow(Music,MusicLibrary,return)</property>
+			<property name="list">MusicLibrary</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<label>$LOCALIZE[1038]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1038</property>
+			<property name="defaultID">1038</property>
+			<onclick>ActivateWindow(Music,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Music,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-alt-music">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files,Return)</onclick>
+			<property name="path">ActivateWindow(Music,Files,Return)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),music)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<label>$LOCALIZE[15100]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">15100</property>
+			<property name="defaultID">15100</property>
+			<onclick>ActivateWindow(Music,MusicLibrary,return)</onclick>
+			<property name="path">ActivateWindow(Music,MusicLibrary,return)</property>
+			<property name="list">MusicLibrary</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),music)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<label>$LOCALIZE[1038]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1038</property>
+			<property name="defaultID">1038</property>
+			<onclick>ActivateWindow(Music,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Music,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),music)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
 	<include name="skinshortcuts-group-programs">
 		<description>No items</description>
 	</include>
diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml
index e4e7f99..766214c 100644
--- a/1080i/script-skinshortcuts.xml
+++ b/1080i/script-skinshortcuts.xml
@@ -4,17 +4,8 @@
 	<onunload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=9000)</onunload>
 	<onunload>control.setfocus(9000)</onunload>
 	<controls>
-		<control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>colors/black.png</texture>
-            <aspectratio>stretch</aspectratio>
-        </control>
-        <control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>vignette.png</texture>
-            <colordiffuse>ffffffff</colordiffuse>
-            <aspectratio>stretch</aspectratio>
-        </control>
+		<!--background-->
+        <include>globalBackground</include>
 		<control type="group">
             <posx>0</posx>
             <posy>0</posy>
@@ -26,59 +17,59 @@
 				<control type="button" id="301">
 					<description>Add a new shortcut</description>
 					<onright>211</onright>
-					<width>5-col</width>
+					<width>5-col-gutter</width>
 					<onclick>noop</onclick>
 					<label>$ADDON[script.skinshortcuts 32000]</label>
 				</control>
 				<control type="button" id="302">
 					<description>Delete shortcut</description>
 					<onright>211</onright>
-					<width>5-col</width>
+					<width>5-col-gutter</width>
 					<onclick>noop</onclick>
 					<label>$ADDON[script.skinshortcuts 32001]</label>
 				</control>
 				<control type="button" id="303">
 					<description>Move shortcut up</description>
 					<onright>211</onright>
-					<width>5-col</width>
+					<width>5-col-gutter</width>
 					<onclick>noop</onclick>
 					<label>$ADDON[script.skinshortcuts 32002]</label>
 				</control>
 				<control type="button" id="304">
 					<description>Move shortcut down</description>
 					<onright>211</onright>
-					<width>5-col</width>
+					<width>5-col-gutter</width>
 					<onclick>noop</onclick>
 					<label>$ADDON[script.skinshortcuts 32003]</label>
 				</control>
 				<control type="button" id="305">
 					<description>Change shortcut label</description>
 					<onright>211</onright>
-					<width>5-col</width>
+					<width>5-col-gutter</width>
 					<onclick>noop</onclick>
 					<label>$ADDON[script.skinshortcuts 32025]</label>
 				</control>
 				<control type="button" id="307">
 					<description>Change shortcut action</description>
 					<onright>211</onright>
-					<width>5-col</width>
+					<width>5-col-gutter</width>
 					<onclick>noop</onclick>
 					<label>$ADDON[script.skinshortcuts 32027]</label>
 				</control>
 				<control type="button" id="308">
 					<description>Reset shortcuts</description>
 					<onright>211</onright>
-					<width>5-col</width>
+					<width>5-col-gutter</width>
 					<onclick>noop</onclick>
 					<label>$ADDON[script.skinshortcuts 32028]</label>
 				</control>
 			</control>
 			<control type="group">
 				<animation type="windowopen">
-	                <effect type="slide" start="0" end="col-6-begin" tween="sine" easing="out" delay="0" time="400"/>
+	                <effect type="slide" start="0" end="col-5-begin" tween="sine" easing="out" delay="0" time="400"/>
 	            </animation>
 	            <animation type="windowclose">
-	                <effect type="slide" start="col-6-begin" end="0" tween="sine" easing="out" time="400"/>
+	                <effect type="slide" start="col-5-begin" end="0" tween="sine" easing="out" time="400"/>
 	            </animation>
 				<control type="image">
 	                <posx>0</posx>
diff --git a/changelog.txt b/changelog.txt
index fe0b191..cdffe4c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -20,14 +20,12 @@
 [TODO]
 
 Skin shortcuts for all sub menus
-- homescreen images will need to be changed (not so - use the path)
-
-Dialogselect revision / simplification
-
-Change accent color? (Skin helper script)
+- homescreen images
 
 Check yes / no progress bar works ok
 
+PRV mini window and recordings storage indicator
+
 Revise player stop on return
 
 DialogAudioDSPManager.xml