diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 4ce9007..0b0a757 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -5,7 +5,7 @@
         <include>globalBackground</include>
         <control type="group">
             <control type="group">
-                <posx>col-4-begin</posx>
+                <posx>col-9-begin</posx>
                 <posy>row-9-begin</posy>
                 <visible>String.IsEqual(container.folderpath,addons://)</visible>
                 <!--animations-->
@@ -14,7 +14,7 @@
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>18-col</width>
+                    <width>8-col</width>
                     <height>2-row</height>
                     <texture>colors/white.png</texture>
                     <colordiffuse>highlight</colordiffuse>
@@ -24,91 +24,103 @@
                 <control type="label">
                     <posx>24</posx>
                     <posy>0</posy>
-                    <width>17-col</width>
+                    <width>8-col-gutter</width>
                     <height>2-row</height>
                     <font>dialogTitle</font>
                     <label>$LOCALIZE[31113]</label>
                     <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                 </control>
-                <!--dialog background-->
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>18-col</width>
-                    <height>8-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
                 <control type="panel" id="50">
                     <visible>String.IsEqual(container.folderpath,addons://)</visible>
-                    <posx>24</posx>
-                    <posy>100</posy>
-                    <width>18-col</width>
+                    <posx>0</posx>
+                    <posy>73</posy>
+                    <width>8-col</width>
                     <height>20-row</height>
                     <onleft>9000</onleft>
                     <ondown>50</ondown>
                     <onup>50</onup>
                     <itemgap>0</itemgap>
-                    <itemlayout width="252" height="348">
+                    <itemlayout width="8-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>240</width>
-                            <height>240</height>
+                            <width>8-col</width>
+                            <height>2-row</height>
+                            <texture>colors/black.png</texture>
+                            <colordiffuse>overlay</colordiffuse>
                             <aspectratio>stretch</aspectratio>
-                            <texture border="6">$INFO[listitem.icon]</texture>
-                            <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
-                            <bordersize>6</bordersize>
-                            <colordiffuse>ff333333</colordiffuse>
                         </control>
-                        <control type="textbox">
-                            <posx>12</posx>
-                            <posy>2-row</posy>
-                            <width>216</width>
-                            <height>3-row</height>
-                            <align>center</align>
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>1-col</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>$INFO[listitem.icon]</texture>
+                        </control>
+                        <control type="label">
+                            <posx>1-col-indent</posx>
+                            <posy>-1</posy>
+                            <width>6-col-gutter</width>
+                            <height>2-row</height>
                             <aligny>center</aligny>
-                            <font>itemTitle</font>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="252" height="348">
+                    <focusedlayout width="8-col" height="2-row">
                         <control type="group">
-                            <include>focusThumb</include>
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
-                                <width>240</width>
-                                <height>240</height>
+                                <width>1-col</width>
+                                <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
-                                <texture border="6">colors/offblack.png</texture>
-                                <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-                                <bordersize>6</bordersize>
-                                <colordiffuse>ff666666</colordiffuse>
+                                <texture>colors/white.png</texture>
+                                <colordiffuse>highlight</colordiffuse>
                             </control>
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
-                                <width>240</width>
-                                <height>240</height>
+                                <width>1-col</width>
+                                <height>2-row</height>
                                 <aspectratio>stretch</aspectratio>
-                                <texture border="6">$INFO[listitem.icon]</texture>
-                                <colordiffuse>ff333333</colordiffuse>
-                            </control>
-                            <control type="textbox">
-                                <posx>12</posx>
-                                <posy>2-row</posy>
-                                <width>216</width>
-                                <height>3-row</height>
-                                <align>center</align>
-                                <aligny>center</aligny>
-                                <font>itemTitle</font>
-                                <textcolor>textActive</textcolor>
-                                <label>$INFO[ListItem.label]</label>
+                                <texture>$INFO[listitem.icon]</texture>
                             </control>
+                            <include>spinFocusIcon</include>
+                        </control>
+                        <control type="image">
+                            <posx>1-col</posx>
+                            <posy>0</posy>
+                            <width>7-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>-1</posy>
+                            <width>6-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>
                 </control>
@@ -165,7 +177,7 @@
                 <control type="panel" id="50">
                     <visible>!String.IsEqual(container.folderpath,addons://)</visible>
                     <posx>0</posx>
-                    <posy>75</posy>
+                    <posy>73</posy>
                     <width>8-col</width>
                     <height>717</height>
                     <onleft>9000</onleft>
diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml
index c64512c..3dd1c73 100644
--- a/1080i/DialogConfirm.xml
+++ b/1080i/DialogConfirm.xml
@@ -20,17 +20,6 @@
                 <font>dialogTitle</font>
                 <textcolor>textActive</textcolor>
             </control>
-            <control type="progress" id="20">
-                <visible>false</visible>
-                <description>Progressbar</description>
-                <posx>0</posx>
-                <posy>-72</posy>
-                <width>8-col</width>
-                <height>24</height>
-                <texturebg colordiffuse="textboxInactive">colors/offblack.png</texturebg>
-                <midtexture colordiffuse="highlight">colors/white.png</midtexture>
-                <info>System.Progressbar</info>
-            </control>
             <control type="textbox" id="9">
                 <posx>0</posx>
                 <posy>84</posy>
diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml
index 388cacd..0fffa40 100644
--- a/1080i/DialogMusicInfo.xml
+++ b/1080i/DialogMusicInfo.xml
@@ -23,7 +23,7 @@
             <!--coverart-->
             <control type="group">
                 <visible>container.content(albums)</visible>
-                <posx>col-4-begin</posx>
+                <posx>3-col</posx>
                 <posy>2-row</posy>
                 <control type="image">
                     <posx>0</posx>
@@ -67,7 +67,7 @@
         <!--content is artist-->
         <control type="group">
             <visible>container.content(artists)</visible>
-            <posx>1344</posx>
+            <posx>1200</posx>
             <posy>0</posy>
             <animation type="Windowopen">
                 <effect type="fade" start="0" end="100" time="300" delay="300"/>
@@ -80,34 +80,26 @@
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>8-col</width>
+                <width>10-col</width>
                 <height>fullscreenHeight</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>cc111111</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
-                <posx>0</posx>
+                <posx>-6</posx>
                 <posy>0</posy>
-                <width>8-col</width>
-                <height>row-5-begin</height>
+                <width>6</width>
+                <height>fullscreenHeight</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>row-5-begin</posy>
-                <width>8-col</width>
-                <height>3</height>
-                <texture>colors/white.png</texture>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <!--content description-->
             <control type="label">
-                <posx>12</posx>
+                <posx>24</posx>
                 <posy>42</posy>
-                <width>8-col-gutter</width>
+                <width>684</width>
                 <align>left</align>
                 <height>3-row</height>
                 <aligny>center</aligny>
@@ -118,24 +110,24 @@
             </control>
             <!--synopsis-->
             <control type="textbox">
-                <posx>12</posx>
+                <posx>24</posx>
                 <posy>row-6-begin</posy>
                 <font>textbox</font>
-                <width>8-col-gutter</width>
+                <width>660</width>
                 <align>left</align>
                 <textcolor>textActive</textcolor>
                 <height>17-row</height>
                 <label fallback="31205">$INFO[ListItem.Property(Artist_Description)]</label>
-                <autoscroll delay="15000" time="1500" repeat="10000"/>
+                <autoscroll delay="15000" time="3000" repeat="10000"/>
             </control>
             <!--dialog controls-->
             <control type="panel" id="8000">
                 <posx>0</posx>
                 <posy>row-25-begin</posy>
-                <width>8-col</width>
+                <width>10-col</width>
                 <height>4-row</height>
                 <orientation>vertical</orientation>
-                <itemlayout width="4-col" height="2-row">
+                <itemlayout width="5-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -169,7 +161,7 @@
                         <shadowcolor>-</shadowcolor>
                     </control>
                 </itemlayout>
-                <focusedlayout width="4-col" height="2-row">
+                <focusedlayout width="5-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -183,7 +175,7 @@
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>3-col</width>
+                        <width>4-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
@@ -231,13 +223,19 @@
                         <thumb>-</thumb>
                         <onclick>SendClick(12)</onclick>
                     </item>
+                    <item>
+                        <label>31169</label>
+                        <label2></label2>
+                        <thumb>-</thumb>
+                        <onclick>SendClick(7)</onclick>
+                    </item>
                 </content>
             </control>
         </control>
         <!--content is album-->
         <control type="group">
             <visible>container.content(albums) + !container.content(artists)</visible>
-            <posx>1344</posx>
+            <posx>1200</posx>
             <posy>0</posy>
             <animation type="Windowopen">
                 <effect type="fade" start="0" end="100" time="300" delay="300"/>
@@ -250,29 +248,21 @@
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>8-col</width>
+                <width>10-col</width>
                 <height>fullscreenHeight</height>
                 <texture>colors/black.png</texture>
-                <colordiffuse>textboxInactive</colordiffuse>
+                <colordiffuse>cc111111</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
-                <posx>0</posx>
+                <posx>-6</posx>
                 <posy>0</posy>
-                <width>8-col</width>
-                <height>row-5-begin</height>
+                <width>6</width>
+                <height>fullscreenHeight</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>row-5-begin</posy>
-                <width>8-col</width>
-                <height>3</height>
-                <texture>colors/white.png</texture>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <!--title and synopsis-->
             <control type="group">
                 <posx>24</posx>
@@ -280,7 +270,7 @@
                 <control type="label">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>528</width>
+                    <width>684</width>
                     <align>left</align>
                     <height>100</height>
                     <aligny>center</aligny>
@@ -294,12 +284,12 @@
                     <posx>0</posx>
                     <posy>168</posy>
                     <font>textbox</font>
-                    <width>528</width>
+                    <width>660</width>
                     <align>left</align>
                     <textcolor>textActive</textcolor>
                     <height>16-row</height>
                     <label fallback="31205">$INFO[ListItem.Property(Album_Description)]</label>
-                    <autoscroll delay="10000" time="2000" repeat="10000"/>
+                    <autoscroll delay="10000" time="3000" repeat="10000"/>
                     <shadowcolor>-</shadowcolor>
                 </control>
             </control>
@@ -307,10 +297,10 @@
             <control type="panel" id="8000">
                 <posx>0</posx>
                 <posy>row-25-begin</posy>
-                <width>8-col</width>
+                <width>10-col</width>
                 <height>6-row</height>
                 <orientation>vertical</orientation>
-                <itemlayout width="4-col" height="2-row">
+                <itemlayout width="5-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -344,7 +334,7 @@
                         <shadowcolor>-</shadowcolor>
                     </control>
                 </itemlayout>
-                <focusedlayout width="4-col" height="2-row">
+                <focusedlayout width="5-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -358,7 +348,7 @@
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>3-col</width>
+                        <width>4-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
@@ -406,6 +396,12 @@
                         <thumb>-</thumb>
                         <onclick>SendClick(12)</onclick>
                     </item>
+                    <item>
+                        <label>31169</label>
+                        <label2></label2>
+                        <thumb>-</thumb>
+                        <onclick>SendClick(7)</onclick>
+                    </item>
                 </content>
             </control>
         </control>
diff --git a/1080i/DialogNotification.xml b/1080i/DialogNotification.xml
index be09713..bbc8427 100644
--- a/1080i/DialogNotification.xml
+++ b/1080i/DialogNotification.xml
@@ -83,7 +83,7 @@
         <include>DebugGrid</include>
         <control type="label">
             <include>WindowID</include>
-            <label>DialogKaiToast.xml</label>
+            <label>DialogNotification.xml</label>
         </control>
     </controls>
 </window>
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index 3e230df..4857168 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -7,54 +7,54 @@
         <include>globalBackground</include>
 
         <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">
+            <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>0</posx>
-                        <posy>75</posy>
+                        <posy>73</posy>
                         <width>12-col</width>
                         <height>18-row</height>
                         <onright>9999</onright>
@@ -146,7 +146,7 @@
                     <!--skin selection etc-->
                     <control type="panel" id="6">
                         <posx>0</posx>
-                        <posy>75</posy>
+                        <posy>73</posy>
                         <width>12-col</width>
                         <height>18-row</height>
                         <onright>9999</onright>
@@ -208,82 +208,82 @@
                         </focusedlayout>
                     </control>
                 </control>
-				<!--OK / Cancel-->
-				<control type="panel" id="9999">              
+                <!--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>
+                    <posy>73</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>
@@ -292,8 +292,8 @@
                             <thumb>-</thumb>
                             <onclick>SendClick(2000,5)</onclick>
                         </item>
-						<item id="2">
-						    <description>Cancel Button</description>
+                        <item id="2">
+                            <description>Cancel Button</description>
                             <label>222</label>
                             <label2></label2>
                             <thumb>-</thumb>
@@ -308,8 +308,8 @@
                         <label>186</label>
                     </control>
                 </control>
-	
-			</control>
+
+            </control>
         </control>
         <!--debugging-->
         <include>DebugGrid</include>
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index a2901a8..a41d747 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -79,22 +79,14 @@
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
-                <posx>0</posx>
+                <posx>-6</posx>
                 <posy>0</posy>
-                <width>10-col</width>
-                <height>row-5-begin</height>
+                <width>6</width>
+                <height>fullscreenHeight</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>row-5-begin</posy>
-                <width>10-col</width>
-                <height>3</height>
-                <texture>colors/white.png</texture>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <!--meta-->
             <control type="panel">
                 <posx>12</posx>
@@ -132,14 +124,14 @@
                         <onclick>noop</onclick>
                     </item>
                     <item>
-                        <label>$LOCALIZE[31146]</label>
-                        <label2>$INFO[ListItem.director]</label2>
+                        <label>$LOCALIZE[515]</label>
+                        <label2>$INFO[ListItem.genre]</label2>
                         <thumb>-</thumb>
                         <onclick>noop</onclick>
                     </item>
                     <item>
-                        <label>$LOCALIZE[515]</label>
-                        <label2>$INFO[ListItem.genre]</label2>
+                        <label>$LOCALIZE[31146]</label>
+                        <label2>$INFO[ListItem.director]</label2>
                         <thumb>-</thumb>
                         <onclick>noop</onclick>
                     </item>
@@ -519,14 +511,6 @@
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>row-5-begin</posy>
-                <width>10-col</width>
-                <height>3</height>
-                <texture>colors/white.png</texture>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <!--content-->
             <control type="group">
                 <posx>12</posx>
diff --git a/1080i/Font.xml b/1080i/Font.xml
index fda5416..5fabc1e 100644
--- a/1080i/Font.xml
+++ b/1080i/Font.xml
@@ -37,7 +37,7 @@
             <name>largeLight</name>
             <filename>roboto/light.ttf</filename>
             <size>54</size>
-            <linespacing>0.8</linespacing>
+            <linespacing>0.9</linespacing>
         </font>
         <font>
             <name>medium</name>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 1942fa8..b5bfaa6 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -32,7 +32,7 @@
         <!--Date / time and weather-->
         <control type="group">
             <posx>col-1-begin</posx>
-            <posy>row-23-begin</posy>
+            <posy>row-22-begin</posy>
             <control type="label">
                 <posx>0</posx>
                 <posy>-24</posy>
@@ -53,6 +53,17 @@
                 <textcolor>textActive</textcolor>
                 <label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)]</label>
             </control>
+            <control type="label">
+                <visible>!isempty(Window(Weather).Property(WeatherProvider))</visible>
+                <posx>0</posx>
+                <posy>3-row</posy>
+                <width>24-col</width>
+                <height>5-row</height>
+                <align>center</align>
+                <font>regular</font>
+                <textcolor>textActive</textcolor>
+                <label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [LOWERCASE]$INFO[weather.conditions][/LOWERCASE]</label>
+            </control>
         </control>
         <!--hidden button to reveal background-->
         <control type="button" id="9999">
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 028f36a..8c5ca80 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -129,7 +129,7 @@
     <!--mini player window-->
     <include name="miniVideoPlayer">
         <control type="group">
-            <visible>Player.HasVideo + !VideoPlayer.IsFullscreen + !SlideShow.IsActive</visible>
+            <visible>!Skin.hassetting(stopVideoOnMenu) + Player.HasVideo + !VideoPlayer.IsFullscreen + !SlideShow.IsActive</visible>
             <posx>col-20-begin</posx>
             <posy>12</posy>
             <control type="image">
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index f46a215..b8bd597 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -14,7 +14,6 @@
         <value condition="Window.isactive(Music) + Container.Content(albums) + !SubString(container.folderpath,musicdb://albums)">$LOCALIZE[31037] [COLOR highlight]$INFO[container.foldername][/COLOR]</value>
         <value condition="Window.isactive(Music) + Container.Content(songs)">$LOCALIZE[31182]</value>
         <value condition="Window.isactive(Music) + !container.content(genres) + SubString(container.folderpath,musicdb://genres)">$LOCALIZE[31199] [COLOR highlight]$INFO[container.foldername][/COLOR]</value>
-
         <value condition="Window.isactive(Music) + !isEmpty(container.foldername)">$INFO[container.foldername]</value>
         <value condition="Window.isactive(Music) + isEmpty(container.foldername)">$LOCALIZE[31053]</value>
         <!--
diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index c80907a..063494b 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -2,7 +2,7 @@
 <window>
     <defaultcontrol always="true">9999</defaultcontrol>
     <include>fadeInOut</include>
-    <previouswindow>home</previouswindow>
+    <onload>Skin.SetString(recentitems,music)</onload>
     <controls>
         <include>globalBackground</include>
         <!--page container group-->
@@ -28,9 +28,9 @@
                 <visible>Control.IsVisible(60)</visible>
                 <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-11-begin</posy>
-                    <height>9-row</height>
+                    <posx>52r</posx>
+                    <posy>row-6-begin</posy>
+                    <height>20-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index 86b81db..460875b 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -2,6 +2,8 @@
 <window>
     <defaultcontrol always="true">9999</defaultcontrol>
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
+    <onload condition="window.isactive(radiochannels)">Skin.SetString(recentitems,music)</onload>
+    <onload condition="window.isactive(tvchannels)">Skin.SetString(recentitems,video)</onload>
     <include>fadeInOut</include>
     <controls>
         <include>globalBackground</include>
@@ -24,9 +26,9 @@
                 <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>48r</posx>
-                    <posy>row-11-begin</posy>
-                    <height>9-row</height>
+                    <posx>52r</posx>
+                    <posy>row-6-begin</posy>
+                    <height>20-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index cc68dec..1282a36 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -4,6 +4,7 @@
     <include>fadeInOut</include>
     <defaultcontrol always="true">9999</defaultcontrol>
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
+    <onload>Skin.SetString(recentitems,video)</onload>
     <controls>
         <include>globalBackground</include>
         <!--page container group-->
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 2b2cb0e..91be14e 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -2,6 +2,7 @@
 <window>
     <defaultcontrol always="false">9999</defaultcontrol>
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
+    <onload>Skin.SetString(recentitems,video)</onload>
     <include>fadeInOut</include>
     <controls>
         <include>globalBackground</include>
@@ -173,9 +174,9 @@
                 <visible>Control.IsVisible(60)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>48r</posx>
-                    <posy>row-11-begin</posy>
-                    <height>9-row</height>
+                    <posx>52r</posx>
+                    <posy>row-6-begin</posy>
+                    <height>20-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/MyPVRTimers.xml b/1080i/MyPVRTimers.xml
index a019004..2d4c378 100644
--- a/1080i/MyPVRTimers.xml
+++ b/1080i/MyPVRTimers.xml
@@ -184,9 +184,9 @@
                 <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>48r</posx>
-                    <posy>row-11-begin</posy>
-                    <height>9-row</height>
+                    <posx>52r</posx>
+                    <posy>row-6-begin</posy>
+                    <height>20-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml
index c691738..7cc233b 100644
--- a/1080i/MyPics.xml
+++ b/1080i/MyPics.xml
@@ -20,9 +20,9 @@
                 <visible>Control.IsVisible(60)</visible>
                 <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>826</height>
+                    <posx>52r</posx>
+                    <posy>row-6-begin</posy>
+                    <height>20-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml
index 8039e2f..5721a01 100644
--- a/1080i/MyPlaylist.xml
+++ b/1080i/MyPlaylist.xml
@@ -35,9 +35,9 @@
                 <visible>Control.IsVisible(60)</visible>
                 <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-11-begin</posy>
-                    <height>9-row</height>
+                    <posx>52r</posx>
+                    <posy>row-6-begin</posy>
+                    <height>20-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index dcdcdc8..f95d621 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -124,9 +124,9 @@
                 <visible>Control.IsVisible(60)</visible>
                 <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-11-begin</posy>
-                    <height>9-row</height>
+                    <posx>52r</posx>
+                    <posy>row-6-begin</posy>
+                    <height>20-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 1fe27c2..0705220 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -2,8 +2,8 @@
 <window>
     <defaultcontrol always="true">9999</defaultcontrol>
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
+    <onload>Skin.SetString(recentitems,video)</onload>
     <include>fadeInOut</include>
-    <previouswindow>home</previouswindow>
     <controls>
         <include>globalBackground</include>
         <!--page container group-->
@@ -27,9 +27,9 @@
                 <visible>Control.IsVisible(60)</visible>
                 <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-11-begin</posy>
-                    <height>9-row</height>
+                    <posx>52r</posx>
+                    <posy>row-6-begin</posy>
+                    <height>20-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml
index 3486343..8d0da1c 100644
--- a/1080i/SettingsCategory.xml
+++ b/1080i/SettingsCategory.xml
@@ -132,7 +132,7 @@
             <!--subcat menu buttons-->
             <control type="togglebutton" id="10">
                 <description>Default Category Button</description>
-                <width>4-col</width>
+                <width>287</width>
                 <font>buttonTitle</font>
                 <texturefocus>colors/white.png</texturefocus>
                 <texturenofocus>-</texturenofocus>
diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml
index f935ed3..654d18d 100644
--- a/1080i/SettingsProfile.xml
+++ b/1080i/SettingsProfile.xml
@@ -6,7 +6,7 @@
         <include>globalBackground</include>
         <control type="group">
             <posx>col-9-begin</posx>
-            <posy>row-3-begin</posy>
+            <posy>row-4-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <animation type="conditional" condition="window.isactive(profilesettings)">
@@ -22,15 +22,6 @@
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>8-col</width>
-                <height>21-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>44ffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <control type="label">
                 <posx>24</posx>
                 <posy>0</posy>
@@ -52,10 +43,10 @@
             </control>
             <control type="image">
                 <description>profile image</description>
-                <posx>156</posx>
-                <posy>96</posy>
-                <width>4-col-gutter</width>
-                <height>4-col-gutter</height>
+                <posx>0</posx>
+                <posy>73</posy>
+                <width>8-col</width>
+                <height>10-row</height>
                 <texture fallback="colors/offblack.png" border="0">$INFO[System.ProfileThumb]</texture>
                 <aspectratio>scale</aspectratio>
             </control>
@@ -63,7 +54,7 @@
                 <posx>0</posx>
                 <posy>10-row</posy>
                 <width>8-col</width>
-                <height>2-row</height>
+                <height>73</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>textboxInactive</colordiffuse>
                 <aspectratio>stretch</aspectratio>
@@ -87,14 +78,14 @@
                 <posy>12-row</posy>
                 <width>8-col</width>
                 <label>20096</label>
-                <texturenofocus>colors/black.png</texturenofocus>
+                <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
                 <align>left</align>
                 <ondown>2</ondown>
             </control>
             <control type="panel" id="2">
-                <posx>12</posx>
-                <posy>516</posy>
-                <width>8-col-gutter</width>
+                <posx>0</posx>
+                <posy>507</posy>
+                <width>8-col</width>
                 <height>8-row</height>
                 <onup>4</onup>
                 <itemlayout width="8-col" height="2-row">
@@ -146,7 +137,7 @@
                         <width>1-col</width>
                         <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture fallback="colors/offblack.png">$INFO[listitem.icon]</texture>
+                        <texture fallback="colors/black.png">$INFO[listitem.icon]</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>ffffffff</colordiffuse>
                         <include>spinFocusIcon</include>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index bfd5e8b..5b9a68c 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -75,7 +75,7 @@
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>4-col</width>
+                            <width>287</width>
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 2f70364..ff347f1 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -12,11 +12,6 @@
                 <fadetime>1500</fadetime>
                 <colordiffuse>22ffffff</colordiffuse>
             </control>
-            <control type="image">
-                <texture>vignette.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
         </control>
         <control type="panel" id="50">
             <visible>container.content(albums) + !container.content(songs) + !SubString(container.folderpath,musicdb://artists) + !SubString(container.folderpath,musicdb://genres)</visible>
diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml
index 5974b26..312c7d9 100644
--- a/1080i/View_Artists.xml
+++ b/1080i/View_Artists.xml
@@ -12,11 +12,6 @@
                 <fadetime>500</fadetime>
                 <colordiffuse>22ffffff</colordiffuse>
             </control>
-            <control type="image">
-                <texture>vignette.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
         </control>
         <control type="panel" id="50">
             <visible>container.content(artists) + !container.content(songs) + !container.content(albums)</visible>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 297c077..2ffa4b9 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -81,7 +81,7 @@
             <!--tvhsow library-sourced episode list-->
             <control type="panel" id="52">
                 <visible>Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
-                <posx>col-13-begin</posx>
+                <posx>954</posx>
                 <posy>row-8-begin</posy>
                 <width>12-col</width>
                 <height>19-row</height>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 3fe344e..4438d0d 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -13,11 +13,6 @@
                     <fadetime>500</fadetime>
                     <colordiffuse>22ffffff</colordiffuse>
                 </control>
-                <control type="image">
-                    <texture>vignette.png</texture>
-                    <colordiffuse>ffffffff</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
                 <include>kenBurnsey</include>
             </control>
             <control type="panel" id="50">
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index cb9d598..291c533 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -178,7 +178,7 @@
                 </control>
                 <control type="label">
                     <visible>!ListItem.IsParentFolder</visible>
-                    <posx>12-col</posx>
+                    <posx>12-col-gutter</posx>
                     <posy>0</posy>
                     <width>1-col</width>
                     <height>2-row</height>
@@ -296,7 +296,7 @@
                 </control>
                 <control type="label">
                     <visible>!ListItem.IsParentFolder</visible>
-                    <posx>12-col</posx>
+                    <posx>12-col-gutter</posx>
                     <posy>0</posy>
                     <width>1-col</width>
                     <height>2-row</height>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 5372105..168ee61 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -14,161 +14,121 @@
                     <colordiffuse>99ffffff</colordiffuse>
                     <include>kenBurnsey</include>
                 </control>
-                <control type="image">
-                    <texture>vignette.png</texture>
-                    <colordiffuse>ffffffff</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-            </control>
-
-            <!--cover art-->
-            <control type="group">
-                <posx>col-17-begin</posx>
-                <posy>222</posy>
-                <control type="group">
-                    <visible>Substring(container.folderpath,videodb://) + Library.HasContent(tvshows) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + !container.content(files)</visible>
-                    <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>768</height>
-                            <aspectratio scalediffuse="false">stretch</aspectratio>
-                            <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(poster)]</texture>
-                            <fadetime>200</fadetime>
-                        </control>
-                    </control>
-                </control>
             </control>
             <control type="panel" id="50">
                 <visible>Substring(container.folderpath,videodb://) + Library.HasContent(tvshows) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + !container.content(files)</visible>
-                <posx>col-1-begin</posx>
+                <posx>90</posx>
                 <posy>row-5-begin</posy>
-                <width>15-col</width>
-                <height>23-row</height>
+                <width>1800</width>
+                <height>25-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <ondown>50</ondown>
                 <onup>50</onup>
                 <onback>9000</onback>
                 <pagecontrol>60</pagecontrol>
-                <itemlayout width="15-col" height="2-row">
+                <scrolltime tween="cubic" easing="out">600</scrolltime>
+                <itemlayout width="252" height="388">
                     <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="image">
-                        <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>14-col</width>
-                        <height>69</height>
+                        <width>228</width>
+                        <height>304</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <colordiffuse>textboxInactive</colordiffuse>
+                        <texture border="6">DefaultPoster.png</texture>
+                        <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+                        <bordersize>6</bordersize>
+                        <colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>1-col-indent</posx>
-                        <posy>0</posy>
-                        <width>11-col-gutter</width>
-                        <height>2-row</height>
+                        <posx>12</posx>
+                        <posy>300</posy>
+                        <width>204</width>
+                        <height>1-row</height>
                         <aligny>center</aligny>
-                        <font>itemTitle</font>
+                        <font>thumbTitle</font>
                         <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Label]</label>
+                        <label>[B]$INFO[ListItem.title][/B]</label>
                     </control>
                     <control type="label">
-                        <posx>792</posx>
-                        <posy>0</posy>
-                        <width>3-col-gutter</width>
-                        <height>2-row</height>
+                        <visible>!System.Setting(hidewatched)</visible>
+                        <posx>12</posx>
+                        <posy>324</posy>
+                        <width>204</width>
+                        <height>1-row</height>
                         <aligny>center</aligny>
-                        <align>right</align>
-                        <font>itemSubTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
+                        <font>thumbTitle</font>
+                        <textcolor>textDisabled</textcolor>
                         <label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
                     </control>
                     <control type="label">
-                        <visible>IntegerGreaterThan(ListItem.Property(UnWatchedEpisodes),0)</visible>
-                        <posx>985</posx>
-                        <posy>0</posy>
-                        <width>1-col</width>
-                        <height>2-row</height>
+                        <visible>System.Setting(hidewatched)</visible>
+                        <posx>12</posx>
+                        <posy>324</posy>
+                        <width>204</width>
+                        <height>1-row</height>
                         <aligny>center</aligny>
-                        <align>right</align>
-                        <font>symbolLarge</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label></label>
+                        <font>thumbTitle</font>
+                        <textcolor>textDisabled</textcolor>
+                        <label>$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
+                    </control>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>228</width>
+                        <height>304</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">$INFO[ListItem.Art(poster)]</texture>
+                        <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
+                        <bordersize>6</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
                     </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">
-                            <effect type="fade" time="500"/>
-                            <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
-                        </animation>
-                    </control>
-                    <control type="image">
-                        <posx>1-col</posx>
-                        <posy>0</posy>
-                        <width>14-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">
-                        <posx>792</posx>
-                        <posy>0</posy>
-                        <width>3-col-gutter</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <align>right</align>
-                        <font>itemSubTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
-                    </control>
-                    <control type="label">
-                        <visible>IntegerGreaterThan(ListItem.Property(UnWatchedEpisodes),0)</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>
+                <focusedlayout width="252" height="388">
+                    <control type="group">
+                        <include>focusThumb</include>
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>228</width>
+                            <height>304</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture fallback="DefaultPoster.png" border="0">$INFO[ListItem.Art(poster)]</texture>
+                            <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
+                            <bordersize>6</bordersize>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>300</posy>
+                            <width>204</width>
+                            <height>1-row</height>
+                            <aligny>center</aligny>
+                            <font>thumbTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label>[B]$INFO[ListItem.title][/B]</label>
+                        </control>
+                        <control type="label">
+                            <visible>!System.Setting(hidewatched)</visible>
+                            <posx>12</posx>
+                            <posy>324</posy>
+                            <width>204</width>
+                            <height>1-row</height>
+                            <aligny>center</aligny>
+                            <font>thumbTitle</font>
+                            <textcolor>textDisabled</textcolor>
+                            <label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
+                        </control>
+                        <control type="label">
+                            <visible>System.Setting(hidewatched)</visible>
+                            <posx>12</posx>
+                            <posy>324</posy>
+                            <width>204</width>
+                            <height>1-row</height>
+                            <aligny>center</aligny>
+                            <font>thumbTitle</font>
+                            <textcolor>textDisabled</textcolor>
+                            <label>$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
+                        </control>
                     </control>
                 </focusedlayout>
             </control>
diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml
index 72f4943..e0197aa 100644
--- a/1080i/View_VideoFiles.xml
+++ b/1080i/View_VideoFiles.xml
@@ -12,7 +12,6 @@
             <ondown>50</ondown>
             <onup>50</onup>
             <pagecontrol>60</pagecontrol>
-            <onback>home</onback>
             <itemlayout width="24-col" height="2-row">
                 <control type="image">
                     <posx>0</posx>
diff --git a/1080i/custom_musicFullscreenDisabler.xml b/1080i/custom_musicFullscreenDisabler.xml
index ea4a200..17c971c 100644
--- a/1080i/custom_musicFullscreenDisabler.xml
+++ b/1080i/custom_musicFullscreenDisabler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1101">
-    <onload>Dialog.Close(all,true)</onload>
+    <onload>Dialog.Close(1103,true)</onload>
     <visible>Window.IsActive(1103) + !player.hasaudio</visible>
     <controls></controls>
 </window>
\ No newline at end of file
diff --git a/1080i/custom_recentContent.xml b/1080i/custom_recentContent.xml
index 2fbeb4d..6e61bfb 100644
--- a/1080i/custom_recentContent.xml
+++ b/1080i/custom_recentContent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window id="1106">
-    <defaultcontrol always="true">9000</defaultcontrol>
+    <defaultcontrol always="false">9000</defaultcontrol>
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
     <controls>
         <control type="group" id="9999">
@@ -87,7 +87,7 @@
                         <textcolor>66ffffff</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <wrapmultiline>true</wrapmultiline>
-                        <label>[B]$INFO[container(9998).listitem.title][/B][CR]$INFO[container(9998).listitem.director,$LOCALIZE[31196]. ,.] $INFO[container(9998).listitem.year,,]</label>
+                        <label>[B]$INFO[container(9998).listitem.title][/B][CR]$INFO[container(9998).listitem.year,,.]$INFO[container(9998).listitem.director, ,]</label>
                     </control>
                     <control type="label">
                         <visible>Container(9123).HasFocus(7)</visible>
@@ -416,7 +416,7 @@
                 <onleft>9000</onleft>
                 <onback>9000</onback>
                 <orientation>horizontal</orientation>
-                <onclick>activatewindow(music,musicdb://albums/$INFO[listitem.DBID])</onclick>
+                <onclick>activatewindow(music,musicdb://albums/$INFO[listitem.DBID],return)</onclick>
                 <onclick>Control.SetFocus(50)</onclick>
                 <content>$INFO[control.getlabel(9123)]</content>
                 <itemlayout width="300" height="4-col">
diff --git a/1080i/script-skinshortcuts-includes.xml b/1080i/script-skinshortcuts-includes.xml
new file mode 100644
index 0000000..ab19654
--- /dev/null
+++ b/1080i/script-skinshortcuts-includes.xml
@@ -0,0 +1,3678 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<includes>
+	<include name="skinshortcuts-mainmenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>Player.HasMedia</visible>
+			<onclick>action(FullScreen)</onclick>
+			<property name="path">action(FullScreen)</property>
+			<property name="list">action(FullScreen)</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31136</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<label>$ADDON[script.skinshortcuts 32032]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">dvd</property>
+			<property name="defaultID">dvd</property>
+			<visible>System.HasMediaDVD</visible>
+			<onclick>XBMC.PlayDVD()</onclick>
+			<property name="path">XBMC.PlayDVD()</property>
+			<property name="list">XBMC.PlayDVD()</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">dvd</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 32033]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">32033</property>
+			<property name="defaultID">32033</property>
+			<visible>System.HasMediaDVD</visible>
+			<onclick>EjectTray()</onclick>
+			<property name="path">EjectTray()</property>
+			<property name="list">EjectTray()</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-32033</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<label>$LOCALIZE[31147]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">script.globalsearch</property>
+			<property name="defaultID">script.globalsearch</property>
+			<visible>System.HasAddon(script.globalsearch)</visible>
+			<onclick>RunScript(script.globalsearch)</onclick>
+			<property name="path">RunScript(script.globalsearch)</property>
+			<property name="list">RunScript(script.globalsearch)</property>
+			<onclick>right</onclick>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">script-globalsearch</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<label>$LOCALIZE[31006]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31006</property>
+			<property name="defaultID">31006</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick>ActivateWindow(TVChannels)</onclick>
+			<property name="path">ActivateWindow(TVChannels)</property>
+			<property name="list">TVChannels</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31006</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<label>$LOCALIZE[31059]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31059</property>
+			<property name="defaultID">31059</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasRadioChannels]</visible>
+			<onclick>ActivateWindow(Radiochannels)</onclick>
+			<property name="path">ActivateWindow(Radiochannels)</property>
+			<property name="list">Radiochannels</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31059</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<label>$LOCALIZE[10006]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">videos</property>
+			<property name="defaultID">videos</property>
+			<property name="icon">DefaultAddon.png</property>
+			<visible>Library.HasContent(Video)</visible>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),videos)">Skin.SetString(recentitems,video)</onclick>
+			<property name="path">Skin.SetString(recentitems,video)</property>
+			<property name="list">Skin.SetString(recentitems,video)</property>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),videos)">ActivateWindow(1106)</onclick>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),music)">Skin.SetString(recentitems,music)</onclick>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),music)">ActivateWindow(1106)</onclick>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">videos</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<label>$LOCALIZE[10006]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">videos--0</property>
+			<property name="defaultID">videos--0</property>
+			<visible>!Library.HasContent(Video)</visible>
+			<onclick>ActivateWindow(Videos,sources://video/)</onclick>
+			<property name="path">ActivateWindow(Videos,sources://video/)</property>
+			<property name="list">sources://video/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">videos-0</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<label>$LOCALIZE[10005]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">music</property>
+			<property name="defaultID">music</property>
+			<property name="icon">DefaultAddon.png</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),videos)">Skin.SetString(recentitems,video)</onclick>
+			<property name="path">Skin.SetString(recentitems,video)</property>
+			<property name="list">Skin.SetString(recentitems,video)</property>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),videos)">ActivateWindow(1106)</onclick>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),music)">Skin.SetString(recentitems,music)</onclick>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),music)">ActivateWindow(1106)</onclick>
+			<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="10">
+			<property name="id">$NUMBER[10]</property>
+			<label>$LOCALIZE[10005]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">music--0</property>
+			<property name="defaultID">music--0</property>
+			<visible>!Library.HasContent(Music)</visible>
+			<onclick>ActivateWindow(Music,Files)</onclick>
+			<property name="path">ActivateWindow(Music,Files)</property>
+			<property name="list">Files</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">music-0</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
+			<label>$LOCALIZE[12600]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">weather</property>
+			<property name="defaultID">weather</property>
+			<visible>!IsEmpty(Weather.Plugin)</visible>
+			<onclick>ActivateWindow(Weather)</onclick>
+			<property name="path">ActivateWindow(Weather)</property>
+			<property name="list">Weather</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">weather</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
+			<label>$LOCALIZE[10002]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.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="13">
+			<property name="id">$NUMBER[13]</property>
+			<label>$LOCALIZE[10004]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">settings</property>
+			<property name="defaultID">settings</property>
+			<onclick>ActivateWindow(Settings)</onclick>
+			<property name="path">ActivateWindow(Settings)</property>
+			<property name="list">Settings</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">settings</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
+		<item id="14">
+			<property name="id">$NUMBER[14]</property>
+			<label>$LOCALIZE[31004]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31004</property>
+			<property name="defaultID">31004</property>
+			<onclick>ActivateWindow(shutdownmenu)</onclick>
+			<property name="path">ActivateWindow(shutdownmenu)</property>
+			<property name="list">shutdownmenu</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31004</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>Player.HasMedia</visible>
+			<onclick>action(FullScreen)</onclick>
+			<property name="path">action(FullScreen)</property>
+			<property name="list">action(FullScreen)</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">num-31136</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<label>$ADDON[script.skinshortcuts 32032]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">dvd</property>
+			<property name="defaultID">dvd</property>
+			<visible>System.HasMediaDVD</visible>
+			<onclick>XBMC.PlayDVD()</onclick>
+			<property name="path">XBMC.PlayDVD()</property>
+			<property name="list">XBMC.PlayDVD()</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">dvd</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 32033]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">32033</property>
+			<property name="defaultID">32033</property>
+			<visible>System.HasMediaDVD</visible>
+			<onclick>EjectTray()</onclick>
+			<property name="path">EjectTray()</property>
+			<property name="list">EjectTray()</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">num-32033</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<label>$LOCALIZE[31147]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">script.globalsearch</property>
+			<property name="defaultID">script.globalsearch</property>
+			<visible>System.HasAddon(script.globalsearch)</visible>
+			<onclick>RunScript(script.globalsearch)</onclick>
+			<property name="path">RunScript(script.globalsearch)</property>
+			<property name="list">RunScript(script.globalsearch)</property>
+			<onclick>right</onclick>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">script-globalsearch</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<label>$LOCALIZE[31006]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31006</property>
+			<property name="defaultID">31006</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick>ActivateWindow(TVChannels)</onclick>
+			<property name="path">ActivateWindow(TVChannels)</property>
+			<property name="list">TVChannels</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">num-31006</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<label>$LOCALIZE[31059]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31059</property>
+			<property name="defaultID">31059</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasRadioChannels]</visible>
+			<onclick>ActivateWindow(Radiochannels)</onclick>
+			<property name="path">ActivateWindow(Radiochannels)</property>
+			<property name="list">Radiochannels</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">num-31059</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<label>$LOCALIZE[10006]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">videos</property>
+			<property name="defaultID">videos</property>
+			<property name="icon">DefaultAddon.png</property>
+			<visible>Library.HasContent(Video)</visible>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),videos)">Skin.SetString(recentitems,video)</onclick>
+			<property name="path">Skin.SetString(recentitems,video)</property>
+			<property name="list">Skin.SetString(recentitems,video)</property>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),videos)">ActivateWindow(1106)</onclick>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),music)">Skin.SetString(recentitems,music)</onclick>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),music)">ActivateWindow(1106)</onclick>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">videos</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<label>$LOCALIZE[10006]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">videos--0</property>
+			<property name="defaultID">videos--0</property>
+			<visible>!Library.HasContent(Video)</visible>
+			<onclick>ActivateWindow(Videos,sources://video/)</onclick>
+			<property name="path">ActivateWindow(Videos,sources://video/)</property>
+			<property name="list">sources://video/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">videos-0</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<label>$LOCALIZE[10005]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">music</property>
+			<property name="defaultID">music</property>
+			<property name="icon">DefaultAddon.png</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),videos)">Skin.SetString(recentitems,video)</onclick>
+			<property name="path">Skin.SetString(recentitems,video)</property>
+			<property name="list">Skin.SetString(recentitems,video)</property>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),videos)">ActivateWindow(1106)</onclick>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),music)">Skin.SetString(recentitems,music)</onclick>
+			<onclick condition="String.Contains(Container(9001).ListItem.Property(defaultID),music)">ActivateWindow(1106)</onclick>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">music</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
+			<label>$LOCALIZE[10005]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">music--0</property>
+			<property name="defaultID">music--0</property>
+			<visible>!Library.HasContent(Music)</visible>
+			<onclick>ActivateWindow(Music,Files)</onclick>
+			<property name="path">ActivateWindow(Music,Files)</property>
+			<property name="list">Files</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">music-0</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
+			<label>$LOCALIZE[12600]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">weather</property>
+			<property name="defaultID">weather</property>
+			<visible>!IsEmpty(Weather.Plugin)</visible>
+			<onclick>ActivateWindow(Weather)</onclick>
+			<property name="path">ActivateWindow(Weather)</property>
+			<property name="list">Weather</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">weather</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
+			<label>$LOCALIZE[10002]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.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,Test profile)</visible>
+			<property name="submenuVisibility">pictures</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
+		<item id="13">
+			<property name="id">$NUMBER[13]</property>
+			<label>$LOCALIZE[10004]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">settings</property>
+			<property name="defaultID">settings</property>
+			<onclick>ActivateWindow(Settings)</onclick>
+			<property name="path">ActivateWindow(Settings)</property>
+			<property name="list">Settings</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">settings</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
+		<item id="14">
+			<property name="id">$NUMBER[14]</property>
+			<label>$LOCALIZE[31004]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31004</property>
+			<property name="defaultID">31004</property>
+			<onclick>ActivateWindow(shutdownmenu)</onclick>
+			<property name="path">ActivateWindow(shutdownmenu)</property>
+			<property name="list">shutdownmenu</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="submenuVisibility">num-31004</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+	</include>
+	<include />
+	<include name="skinshortcuts-submenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">2</property>
+			<label>$ADDON[script.skinshortcuts 32033]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">32033</property>
+			<property name="defaultID">32033</property>
+			<onclick>EjectTray()</onclick>
+			<property name="path">EjectTray()</property>
+			<property name="list">EjectTray()</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),dvd)</visible>
+			<property name="group">dvd</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[20389]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">musicvideos</property>
+			<property name="defaultID">musicvideos</property>
+			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
+			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
+			<property name="list">videodb://musicvideos/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,Files,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Files,return)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[1037]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1037</property>
+			<property name="defaultID">1037</property>
+			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">9</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(9001).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>
+			<property name="mainmenuid">9</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(9001).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>
+			<property name="mainmenuid">9</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(9001).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>
+			<property name="mainmenuid">12</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(Container(9001).ListItem.Property(submenuVisibility),pictures)</visible>
+			<property name="group">pictures</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[7]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">7</property>
+			<property name="defaultID">7</property>
+			<onclick>ActivateWindow(FileManager)</onclick>
+			<property name="path">ActivateWindow(FileManager)</property>
+			<property name="list">FileManager</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[13200]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">13200</property>
+			<property name="defaultID">13200</property>
+			<onclick>ActivateWindow(Profiles)</onclick>
+			<property name="path">ActivateWindow(Profiles)</property>
+			<property name="list">Profiles</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[10007]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">10007</property>
+			<property name="defaultID">10007</property>
+			<onclick>ActivateWindow(SystemInfo)</onclick>
+			<property name="path">ActivateWindow(SystemInfo)</property>
+			<property name="list">SystemInfo</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[14111]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">14111</property>
+			<property name="defaultID">14111</property>
+			<visible>[system.getbool(eventlog.enabled)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),settings)</visible>
+			<onclick>ActivateWindow(EventLog,events://,return)</onclick>
+			<property name="path">ActivateWindow(EventLog,events://,return)</property>
+			<property name="list">events://</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>[Player.HasMedia] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>action(FullScreen)</onclick>
+			<property name="path">action(FullScreen)</property>
+			<property name="list">action(FullScreen)</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
+			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">livetv</property>
+			<property name="defaultID">livetv</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVChannels)</onclick>
+			<property name="path">ActivateWindow(TVChannels)</property>
+			<property name="list">TVChannels</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31112]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31112</property>
+			<property name="defaultID">31112</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVGuide)</onclick>
+			<property name="path">ActivateWindow(TVGuide)</property>
+			<property name="list">TVGuide</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31165]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31165</property>
+			<property name="defaultID">31165</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVRecordings)</onclick>
+			<property name="path">ActivateWindow(TVRecordings)</property>
+			<property name="list">TVRecordings</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[342]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">movies</property>
+			<property name="defaultID">movies</property>
+			<visible>[Library.HasContent(Movies)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(Videos,videodb://movies/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://movies/titles/)</property>
+			<property name="list">videodb://movies/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[20343]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">tvshows</property>
+			<property name="defaultID">tvshows</property>
+			<visible>[Library.HasContent(TVShows)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(Videos,videodb://tvshows/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://tvshows/titles/)</property>
+			<property name="list">videodb://tvshows/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31088]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31088</property>
+			<property name="defaultID">31088</property>
+			<onclick>ActivateWindow(Videos,addons://sources/video/)</onclick>
+			<property name="path">ActivateWindow(Videos,addons://sources/video/)</property>
+			<property name="list">addons://sources/video/</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,sources://video/)</onclick>
+			<property name="path">ActivateWindow(Videos,sources://video/)</property>
+			<property name="list">sources://video/</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>[Player.HasMedia] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>activateWindow(1103)</onclick>
+			<property name="path">activateWindow(1103)</property>
+			<property name="list">activateWindow(1103)</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31059]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31059</property>
+			<property name="defaultID">31059</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasRadioChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Radiochannels)</onclick>
+			<property name="path">ActivateWindow(Radiochannels)</property>
+			<property name="list">Radiochannels</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[133]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">133</property>
+			<property name="defaultID">133</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://artists/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://artists/)</property>
+			<property name="list">musicdb://artists/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[132]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">132</property>
+			<property name="defaultID">132</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://albums/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="list">musicdb://albums/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[135]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">135</property>
+			<property name="defaultID">135</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://genres/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://genres/)</property>
+			<property name="list">musicdb://genres/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">136</property>
+			<property name="defaultID">136</property>
+			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="list">special://musicplaylists/</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31090]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31090</property>
+			<property name="defaultID">31090</property>
+			<onclick>ActivateWindow(Music,Addons)</onclick>
+			<property name="path">ActivateWindow(Music,Addons)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files)</onclick>
+			<property name="path">ActivateWindow(Music,Files)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">17</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(Container(9001).ListItem.Property(submenuVisibility),picturessubmenu)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">2</property>
+			<label>$ADDON[script.skinshortcuts 32033]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">32033</property>
+			<property name="defaultID">32033</property>
+			<onclick>EjectTray()</onclick>
+			<property name="path">EjectTray()</property>
+			<property name="list">EjectTray()</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),dvd)</visible>
+			<property name="group">dvd</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[20389]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">musicvideos</property>
+			<property name="defaultID">musicvideos</property>
+			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
+			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
+			<property name="list">videodb://musicvideos/titles/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,Files,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Files,return)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[1037]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1037</property>
+			<property name="defaultID">1037</property>
+			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">9</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,Test profile)] + StringCompare(Container(9001).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>
+			<property name="mainmenuid">9</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,Test profile)] + StringCompare(Container(9001).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>
+			<property name="mainmenuid">9</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,Test profile)] + StringCompare(Container(9001).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>
+			<property name="mainmenuid">12</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,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),pictures)</visible>
+			<property name="group">pictures</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[7]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">7</property>
+			<property name="defaultID">7</property>
+			<onclick>ActivateWindow(FileManager)</onclick>
+			<property name="path">ActivateWindow(FileManager)</property>
+			<property name="list">FileManager</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[13200]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">13200</property>
+			<property name="defaultID">13200</property>
+			<onclick>ActivateWindow(Profiles)</onclick>
+			<property name="path">ActivateWindow(Profiles)</property>
+			<property name="list">Profiles</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[10007]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">10007</property>
+			<property name="defaultID">10007</property>
+			<onclick>ActivateWindow(SystemInfo)</onclick>
+			<property name="path">ActivateWindow(SystemInfo)</property>
+			<property name="list">SystemInfo</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[14111]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">14111</property>
+			<property name="defaultID">14111</property>
+			<visible>[system.getbool(eventlog.enabled)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),settings)</visible>
+			<onclick>ActivateWindow(EventLog,events://,return)</onclick>
+			<property name="path">ActivateWindow(EventLog,events://,return)</property>
+			<property name="list">events://</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>[Player.HasMedia] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>action(FullScreen)</onclick>
+			<property name="path">action(FullScreen)</property>
+			<property name="list">action(FullScreen)</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
+			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">livetv</property>
+			<property name="defaultID">livetv</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVChannels)</onclick>
+			<property name="path">ActivateWindow(TVChannels)</property>
+			<property name="list">TVChannels</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31112]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31112</property>
+			<property name="defaultID">31112</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVGuide)</onclick>
+			<property name="path">ActivateWindow(TVGuide)</property>
+			<property name="list">TVGuide</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31165]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31165</property>
+			<property name="defaultID">31165</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVRecordings)</onclick>
+			<property name="path">ActivateWindow(TVRecordings)</property>
+			<property name="list">TVRecordings</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[342]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">movies</property>
+			<property name="defaultID">movies</property>
+			<visible>[Library.HasContent(Movies)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(Videos,videodb://movies/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://movies/titles/)</property>
+			<property name="list">videodb://movies/titles/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[20343]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">tvshows</property>
+			<property name="defaultID">tvshows</property>
+			<visible>[Library.HasContent(TVShows)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(Videos,videodb://tvshows/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://tvshows/titles/)</property>
+			<property name="list">videodb://tvshows/titles/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31088]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31088</property>
+			<property name="defaultID">31088</property>
+			<onclick>ActivateWindow(Videos,addons://sources/video/)</onclick>
+			<property name="path">ActivateWindow(Videos,addons://sources/video/)</property>
+			<property name="list">addons://sources/video/</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,sources://video/)</onclick>
+			<property name="path">ActivateWindow(Videos,sources://video/)</property>
+			<property name="list">sources://video/</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>[Player.HasMedia] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>activateWindow(1103)</onclick>
+			<property name="path">activateWindow(1103)</property>
+			<property name="list">activateWindow(1103)</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31059]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31059</property>
+			<property name="defaultID">31059</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasRadioChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Radiochannels)</onclick>
+			<property name="path">ActivateWindow(Radiochannels)</property>
+			<property name="list">Radiochannels</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[133]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">133</property>
+			<property name="defaultID">133</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://artists/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://artists/)</property>
+			<property name="list">musicdb://artists/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[132]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">132</property>
+			<property name="defaultID">132</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://albums/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="list">musicdb://albums/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[135]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">135</property>
+			<property name="defaultID">135</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://genres/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://genres/)</property>
+			<property name="list">musicdb://genres/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">136</property>
+			<property name="defaultID">136</property>
+			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="list">special://musicplaylists/</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31090]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31090</property>
+			<property name="defaultID">31090</property>
+			<onclick>ActivateWindow(Music,Addons)</onclick>
+			<property name="path">ActivateWindow(Music,Addons)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files)</onclick>
+			<property name="path">ActivateWindow(Music,Files)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">17</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,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),picturessubmenu)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-num-31136">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-num-31136">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-dvd">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">2</property>
+			<label>$ADDON[script.skinshortcuts 32033]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">32033</property>
+			<property name="defaultID">32033</property>
+			<onclick>EjectTray()</onclick>
+			<property name="path">EjectTray()</property>
+			<property name="list">EjectTray()</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">dvd</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">2</property>
+			<label>$ADDON[script.skinshortcuts 32033]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">32033</property>
+			<property name="defaultID">32033</property>
+			<onclick>EjectTray()</onclick>
+			<property name="path">EjectTray()</property>
+			<property name="list">EjectTray()</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">dvd</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-alt-dvd">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">2</property>
+			<label>$ADDON[script.skinshortcuts 32033]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">32033</property>
+			<property name="defaultID">32033</property>
+			<onclick>EjectTray()</onclick>
+			<property name="path">EjectTray()</property>
+			<property name="list">EjectTray()</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),dvd)</visible>
+			<property name="group">dvd</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">2</property>
+			<label>$ADDON[script.skinshortcuts 32033]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">32033</property>
+			<property name="defaultID">32033</property>
+			<onclick>EjectTray()</onclick>
+			<property name="path">EjectTray()</property>
+			<property name="list">EjectTray()</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),dvd)</visible>
+			<property name="group">dvd</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-num-32033">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-num-32033">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-script-globalsearch">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-script-globalsearch">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-num-31006">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-num-31006">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-num-31059">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-num-31059">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-videos">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[20389]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">musicvideos</property>
+			<property name="defaultID">musicvideos</property>
+			<visible>Library.HasContent(MusicVideos)</visible>
+			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
+			<property name="list">videodb://musicvideos/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,Files,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Files,return)</property>
+			<property name="list">Files</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[1037]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1037</property>
+			<property name="defaultID">1037</property>
+			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[20389]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">musicvideos</property>
+			<property name="defaultID">musicvideos</property>
+			<visible>Library.HasContent(MusicVideos)</visible>
+			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
+			<property name="list">videodb://musicvideos/titles/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,Files,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Files,return)</property>
+			<property name="list">Files</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[1037]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1037</property>
+			<property name="defaultID">1037</property>
+			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-alt-videos">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[20389]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">musicvideos</property>
+			<property name="defaultID">musicvideos</property>
+			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
+			<property name="list">videodb://musicvideos/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,Files,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Files,return)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[1037]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1037</property>
+			<property name="defaultID">1037</property>
+			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[20389]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">musicvideos</property>
+			<property name="defaultID">musicvideos</property>
+			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
+			<property name="list">videodb://musicvideos/titles/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,Files,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Files,return)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[1037]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1037</property>
+			<property name="defaultID">1037</property>
+			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-videos-0">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-videos-0">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-music">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">9</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>
+			<property name="mainmenuid">9</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>
+			<property name="mainmenuid">9</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>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">9</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,Test profile)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">9</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,Test profile)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">9</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,Test profile)</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>
+			<property name="mainmenuid">9</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>
+			<property name="mainmenuid">9</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>
+			<property name="mainmenuid">9</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>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">9</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,Test profile)] + 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>
+			<property name="mainmenuid">9</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,Test profile)] + 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>
+			<property name="mainmenuid">9</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,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),music)</visible>
+			<property name="group">music</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-music-0">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-music-0">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-weather">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-weather">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-pictures">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">12</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>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">12</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,Test profile)</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>
+			<property name="mainmenuid">12</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>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">12</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,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),pictures)</visible>
+			<property name="group">pictures</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-settings">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[7]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">7</property>
+			<property name="defaultID">7</property>
+			<onclick>ActivateWindow(FileManager)</onclick>
+			<property name="path">ActivateWindow(FileManager)</property>
+			<property name="list">FileManager</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[13200]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">13200</property>
+			<property name="defaultID">13200</property>
+			<onclick>ActivateWindow(Profiles)</onclick>
+			<property name="path">ActivateWindow(Profiles)</property>
+			<property name="list">Profiles</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[10007]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">10007</property>
+			<property name="defaultID">10007</property>
+			<onclick>ActivateWindow(SystemInfo)</onclick>
+			<property name="path">ActivateWindow(SystemInfo)</property>
+			<property name="list">SystemInfo</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[14111]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">14111</property>
+			<property name="defaultID">14111</property>
+			<visible>system.getbool(eventlog.enabled)</visible>
+			<onclick>ActivateWindow(EventLog,events://,return)</onclick>
+			<property name="path">ActivateWindow(EventLog,events://,return)</property>
+			<property name="list">events://</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[7]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">7</property>
+			<property name="defaultID">7</property>
+			<onclick>ActivateWindow(FileManager)</onclick>
+			<property name="path">ActivateWindow(FileManager)</property>
+			<property name="list">FileManager</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[13200]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">13200</property>
+			<property name="defaultID">13200</property>
+			<onclick>ActivateWindow(Profiles)</onclick>
+			<property name="path">ActivateWindow(Profiles)</property>
+			<property name="list">Profiles</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[10007]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">10007</property>
+			<property name="defaultID">10007</property>
+			<onclick>ActivateWindow(SystemInfo)</onclick>
+			<property name="path">ActivateWindow(SystemInfo)</property>
+			<property name="list">SystemInfo</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[14111]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">14111</property>
+			<property name="defaultID">14111</property>
+			<visible>system.getbool(eventlog.enabled)</visible>
+			<onclick>ActivateWindow(EventLog,events://,return)</onclick>
+			<property name="path">ActivateWindow(EventLog,events://,return)</property>
+			<property name="list">events://</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-alt-settings">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[7]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">7</property>
+			<property name="defaultID">7</property>
+			<onclick>ActivateWindow(FileManager)</onclick>
+			<property name="path">ActivateWindow(FileManager)</property>
+			<property name="list">FileManager</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[13200]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">13200</property>
+			<property name="defaultID">13200</property>
+			<onclick>ActivateWindow(Profiles)</onclick>
+			<property name="path">ActivateWindow(Profiles)</property>
+			<property name="list">Profiles</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[10007]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">10007</property>
+			<property name="defaultID">10007</property>
+			<onclick>ActivateWindow(SystemInfo)</onclick>
+			<property name="path">ActivateWindow(SystemInfo)</property>
+			<property name="list">SystemInfo</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[14111]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">14111</property>
+			<property name="defaultID">14111</property>
+			<visible>[system.getbool(eventlog.enabled)] + StringCompare(Window(10000).Property(submenuVisibility),settings)</visible>
+			<onclick>ActivateWindow(EventLog,events://,return)</onclick>
+			<property name="path">ActivateWindow(EventLog,events://,return)</property>
+			<property name="list">events://</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[7]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">7</property>
+			<property name="defaultID">7</property>
+			<onclick>ActivateWindow(FileManager)</onclick>
+			<property name="path">ActivateWindow(FileManager)</property>
+			<property name="list">FileManager</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[13200]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">13200</property>
+			<property name="defaultID">13200</property>
+			<onclick>ActivateWindow(Profiles)</onclick>
+			<property name="path">ActivateWindow(Profiles)</property>
+			<property name="list">Profiles</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[10007]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">10007</property>
+			<property name="defaultID">10007</property>
+			<onclick>ActivateWindow(SystemInfo)</onclick>
+			<property name="path">ActivateWindow(SystemInfo)</property>
+			<property name="list">SystemInfo</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),settings)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">13</property>
+			<label>$LOCALIZE[14111]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">14111</property>
+			<property name="defaultID">14111</property>
+			<visible>[system.getbool(eventlog.enabled)] + StringCompare(Window(10000).Property(submenuVisibility),settings)</visible>
+			<onclick>ActivateWindow(EventLog,events://,return)</onclick>
+			<property name="path">ActivateWindow(EventLog,events://,return)</property>
+			<property name="list">events://</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">settings</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-num-31004">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-num-31004">
+		<description>No items</description>
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-videosubmenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>Player.HasMedia</visible>
+			<onclick>action(FullScreen)</onclick>
+			<property name="path">action(FullScreen)</property>
+			<property name="list">action(FullScreen)</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
+			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">livetv</property>
+			<property name="defaultID">livetv</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick>ActivateWindow(TVChannels)</onclick>
+			<property name="path">ActivateWindow(TVChannels)</property>
+			<property name="list">TVChannels</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31112]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31112</property>
+			<property name="defaultID">31112</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick>ActivateWindow(TVGuide)</onclick>
+			<property name="path">ActivateWindow(TVGuide)</property>
+			<property name="list">TVGuide</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31165]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31165</property>
+			<property name="defaultID">31165</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick>ActivateWindow(TVRecordings)</onclick>
+			<property name="path">ActivateWindow(TVRecordings)</property>
+			<property name="list">TVRecordings</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[342]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">movies</property>
+			<property name="defaultID">movies</property>
+			<visible>Library.HasContent(Movies)</visible>
+			<onclick>ActivateWindow(Videos,videodb://movies/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://movies/titles/)</property>
+			<property name="list">videodb://movies/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[20343]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">tvshows</property>
+			<property name="defaultID">tvshows</property>
+			<visible>Library.HasContent(TVShows)</visible>
+			<onclick>ActivateWindow(Videos,videodb://tvshows/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://tvshows/titles/)</property>
+			<property name="list">videodb://tvshows/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31088]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31088</property>
+			<property name="defaultID">31088</property>
+			<onclick>ActivateWindow(Videos,addons://sources/video/)</onclick>
+			<property name="path">ActivateWindow(Videos,addons://sources/video/)</property>
+			<property name="list">addons://sources/video/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,sources://video/)</onclick>
+			<property name="path">ActivateWindow(Videos,sources://video/)</property>
+			<property name="list">sources://video/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>Player.HasMedia</visible>
+			<onclick>action(FullScreen)</onclick>
+			<property name="path">action(FullScreen)</property>
+			<property name="list">action(FullScreen)</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
+			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">livetv</property>
+			<property name="defaultID">livetv</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick>ActivateWindow(TVChannels)</onclick>
+			<property name="path">ActivateWindow(TVChannels)</property>
+			<property name="list">TVChannels</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31112]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31112</property>
+			<property name="defaultID">31112</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick>ActivateWindow(TVGuide)</onclick>
+			<property name="path">ActivateWindow(TVGuide)</property>
+			<property name="list">TVGuide</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31165]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31165</property>
+			<property name="defaultID">31165</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick>ActivateWindow(TVRecordings)</onclick>
+			<property name="path">ActivateWindow(TVRecordings)</property>
+			<property name="list">TVRecordings</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[342]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">movies</property>
+			<property name="defaultID">movies</property>
+			<visible>Library.HasContent(Movies)</visible>
+			<onclick>ActivateWindow(Videos,videodb://movies/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://movies/titles/)</property>
+			<property name="list">videodb://movies/titles/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[20343]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">tvshows</property>
+			<property name="defaultID">tvshows</property>
+			<visible>Library.HasContent(TVShows)</visible>
+			<onclick>ActivateWindow(Videos,videodb://tvshows/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://tvshows/titles/)</property>
+			<property name="list">videodb://tvshows/titles/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31088]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31088</property>
+			<property name="defaultID">31088</property>
+			<onclick>ActivateWindow(Videos,addons://sources/video/)</onclick>
+			<property name="path">ActivateWindow(Videos,addons://sources/video/)</property>
+			<property name="list">addons://sources/video/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,sources://video/)</onclick>
+			<property name="path">ActivateWindow(Videos,sources://video/)</property>
+			<property name="list">sources://video/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-alt-videosubmenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>[Player.HasMedia] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>action(FullScreen)</onclick>
+			<property name="path">action(FullScreen)</property>
+			<property name="list">action(FullScreen)</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
+			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">livetv</property>
+			<property name="defaultID">livetv</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVChannels)</onclick>
+			<property name="path">ActivateWindow(TVChannels)</property>
+			<property name="list">TVChannels</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31112]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31112</property>
+			<property name="defaultID">31112</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVGuide)</onclick>
+			<property name="path">ActivateWindow(TVGuide)</property>
+			<property name="list">TVGuide</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31165]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31165</property>
+			<property name="defaultID">31165</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVRecordings)</onclick>
+			<property name="path">ActivateWindow(TVRecordings)</property>
+			<property name="list">TVRecordings</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[342]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">movies</property>
+			<property name="defaultID">movies</property>
+			<visible>[Library.HasContent(Movies)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(Videos,videodb://movies/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://movies/titles/)</property>
+			<property name="list">videodb://movies/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[20343]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">tvshows</property>
+			<property name="defaultID">tvshows</property>
+			<visible>[Library.HasContent(TVShows)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(Videos,videodb://tvshows/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://tvshows/titles/)</property>
+			<property name="list">videodb://tvshows/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31088]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31088</property>
+			<property name="defaultID">31088</property>
+			<onclick>ActivateWindow(Videos,addons://sources/video/)</onclick>
+			<property name="path">ActivateWindow(Videos,addons://sources/video/)</property>
+			<property name="list">addons://sources/video/</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,sources://video/)</onclick>
+			<property name="path">ActivateWindow(Videos,sources://video/)</property>
+			<property name="list">sources://video/</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>[Player.HasMedia] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>action(FullScreen)</onclick>
+			<property name="path">action(FullScreen)</property>
+			<property name="list">action(FullScreen)</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
+			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">livetv</property>
+			<property name="defaultID">livetv</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVChannels)</onclick>
+			<property name="path">ActivateWindow(TVChannels)</property>
+			<property name="list">TVChannels</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31112]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31112</property>
+			<property name="defaultID">31112</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVGuide)</onclick>
+			<property name="path">ActivateWindow(TVGuide)</property>
+			<property name="list">TVGuide</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31165]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31165</property>
+			<property name="defaultID">31165</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(TVRecordings)</onclick>
+			<property name="path">ActivateWindow(TVRecordings)</property>
+			<property name="list">TVRecordings</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[342]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">movies</property>
+			<property name="defaultID">movies</property>
+			<visible>[Library.HasContent(Movies)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(Videos,videodb://movies/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://movies/titles/)</property>
+			<property name="list">videodb://movies/titles/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[20343]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">tvshows</property>
+			<property name="defaultID">tvshows</property>
+			<visible>[Library.HasContent(TVShows)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<onclick>ActivateWindow(Videos,videodb://tvshows/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://tvshows/titles/)</property>
+			<property name="list">videodb://tvshows/titles/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31088]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31088</property>
+			<property name="defaultID">31088</property>
+			<onclick>ActivateWindow(Videos,addons://sources/video/)</onclick>
+			<property name="path">ActivateWindow(Videos,addons://sources/video/)</property>
+			<property name="list">addons://sources/video/</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,sources://video/)</onclick>
+			<property name="path">ActivateWindow(Videos,sources://video/)</property>
+			<property name="list">sources://video/</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-musicsubmenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>Player.HasMedia</visible>
+			<onclick>activateWindow(1103)</onclick>
+			<property name="path">activateWindow(1103)</property>
+			<property name="list">activateWindow(1103)</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31059]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31059</property>
+			<property name="defaultID">31059</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasRadioChannels]</visible>
+			<onclick>ActivateWindow(Radiochannels)</onclick>
+			<property name="path">ActivateWindow(Radiochannels)</property>
+			<property name="list">Radiochannels</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[133]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">133</property>
+			<property name="defaultID">133</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick>ActivateWindow(Music,musicdb://artists/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://artists/)</property>
+			<property name="list">musicdb://artists/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[132]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">132</property>
+			<property name="defaultID">132</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick>ActivateWindow(Music,musicdb://albums/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="list">musicdb://albums/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[135]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">135</property>
+			<property name="defaultID">135</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick>ActivateWindow(Music,musicdb://genres/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://genres/)</property>
+			<property name="list">musicdb://genres/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">136</property>
+			<property name="defaultID">136</property>
+			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="list">special://musicplaylists/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31090]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31090</property>
+			<property name="defaultID">31090</property>
+			<onclick>ActivateWindow(Music,Addons)</onclick>
+			<property name="path">ActivateWindow(Music,Addons)</property>
+			<property name="list">Addons</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files)</onclick>
+			<property name="path">ActivateWindow(Music,Files)</property>
+			<property name="list">Files</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>Player.HasMedia</visible>
+			<onclick>activateWindow(1103)</onclick>
+			<property name="path">activateWindow(1103)</property>
+			<property name="list">activateWindow(1103)</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31059]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31059</property>
+			<property name="defaultID">31059</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasRadioChannels]</visible>
+			<onclick>ActivateWindow(Radiochannels)</onclick>
+			<property name="path">ActivateWindow(Radiochannels)</property>
+			<property name="list">Radiochannels</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[133]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">133</property>
+			<property name="defaultID">133</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick>ActivateWindow(Music,musicdb://artists/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://artists/)</property>
+			<property name="list">musicdb://artists/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[132]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">132</property>
+			<property name="defaultID">132</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick>ActivateWindow(Music,musicdb://albums/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="list">musicdb://albums/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[135]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">135</property>
+			<property name="defaultID">135</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick>ActivateWindow(Music,musicdb://genres/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://genres/)</property>
+			<property name="list">musicdb://genres/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">136</property>
+			<property name="defaultID">136</property>
+			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="list">special://musicplaylists/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31090]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31090</property>
+			<property name="defaultID">31090</property>
+			<onclick>ActivateWindow(Music,Addons)</onclick>
+			<property name="path">ActivateWindow(Music,Addons)</property>
+			<property name="list">Addons</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files)</onclick>
+			<property name="path">ActivateWindow(Music,Files)</property>
+			<property name="list">Files</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-alt-musicsubmenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>[Player.HasMedia] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>activateWindow(1103)</onclick>
+			<property name="path">activateWindow(1103)</property>
+			<property name="list">activateWindow(1103)</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31059]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31059</property>
+			<property name="defaultID">31059</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasRadioChannels]] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Radiochannels)</onclick>
+			<property name="path">ActivateWindow(Radiochannels)</property>
+			<property name="list">Radiochannels</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[133]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">133</property>
+			<property name="defaultID">133</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://artists/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://artists/)</property>
+			<property name="list">musicdb://artists/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[132]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">132</property>
+			<property name="defaultID">132</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://albums/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="list">musicdb://albums/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[135]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">135</property>
+			<property name="defaultID">135</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://genres/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://genres/)</property>
+			<property name="list">musicdb://genres/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">136</property>
+			<property name="defaultID">136</property>
+			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="list">special://musicplaylists/</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31090]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31090</property>
+			<property name="defaultID">31090</property>
+			<onclick>ActivateWindow(Music,Addons)</onclick>
+			<property name="path">ActivateWindow(Music,Addons)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files)</onclick>
+			<property name="path">ActivateWindow(Music,Files)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>[Player.HasMedia] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>activateWindow(1103)</onclick>
+			<property name="path">activateWindow(1103)</property>
+			<property name="list">activateWindow(1103)</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31005]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31005</property>
+			<property name="defaultID">31005</property>
+			<onclick condition="window.isactive(1106)">control.setfocus(9998)</onclick>
+			<property name="path">control.setfocus(9998)</property>
+			<property name="list">control.setfocus(9998)</property>
+			<onclick condition="!window.isactive(1106)">ActivateWindow(1106)</onclick>
+			<onclick condition="!window.isactive(1106)">control.setfocus(9998)</onclick>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31059]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31059</property>
+			<property name="defaultID">31059</property>
+			<visible>[[System.HasPVRAddon] + [PVR.HasRadioChannels]] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Radiochannels)</onclick>
+			<property name="path">ActivateWindow(Radiochannels)</property>
+			<property name="list">Radiochannels</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[133]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">133</property>
+			<property name="defaultID">133</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://artists/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://artists/)</property>
+			<property name="list">musicdb://artists/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[132]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">132</property>
+			<property name="defaultID">132</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://albums/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="list">musicdb://albums/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[135]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">135</property>
+			<property name="defaultID">135</property>
+			<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<onclick>ActivateWindow(Music,musicdb://genres/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://genres/)</property>
+			<property name="list">musicdb://genres/</property>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">136</property>
+			<property name="defaultID">136</property>
+			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="list">special://musicplaylists/</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31090]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31090</property>
+			<property name="defaultID">31090</property>
+			<onclick>ActivateWindow(Music,Addons)</onclick>
+			<property name="path">ActivateWindow(Music,Addons)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files)</onclick>
+			<property name="path">ActivateWindow(Music,Files)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-picturessubmenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">17</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">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">17</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,Test profile)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="skinshortcuts-group-alt-picturessubmenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">17</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),picturessubmenu)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">17</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,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),picturessubmenu)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+</includes>
diff --git a/addon.xml b/addon.xml
index 925ec34..e3d6ec7 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.pellucid" version="1.0.2" name="Pellucid" provider-name="theDeadman">
+<addon id="skin.pellucid" version="1.0.3" name="Pellucid" provider-name="theDeadman">
     <requires>
         <import addon="xbmc.gui" version="5.12.0"/>
         <import addon="script.skinshortcuts" version="1.0.13"/>
diff --git a/changelog.txt b/changelog.txt
index 3066810..8c8a72c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,10 +1,17 @@
 **Changelog**
 
+[V1.0.3]
+- Minor bug fixes and tweaks
+- [CHANGED] TVShow Episode count now reflects watched / unwatched status
+- [CHANGED] TVShow view revised to poster view
+- [NEW] Basic weather info now available on homescreen
+- [CHANGED] Default and skin colour options revised
+- [NEW] Higher quality homescreen backgrounds
+
 [V1.0.2]
 - Bug fixes
 - Extra colour themes added
 
-
 [V1.0.0]
 - Initial release
 - [UPDATED] MyMusicPlaylistEditor.xml
diff --git a/colors/amethyst.xml b/colors/VK.xml
similarity index 90%
rename from colors/amethyst.xml
rename to colors/VK.xml
index 3a4fc29..2dd8574 100644
--- a/colors/amethyst.xml
+++ b/colors/VK.xml
@@ -2,7 +2,7 @@
 <colors>
     <color name="black">ff111111</color>
     <color name="background">ff151515</color>
-    <color name="highlight">ff9b59b6</color>
+    <color name="highlight">ff4c75a3</color>
     <color name="overlay">44ffffff</color>
     <color name="textActive">fff0f0f0</color>
     <color name="textDisabled">ff757575</color>
diff --git a/colors/wetasphalt.xml b/colors/bluewood.xml
similarity index 100%
rename from colors/wetasphalt.xml
rename to colors/bluewood.xml
diff --git a/colors/concrete.xml b/colors/concrete.xml
deleted file mode 100644
index 0980856..0000000
--- a/colors/concrete.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">ff95a5a6</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/defaults.xml b/colors/defaults.xml
index 537a2f7..651c355 100644
--- a/colors/defaults.xml
+++ b/colors/defaults.xml
@@ -2,7 +2,7 @@
 <colors>
     <color name="black">ff111111</color>
     <color name="background">ff151515</color>
-    <color name="highlight">ffd0242e</color>
+    <color name="highlight">ffad1e4e</color>
     <color name="overlay">44ffffff</color>
     <color name="textActive">fff0f0f0</color>
     <color name="textDisabled">ff757575</color>
diff --git a/colors/asbestos.xml b/colors/dribble.xml
similarity index 90%
rename from colors/asbestos.xml
rename to colors/dribble.xml
index d2cd6e8..376233d 100644
--- a/colors/asbestos.xml
+++ b/colors/dribble.xml
@@ -2,7 +2,7 @@
 <colors>
     <color name="black">ff111111</color>
     <color name="background">ff151515</color>
-    <color name="highlight">ff7f8c8d</color>
+    <color name="highlight">ffe4405f</color>
     <color name="overlay">44ffffff</color>
     <color name="textActive">fff0f0f0</color>
     <color name="textDisabled">ff757575</color>
diff --git a/colors/emerald.xml b/colors/emerald.xml
deleted file mode 100644
index 31fb7c4..0000000
--- a/colors/emerald.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">ff2ecc71</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/greensea.xml b/colors/greensea.xml
deleted file mode 100644
index 1739e57..0000000
--- a/colors/greensea.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">ff16a085</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/belizehole.xml b/colors/interest.xml
similarity index 90%
rename from colors/belizehole.xml
rename to colors/interest.xml
index ff22693..6ca6d29 100644
--- a/colors/belizehole.xml
+++ b/colors/interest.xml
@@ -2,7 +2,7 @@
 <colors>
     <color name="black">ff111111</color>
     <color name="background">ff151515</color>
-    <color name="highlight">ff2980b9</color>
+    <color name="highlight">ffbd081c</color>
     <color name="overlay">44ffffff</color>
     <color name="textActive">fff0f0f0</color>
     <color name="textDisabled">ff757575</color>
diff --git a/colors/carrot.xml b/colors/medium.xml
similarity index 90%
rename from colors/carrot.xml
rename to colors/medium.xml
index 7fdd2a6..b01e7e4 100644
--- a/colors/carrot.xml
+++ b/colors/medium.xml
@@ -2,7 +2,7 @@
 <colors>
     <color name="black">ff111111</color>
     <color name="background">ff151515</color>
-    <color name="highlight">ffe67e22</color>
+    <color name="highlight">ff02b875</color>
     <color name="overlay">44ffffff</color>
     <color name="textActive">fff0f0f0</color>
     <color name="textDisabled">ff757575</color>
diff --git a/colors/midnightblue.xml b/colors/midnightblue.xml
deleted file mode 100644
index 79d2cba..0000000
--- a/colors/midnightblue.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">ff2c3e50</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/nephritis.xml b/colors/nephritis.xml
deleted file mode 100644
index 156755e..0000000
--- a/colors/nephritis.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">ff27ae60</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/orange.xml b/colors/orange.xml
deleted file mode 100644
index 6300516..0000000
--- a/colors/orange.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">fff39c12</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/pellucidV1.xml b/colors/pellucidV1.xml
new file mode 100644
index 0000000..37596c9
--- /dev/null
+++ b/colors/pellucidV1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<colors>
+    <color name="black">ff111111</color>
+    <color name="background">ff151515</color>
+    <color name="highlight">ffee3343</color>
+    <color name="overlay">44ffffff</color>
+    <color name="textActive">fff0f0f0</color>
+    <color name="textDisabled">ff757575</color>
+    <color name="menuDisabled">aaf0f0f0</color>
+    <color name="menuUnselected">ff919191</color>
+    <color name="textboxInactive">99FFFFFF</color>
+    <color name="keyboardInactive">aa212121</color>
+    <color name="keyboardAccent">ffBDBDBD</color>
+</colors>
\ No newline at end of file
diff --git a/colors/peterriver.xml b/colors/peterriver.xml
deleted file mode 100644
index a2f53e8..0000000
--- a/colors/peterriver.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">ff3498db</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/pomegranate.xml b/colors/pomegranate.xml
deleted file mode 100644
index 12da786..0000000
--- a/colors/pomegranate.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">ffc0392b</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/pumpkin.xml b/colors/pumpkin.xml
deleted file mode 100644
index 1b67605..0000000
--- a/colors/pumpkin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">ffd35400</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/razzmatazz.xml b/colors/razzmatazz.xml
new file mode 100644
index 0000000..4974939
--- /dev/null
+++ b/colors/razzmatazz.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<colors>
+    <color name="black">ff111111</color>
+    <color name="background">ff151515</color>
+    <color name="highlight">ffdb0a5b</color>
+    <color name="overlay">44ffffff</color>
+    <color name="textActive">fff0f0f0</color>
+    <color name="textDisabled">ff757575</color>
+    <color name="menuDisabled">aaf0f0f0</color>
+    <color name="menuUnselected">ff919191</color>
+    <color name="textboxInactive">99FFFFFF</color>
+    <color name="keyboardInactive">aa212121</color>
+    <color name="keyboardAccent">ffBDBDBD</color>
+</colors>
\ No newline at end of file
diff --git a/colors/sunflower.xml b/colors/sunflower.xml
deleted file mode 100644
index 45f5d99..0000000
--- a/colors/sunflower.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">fff1c40f</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/tumble.xml b/colors/tumble.xml
new file mode 100644
index 0000000..782bd58
--- /dev/null
+++ b/colors/tumble.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<colors>
+    <color name="black">ff111111</color>
+    <color name="background">ff151515</color>
+    <color name="highlight">ff34465d</color>
+    <color name="overlay">44ffffff</color>
+    <color name="textActive">fff0f0f0</color>
+    <color name="textDisabled">ff757575</color>
+    <color name="menuDisabled">aaf0f0f0</color>
+    <color name="menuUnselected">ff919191</color>
+    <color name="textboxInactive">99FFFFFF</color>
+    <color name="keyboardInactive">aa212121</color>
+    <color name="keyboardAccent">ffBDBDBD</color>
+</colors>
\ No newline at end of file
diff --git a/colors/turquoise.xml b/colors/turquoise.xml
deleted file mode 100644
index d51a444..0000000
--- a/colors/turquoise.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">ff1abc9c</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/colors/vine.xml b/colors/vine.xml
new file mode 100644
index 0000000..9b0c3df
--- /dev/null
+++ b/colors/vine.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<colors>
+    <color name="black">ff111111</color>
+    <color name="background">ff151515</color>
+    <color name="highlight">ff00b489</color>
+    <color name="overlay">44ffffff</color>
+    <color name="textActive">fff0f0f0</color>
+    <color name="textDisabled">ff757575</color>
+    <color name="menuDisabled">aaf0f0f0</color>
+    <color name="menuUnselected">ff919191</color>
+    <color name="textboxInactive">99FFFFFF</color>
+    <color name="keyboardInactive">aa212121</color>
+    <color name="keyboardAccent">ffBDBDBD</color>
+</colors>
\ No newline at end of file
diff --git a/colors/wisteria.xml b/colors/wisteria.xml
deleted file mode 100644
index e5f2fc7..0000000
--- a/colors/wisteria.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<colors>
-    <color name="black">ff111111</color>
-    <color name="background">ff151515</color>
-    <color name="highlight">ff8e44ad</color>
-    <color name="overlay">44ffffff</color>
-    <color name="textActive">fff0f0f0</color>
-    <color name="textDisabled">ff757575</color>
-    <color name="menuDisabled">aaf0f0f0</color>
-    <color name="menuUnselected">ff919191</color>
-    <color name="textboxInactive">99FFFFFF</color>
-    <color name="keyboardInactive">aa212121</color>
-    <color name="keyboardAccent">ffBDBDBD</color>
-</colors>
\ No newline at end of file
diff --git a/extras/homeBackgrounds/11247222935_ad788008e7_k.jpg b/extras/homeBackgrounds/11247222935_ad788008e7_k.jpg
deleted file mode 100644
index 987ac95..0000000
Binary files a/extras/homeBackgrounds/11247222935_ad788008e7_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/13912515950_61c28153c4_k.jpg b/extras/homeBackgrounds/13912515950_61c28153c4_k.jpg
deleted file mode 100644
index 93b3cd1..0000000
Binary files a/extras/homeBackgrounds/13912515950_61c28153c4_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/14014156022_280ca58f7e_k.jpg b/extras/homeBackgrounds/14014156022_280ca58f7e_k.jpg
deleted file mode 100644
index 988e7c9..0000000
Binary files a/extras/homeBackgrounds/14014156022_280ca58f7e_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/14238865290_07a48c26af_k.jpg b/extras/homeBackgrounds/14238865290_07a48c26af_k.jpg
deleted file mode 100644
index 99c40e4..0000000
Binary files a/extras/homeBackgrounds/14238865290_07a48c26af_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/14509793784_e9692a4053_k.jpg b/extras/homeBackgrounds/14509793784_e9692a4053_k.jpg
deleted file mode 100644
index c8ab2e5..0000000
Binary files a/extras/homeBackgrounds/14509793784_e9692a4053_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/15059655911_9433bbb478_k.jpg b/extras/homeBackgrounds/15059655911_9433bbb478_k.jpg
deleted file mode 100644
index 52a57f6..0000000
Binary files a/extras/homeBackgrounds/15059655911_9433bbb478_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/15179004889_8c71caf934_k.jpg b/extras/homeBackgrounds/15179004889_8c71caf934_k.jpg
deleted file mode 100644
index a85c8dc..0000000
Binary files a/extras/homeBackgrounds/15179004889_8c71caf934_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/16424904059_932e4271d6_k.jpg b/extras/homeBackgrounds/16424904059_932e4271d6_k.jpg
deleted file mode 100644
index 268eb86..0000000
Binary files a/extras/homeBackgrounds/16424904059_932e4271d6_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/17230548786_efbfc15e65_k.jpg b/extras/homeBackgrounds/17230548786_efbfc15e65_k.jpg
deleted file mode 100644
index 83ebcaa..0000000
Binary files a/extras/homeBackgrounds/17230548786_efbfc15e65_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/1k5qq4yqm0g-mark-basarab.jpg b/extras/homeBackgrounds/1k5qq4yqm0g-mark-basarab.jpg
new file mode 100644
index 0000000..a819a37
Binary files /dev/null and b/extras/homeBackgrounds/1k5qq4yqm0g-mark-basarab.jpg differ
diff --git a/extras/homeBackgrounds/6tq-l2c-cc-nick-jio.jpg b/extras/homeBackgrounds/6tq-l2c-cc-nick-jio.jpg
new file mode 100644
index 0000000..e713ec8
Binary files /dev/null and b/extras/homeBackgrounds/6tq-l2c-cc-nick-jio.jpg differ
diff --git a/extras/homeBackgrounds/9975687173_9eea668f89_k.jpg b/extras/homeBackgrounds/9975687173_9eea668f89_k.jpg
deleted file mode 100644
index 1cbfa5e..0000000
Binary files a/extras/homeBackgrounds/9975687173_9eea668f89_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/c9t94jc4_l8-nathan-anderson.jpg b/extras/homeBackgrounds/c9t94jc4_l8-nathan-anderson.jpg
new file mode 100644
index 0000000..75b75f6
Binary files /dev/null and b/extras/homeBackgrounds/c9t94jc4_l8-nathan-anderson.jpg differ
diff --git a/extras/homeBackgrounds/cb1myaiclhy-jason-chen.jpg b/extras/homeBackgrounds/cb1myaiclhy-jason-chen.jpg
new file mode 100644
index 0000000..37a9b80
Binary files /dev/null and b/extras/homeBackgrounds/cb1myaiclhy-jason-chen.jpg differ
diff --git a/extras/homeBackgrounds/eopewngf68w-tim-swaan.jpg b/extras/homeBackgrounds/eopewngf68w-tim-swaan.jpg
new file mode 100644
index 0000000..0029053
Binary files /dev/null and b/extras/homeBackgrounds/eopewngf68w-tim-swaan.jpg differ
diff --git a/extras/homeBackgrounds/o_uv3khquo8-elle-zhu.jpg b/extras/homeBackgrounds/o_uv3khquo8-elle-zhu.jpg
new file mode 100644
index 0000000..8bcb003
Binary files /dev/null and b/extras/homeBackgrounds/o_uv3khquo8-elle-zhu.jpg differ
diff --git a/extras/homeBackgrounds/p3ozjut_dks-kace-rodriguez.jpg b/extras/homeBackgrounds/p3ozjut_dks-kace-rodriguez.jpg
new file mode 100644
index 0000000..48fce8c
Binary files /dev/null and b/extras/homeBackgrounds/p3ozjut_dks-kace-rodriguez.jpg differ
diff --git a/extras/homeBackgrounds/uoi3lg8fgl4-sam-ferrara.jpg b/extras/homeBackgrounds/uoi3lg8fgl4-sam-ferrara.jpg
new file mode 100644
index 0000000..eb02e84
Binary files /dev/null and b/extras/homeBackgrounds/uoi3lg8fgl4-sam-ferrara.jpg differ
diff --git a/extras/homeBackgrounds/vphcfunwdrq-emma-hall.jpg b/extras/homeBackgrounds/vphcfunwdrq-emma-hall.jpg
new file mode 100644
index 0000000..6d9ccde
Binary files /dev/null and b/extras/homeBackgrounds/vphcfunwdrq-emma-hall.jpg differ
diff --git a/language/English/strings.po b/language/English/strings.po
index 74948a4..181812c 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -46,7 +46,7 @@ msgid "Power"
 msgstr ""
 
 msgctxt "#31005"
-msgid "Latest Content"
+msgid "Spotlight"
 msgstr ""
 
 msgctxt "#31006"
@@ -434,7 +434,7 @@ msgid "Delete Group"
 msgstr ""
 
 msgctxt "#31102"
-msgid "Disable fanart animation effect"
+msgid "Low CPU power mode"
 msgstr ""
 
 msgctxt "#31103"
@@ -806,7 +806,7 @@ msgid "From"
 msgstr ""
 
 msgctxt "#31213"
-msgid "Unwatched items only"
+msgid "Unwatched Only"
 msgstr ""
 
 msgctxt "#31214"
diff --git a/resources/fanart.jpg b/resources/fanart.jpg
index 59474a3..57f7e48 100644
Binary files a/resources/fanart.jpg and b/resources/fanart.jpg differ
diff --git a/resources/icon.png b/resources/icon.png
index 34b279f..a04432e 100644
Binary files a/resources/icon.png and b/resources/icon.png differ
diff --git a/resources/screenshot-01.jpg b/resources/screenshot-01.jpg
index f673e55..57f7e48 100644
Binary files a/resources/screenshot-01.jpg and b/resources/screenshot-01.jpg differ
diff --git a/resources/screenshot-02.jpg b/resources/screenshot-02.jpg
index 87831f5..bbff406 100644
Binary files a/resources/screenshot-02.jpg and b/resources/screenshot-02.jpg differ
diff --git a/resources/screenshot-03.jpg b/resources/screenshot-03.jpg
index b97ec67..8399a91 100644
Binary files a/resources/screenshot-03.jpg and b/resources/screenshot-03.jpg differ
diff --git a/resources/screenshot-04.jpg b/resources/screenshot-04.jpg
index 151604e..2f9687c 100644
Binary files a/resources/screenshot-04.jpg and b/resources/screenshot-04.jpg differ
diff --git a/shortcuts/mainmenu.DATA.xml b/shortcuts/mainmenu.DATA.xml
index 3f95d4b..cdca626 100644
--- a/shortcuts/mainmenu.DATA.xml
+++ b/shortcuts/mainmenu.DATA.xml
@@ -54,7 +54,6 @@
         <label2>32034</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
-        <action>Skin.SetString(recentitems,video)</action>
         <action>ActivateWindow(1106)</action>
     </shortcut>
     <shortcut>
@@ -71,7 +70,6 @@
         <label2>32034</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
-        <action>Skin.SetString(recentitems,music)</action>
         <action>ActivateWindow(1106)</action>
     </shortcut>
     <shortcut>
diff --git a/shortcuts/musicsubmenu.DATA.xml b/shortcuts/musicsubmenu.DATA.xml
index 0b2579c..e08662f 100644
--- a/shortcuts/musicsubmenu.DATA.xml
+++ b/shortcuts/musicsubmenu.DATA.xml
@@ -13,9 +13,7 @@
         <label2>10005</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
-        <action>Skin.SetString(recentitems,music)</action>
         <action>ActivateWindow(1106)</action>
-        <action>control.setfocus(9998)</action>
     </shortcut>
     <shortcut>
         <visible>PVR.HasRadioChannels</visible>
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index 48b7c64..b962f6a 100644
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -1,4 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <overrides>
     <doNotShareMenu />
+    <forcesettings>True</forcesettings>
+
+    <override action="ActivateWindow(1106)" group="mainmenu">
+        <condition>String.Contains(Container(9001).ListItem.Property(defaultID),videos)</condition>
+        <action>Skin.SetString(recentitems,video)</action>
+        <action>::ACTION::</action>
+    </override>
+
+    <override action="ActivateWindow(1106)" group="mainmenu">
+        <condition>String.Contains(Container(9001).ListItem.Property(defaultID),music)</condition>
+        <action>Skin.SetString(recentitems,music)</action>
+        <action>::ACTION::</action>
+    </override>
+
+    <override action="ActivateWindow(1106)" group="videosubmenu">
+        <condition>window.isactive(1106)</condition>
+        <action>control.setfocus(9998)</action>
+    </override>
+
+    <override action="ActivateWindow(1106)" group="videosubmenu">
+        <condition>!window.isactive(1106)</condition>
+        <action>::ACTION::</action>
+        <action>control.setfocus(9998)</action>
+    </override>
+
+    <override action="ActivateWindow(1106)" group="musicsubmenu">
+        <condition>window.isactive(1106)</condition>
+        <action>control.setfocus(9998)</action>
+    </override>
+
+    <override action="ActivateWindow(1106)" group="musicsubmenu">
+        <condition>!window.isactive(1106)</condition>
+        <action>::ACTION::</action>
+        <action>control.setfocus(9998)</action>
+    </override>
 </overrides>
diff --git a/shortcuts/videosubmenu.DATA.xml b/shortcuts/videosubmenu.DATA.xml
index 809ba55..1458448 100644
--- a/shortcuts/videosubmenu.DATA.xml
+++ b/shortcuts/videosubmenu.DATA.xml
@@ -13,9 +13,7 @@
         <label2>32014</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
-        <action>Skin.SetString(recentitems,video)</action>
         <action>ActivateWindow(1106)</action>
-        <action>control.setfocus(9998)</action>
     </shortcut>
     <shortcut>
         <visible>PVR.HasTVChannels</visible>