diff --git a/1080i/DialogFullScreenInfo.xml b/1080i/DialogFullScreenInfo.xml
index ef17aaf..0800894 100644
--- a/1080i/DialogFullScreenInfo.xml
+++ b/1080i/DialogFullScreenInfo.xml
@@ -10,7 +10,6 @@
                 <effect type="fade" start="100" end="0" time="200" tween="sine" easing="in"/>
             </animation>
             <include>dateTime</include>
-
             <!--thumbnail-->
             <control type="group">
                 <posx>col-1-begin</posx>
@@ -24,15 +23,42 @@
                     <effect type="slide" end="0,-300" tween="cubic" easing="out" time="400"/>
                 </animation>
                 <control type="image">
-                    <posx>0</posx>
+					<visible>videoplayer.content(episodes)</visible>
+					<posx>0</posx>
                     <posy>0</posy>
-                    <width>2-col-textbox</width>
-                    <height>4-col-textbox</height>
-                    <aspectratio scalediffuse="false" aligny="top">keep</aspectratio>
-                    <texture border="0">$INFO[player.art(thumb)]</texture>
-                </control>
+                    <width>3-col-gutter</width>
+                    <height>288</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture border="6">$INFO[Player.Art(tvshow.poster)]</texture>
+                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+                    <bordersize>6</bordersize>
+                    <colordiffuse>ffffffff</colordiffuse>
+				</control>
+				<control type="image">
+					<visible>videoplayer.content(movies)</visible>
+					<posx>0</posx>
+                    <posy>0</posy>
+                    <width>3-col-gutter</width>
+                    <height>288</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture border="6">$INFO[Player.Art(poster)]</texture>
+                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+                    <bordersize>6</bordersize>
+                    <colordiffuse>ffffffff</colordiffuse>
+				</control>
+				<control type="image">
+					<visible>videoplayer.content(livetv)</visible>
+					<posx>0</posx>
+                    <posy>0</posy>
+                    <width>3-col-gutter</width>
+                    <height>3-col-gutter</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture border="6">$INFO[Player.Art(thumb)]</texture>
+                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+                    <bordersize>6</bordersize>
+                    <colordiffuse>ffffffff</colordiffuse>
+				</control>
             </control>
-
             <control type="group">
                 <posx>0</posx>
                 <posy>row-22-begin</posy>
@@ -70,7 +96,7 @@
                     <font>pageSubTitle</font>
                     <aligny>center</aligny>
                     <textcolor>textActive</textcolor>
-                    <label>[B]$INFO[videoplayer.Title][/B]</label>
+                    <label>[B]$INFO[videoplayer.TVShowTitle,,: ]$INFO[videoplayer.Title][/B]</label>
                 </control>
                 <control type="label">
                     <visible>VideoPlayer.HasMenu</visible>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index 1f61d3b..74ca820 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -23,7 +23,7 @@
     </variable>
     <variable name="listSubTitle">
         <value condition="Window.isactive(Videos)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
-        <value condition="Window.isactive(1106)">$INFO[Window(Home).Property(Movies.Count),, $LOCALIZE[20342] / ]$INFO[Window(Home).Property(TVShows.Count),, $LOCALIZE[20343] / ]$INFO[Window(Home).Property(Music.AlbumsCount),, $LOCALIZE[132]]</value>
+        <value condition="Window.isactive(1106)">$INFO[Window(Home).Property(Movies.Count),, $LOCALIZE[20342] • ]$INFO[Window(Home).Property(TVShows.Count),, $LOCALIZE[20343] • ]$INFO[Window(Home).Property(Music.AlbumsCount),, $LOCALIZE[132]]</value>
         <value condition="Window.isactive(Music)">$INFO[container.Numitems,, $LOCALIZE[31014]]</value>
     </variable>
     <!--list view item detail / subheader-->
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 98abef5..8daf718 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -4,6 +4,12 @@
     <onload>Control.SetFocus(8001,3)</onload>
     <include>fadeInOut</include>
     <controls>
+		<control type="image">
+            <include>dimensionsFullscreen</include>
+            <texture>colors/black.png</texture>
+            <aspectratio>stretch</aspectratio>
+            <colordiffuse>textboxInactive</colordiffuse>
+        </control>
         <control type="group">
             <!--fade out if audio / video menu active-->
             <animation type="Conditional" condition="Window.IsActive(seekbar) | Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels)">
@@ -12,15 +18,6 @@
             <posx>col-10-begin</posx>
             <posy>row-8-begin</posy>
             <include>modalDialogInOutVertical</include>
-            <control type="image">
-                <posx>-36</posx>
-                <posy>-36</posy>
-                <width>7-col</width>
-                <height>16-row</height>
-                <texture>colors/black.png</texture>
-                <aspectratio>stretch</aspectratio>
-                <colordiffuse>textboxInactive</colordiffuse>
-            </control>
             <!--player controls-->
             <control type="panel" id="8001">
                 <posx>0</posx>
@@ -127,7 +124,7 @@
             <control type="panel" id="8002">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>6-col</width>
+                <width>429</width>
                 <height>12-row</height>
                 <itemgap>0</itemgap>
                 <onup>8001</onup>
diff --git a/1080i/custom_recentContent.xml b/1080i/custom_recentContent.xml
index 56588d9..287363f 100644
--- a/1080i/custom_recentContent.xml
+++ b/1080i/custom_recentContent.xml
@@ -89,7 +89,7 @@
                         <label>[B]$INFO[container(9998).listitem.title][/B][CR]$INFO[container(9998).listitem.director,$LOCALIZE[31196]. ,.] $INFO[container(9998).listitem.year,,]</label>
                     </control>
                     <control type="label">
-                        <visible>Container(9123).HasFocus(2)</visible>
+                        <visible>Container(9123).HasFocus(7)</visible>
                         <posx>24-col</posx>
                         <posy>0</posy>
                         <width>24-col</width>
@@ -99,10 +99,10 @@
                         <textcolor>66ffffff</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <wrapmultiline>true</wrapmultiline>
-                        <label>[B]$INFO[container(9998).listitem.tvshowtitle][/B][CR]$INFO[container(9998).ListItem.Season,$LOCALIZE[31011], ]$INFO[container(9998).ListItem.Episode,$LOCALIZE[31204], ]</label>
+                        <label>[B]$INFO[container(9998).listitem.tvshowtitle][/B][CR]$INFO[container(9998).ListItem.Season,$LOCALIZE[31011] , ]$INFO[container(9998).ListItem.Episode,$LOCALIZE[31204] ,]</label>
                     </control>
                     <control type="label">
-                        <visible>Container(9123).HasFocus(7)</visible>
+                        <visible>Container(9123).HasFocus(2)</visible>
                         <posx>24-col</posx>
                         <posy>0</posy>
                         <width>24-col</width>
@@ -129,9 +129,9 @@
                     </control>
                 </control>
             </control>
-            <!--content listing-->
+            <!--content listing: movies and tvshows-->
             <control type="panel" id="9998">
-                <visible>container(9123).hasfocus(1) | container(9123).hasfocus(2) | container(9123).hasfocus(6) | container(9123).hasfocus(7)</visible>
+                <visible>container(9123).hasfocus(1) | container(9123).hasfocus(2) | container(9123).hasfocus(6)</visible>
                 <posx>72</posx>
                 <posy>row-20-begin</posy>
                 <width>1848</width>
@@ -295,6 +295,116 @@
                     </control>
                 </focusedlayout>
             </control>
+			<!--content listing: episodes-->
+            <control type="panel" id="9998">
+                <visible>container(9123).hasfocus(7)</visible>
+                <posx>72</posx>
+                <posy>row-20-begin</posy>
+                <width>1848</width>
+                <height>9-row</height>
+                <onup>9123</onup>
+                <onleft>9000</onleft>
+                <onback>9000</onback>
+                <orientation>horizontal</orientation>
+                <onback>control.setfocus(9000)</onback>
+                <content>$INFO[control.getlabel(9123)]</content>
+                <itemlayout width="420" height="312">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>384</width>
+                        <height>288</height>
+                        <aspectratio>stretch</aspectratio>
+                        <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>12</posx>
+                        <posy>2-row</posy>
+                        <width>360</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>regularStrong</font>
+                        <textcolor>textDisabled</textcolor>
+                        <label>$INFO[ListItem.tvshowtitle]</label>
+                    </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>3-row</posy>
+                        <width>360</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
+                        <textcolor>textDisabled</textcolor>
+                        <label>$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,]</label>
+                    </control>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>384</width>
+                        <height>288</height>
+                        <aspectratio>scale</aspectratio>
+                        <texture border="6">$INFO[ListItem.Art(thumb)]</texture>
+                        <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+                        <bordersize>6</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="420" height="312">
+                    <control type="group">
+                        <include>focusThumb</include>
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>384</width>
+                            <height>288</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="6">DefaultPoster.png</texture>
+                            <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
+                            <bordersize>6</bordersize>
+                            <colordiffuse>ffffffff</colordiffuse>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>2-row</posy>
+                            <width>360</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>regularStrong</font>
+                            <textcolor>textDisabled</textcolor>
+                            <label>$INFO[ListItem.tvshowtitle]</label>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>3-row</posy>
+                            <width>360</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
+                            <textcolor>textDisabled</textcolor>
+                            <label>$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,]</label>
+                        </control>
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>384</width>
+                            <height>288</height>
+                            <aspectratio>scale</aspectratio>
+                            <texture border="6">$INFO[ListItem.Art(thumb)]</texture>
+                            <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
+                            <bordersize>6</bordersize>
+                            <colordiffuse>ffffffff</colordiffuse>
+                        </control>
+                    </control>
+                </focusedlayout>
+            </control>
+			<!--content listing: Music-->
             <control type="panel" id="9998">
                 <visible>container(9123).hasfocus(3) | container(9123).hasfocus(4) | container(9123).hasfocus(5)</visible>
                 <posx>72</posx>
diff --git a/1080i/script-skinshortcuts-includes.xml b/1080i/script-skinshortcuts-includes.xml
index b1db9f5..427dae6 100644
--- a/1080i/script-skinshortcuts-includes.xml
+++ b/1080i/script-skinshortcuts-includes.xml
@@ -4,7 +4,7 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<label>$ADDON[script.skinshortcuts 32032]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">dvd</property>
@@ -21,7 +21,7 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<label>$ADDON[script.skinshortcuts 32033]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">32033</property>
@@ -38,7 +38,7 @@
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
 			<label>$LOCALIZE[31147]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">script.globalsearch</property>
@@ -47,7 +47,6 @@
 			<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>
@@ -56,12 +55,12 @@
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
 			<label>$LOCALIZE[31006]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31006</property>
 			<property name="defaultID">31006</property>
-			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<visible>[PVR.HasTVChannels] + [PVR.HasTVChannels]</visible>
 			<onclick>ActivateWindow(TVChannels)</onclick>
 			<property name="path">ActivateWindow(TVChannels)</property>
 			<property name="list">TVChannels</property>
@@ -73,12 +72,12 @@
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
 			<label>$ADDON[script.skinshortcuts 32087]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">radio</property>
 			<property name="defaultID">radio</property>
-			<visible>[System.HasPVRAddon] + [PVR.HasRadioChannels]</visible>
+			<visible>[PVR.HasRadioChannels] + [PVR.HasRadioChannels]</visible>
 			<onclick>ActivateWindow(Radiochannels)</onclick>
 			<property name="path">ActivateWindow(Radiochannels)</property>
 			<property name="list">Radiochannels</property>
@@ -90,7 +89,7 @@
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
 			<label>$LOCALIZE[10006]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">videos</property>
@@ -100,16 +99,15 @@
 			<onclick>Skin.SetString(recentitems,video)</onclick>
 			<property name="path">Skin.SetString(recentitems,video)</property>
 			<property name="list">Skin.SetString(recentitems,video)</property>
-			<onclick>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>
+			<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>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">videos--0</property>
@@ -121,12 +119,12 @@
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="submenuVisibility">videos-0</property>
 			<property name="group">mainmenu</property>
-			<property name="hasSubmenu">False</property>
+			<property name="hasSubmenu">True</property>
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
 			<label>$LOCALIZE[10005]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">music</property>
@@ -136,7 +134,6 @@
 			<onclick>Skin.SetString(recentitems,music)</onclick>
 			<property name="path">Skin.SetString(recentitems,music)</property>
 			<property name="list">Skin.SetString(recentitems,music)</property>
-			<onclick>ActivateWindow(1106)</onclick>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="submenuVisibility">music</property>
 			<property name="group">mainmenu</property>
@@ -145,7 +142,7 @@
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
 			<label>$LOCALIZE[10005]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">music--0</property>
@@ -157,12 +154,12 @@
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="submenuVisibility">music-0</property>
 			<property name="group">mainmenu</property>
-			<property name="hasSubmenu">False</property>
+			<property name="hasSubmenu">True</property>
 		</item>
 		<item id="10">
 			<property name="id">$NUMBER[10]</property>
 			<label>$LOCALIZE[12600]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">weather</property>
@@ -179,7 +176,7 @@
 		<item id="11">
 			<property name="id">$NUMBER[11]</property>
 			<label>$LOCALIZE[10002]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">pictures</property>
@@ -195,7 +192,7 @@
 		<item id="12">
 			<property name="id">$NUMBER[12]</property>
 			<label>$LOCALIZE[10004]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">settings</property>
@@ -211,7 +208,7 @@
 		<item id="13">
 			<property name="id">$NUMBER[13]</property>
 			<label>$LOCALIZE[31004]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31004</property>
@@ -223,230 +220,10 @@
 			<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>$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] + [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="2">
-			<property name="id">$NUMBER[2]</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="3">
-			<property name="id">$NUMBER[3]</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="4">
-			<property name="id">$NUMBER[4]</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="5">
-			<property name="id">$NUMBER[5]</property>
-			<label>$ADDON[script.skinshortcuts 32087]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
-			<icon>DefaultAddon.png</icon>
-			<thumb />
-			<property name="labelID">radio</property>
-			<property name="defaultID">radio</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">radio</property>
-			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">True</property>
-		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</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>Skin.SetString(recentitems,video)</onclick>
-			<property name="path">Skin.SetString(recentitems,video)</property>
-			<property name="list">Skin.SetString(recentitems,video)</property>
-			<onclick>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="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--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="8">
-			<property name="id">$NUMBER[8]</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>Skin.SetString(recentitems,music)</onclick>
-			<property name="path">Skin.SetString(recentitems,music)</property>
-			<property name="list">Skin.SetString(recentitems,music)</property>
-			<onclick>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="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--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="10">
-			<property name="id">$NUMBER[10]</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="11">
-			<property name="id">$NUMBER[11]</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="12">
-			<property name="id">$NUMBER[12]</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="13">
-			<property name="id">$NUMBER[13]</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">
@@ -473,7 +250,7 @@
 			<thumb />
 			<property name="labelID">19019</property>
 			<property name="defaultID">19019</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
+			<visible>[PVR.HasRadioChannels] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
 			<onclick>ActivateWindow(RadioChannels)</onclick>
 			<property name="path">ActivateWindow(RadioChannels)</property>
 			<property name="list">RadioChannels</property>
@@ -489,7 +266,7 @@
 			<thumb />
 			<property name="labelID">22020</property>
 			<property name="defaultID">22020</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
+			<visible>[PVR.HasRadioChannels] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
 			<onclick>ActivateWindow(RadioGuide)</onclick>
 			<property name="path">ActivateWindow(RadioGuide)</property>
 			<property name="list">RadioGuide</property>
@@ -505,7 +282,7 @@
 			<thumb />
 			<property name="labelID">19163</property>
 			<property name="defaultID">19163</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
+			<visible>[PVR.HasRadioChannels] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
 			<onclick>ActivateWindow(RadioRecordings)</onclick>
 			<property name="path">ActivateWindow(RadioRecordings)</property>
 			<property name="list">RadioRecordings</property>
@@ -521,7 +298,7 @@
 			<thumb />
 			<property name="labelID">19040</property>
 			<property name="defaultID">19040</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
+			<visible>[PVR.HasRadioChannels] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
 			<onclick>ActivateWindow(RadioTimers)</onclick>
 			<property name="path">ActivateWindow(RadioTimers)</property>
 			<property name="list">RadioTimers</property>
@@ -537,7 +314,7 @@
 			<thumb />
 			<property name="labelID">137</property>
 			<property name="defaultID">137</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
+			<visible>[PVR.HasRadioChannels] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
 			<onclick>ActivateWindow(RadioSearch)</onclick>
 			<property name="path">ActivateWindow(RadioSearch)</property>
 			<property name="list">RadioSearch</property>
@@ -553,12 +330,12 @@
 			<thumb />
 			<property name="labelID">musicvideos</property>
 			<property name="defaultID">musicvideos</property>
-			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
+			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos-0)</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="group">videos--0</property>
 			<property name="isSubmenu">True</property>
 		</item>
 		<item id="2">
@@ -572,8 +349,8 @@
 			<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>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos-0)</visible>
+			<property name="group">videos--0</property>
 			<property name="isSubmenu">True</property>
 		</item>
 		<item id="3">
@@ -587,8 +364,8 @@
 			<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>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos-0)</visible>
+			<property name="group">videos--0</property>
 			<property name="isSubmenu">True</property>
 		</item>
 		<item id="1">
@@ -636,6 +413,51 @@
 			<property name="group">music</property>
 			<property name="isSubmenu">True</property>
 		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files,Return)</onclick>
+			<property name="path">ActivateWindow(Music,Files,Return)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),music-0)</visible>
+			<property name="group">music--0</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<label>$LOCALIZE[15100]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">15100</property>
+			<property name="defaultID">15100</property>
+			<onclick>ActivateWindow(Music,MusicLibrary,return)</onclick>
+			<property name="path">ActivateWindow(Music,MusicLibrary,return)</property>
+			<property name="list">MusicLibrary</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),music-0)</visible>
+			<property name="group">music--0</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<label>$LOCALIZE[1038]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1038</property>
+			<property name="defaultID">1038</property>
+			<onclick>ActivateWindow(Music,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Music,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),music-0)</visible>
+			<property name="group">music--0</property>
+			<property name="isSubmenu">True</property>
+		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<label>$LOCALIZE[1039]</label>
@@ -736,7 +558,7 @@
 			<thumb />
 			<property name="labelID">livetv</property>
 			<property name="defaultID">livetv</property>
-			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<visible>[[PVR.HasTVChannels] + [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>
@@ -752,7 +574,7 @@
 			<thumb />
 			<property name="labelID">31112</property>
 			<property name="defaultID">31112</property>
-			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<visible>[[PVR.HasTVChannels] + [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>
@@ -768,7 +590,7 @@
 			<thumb />
 			<property name="labelID">31165</property>
 			<property name="defaultID">31165</property>
-			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<visible>[[PVR.HasTVChannels] + [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>
@@ -878,7 +700,7 @@
 			<thumb />
 			<property name="labelID">radio</property>
 			<property name="defaultID">radio</property>
-			<visible>[[System.HasPVRAddon] + [PVR.HasRadioChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<visible>[[PVR.HasRadioChannels] + [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>
@@ -995,551 +817,6 @@
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</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>
-			<label>$LOCALIZE[19019]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">19019</property>
-			<property name="defaultID">19019</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</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">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
-			<label>$LOCALIZE[22020]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">22020</property>
-			<property name="defaultID">22020</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
-			<onclick>ActivateWindow(RadioGuide)</onclick>
-			<property name="path">ActivateWindow(RadioGuide)</property>
-			<property name="list">RadioGuide</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
-			<label>$LOCALIZE[19163]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">19163</property>
-			<property name="defaultID">19163</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
-			<onclick>ActivateWindow(RadioRecordings)</onclick>
-			<property name="path">ActivateWindow(RadioRecordings)</property>
-			<property name="list">RadioRecordings</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
-			<label>$LOCALIZE[19040]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">19040</property>
-			<property name="defaultID">19040</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
-			<onclick>ActivateWindow(RadioTimers)</onclick>
-			<property name="path">ActivateWindow(RadioTimers)</property>
-			<property name="list">RadioTimers</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
-			<label>$LOCALIZE[137]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">137</property>
-			<property name="defaultID">137</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),radio)</visible>
-			<onclick>ActivateWindow(RadioSearch)</onclick>
-			<property name="path">ActivateWindow(RadioSearch)</property>
-			<property name="list">RadioSearch</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</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>
-			<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>
-			<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>
-			<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>
-			<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>
-			<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>
-			<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>
-			<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>
-			<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>
-			<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>
-			<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>
-			<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>Skin.SetString(recentitems,video)</onclick>
-			<property name="path">Skin.SetString(recentitems,video)</property>
-			<property name="list">Skin.SetString(recentitems,video)</property>
-			<onclick>ActivateWindow(1106)</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="2">
-			<property name="id">$NUMBER[2]</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="3">
-			<property name="id">$NUMBER[3]</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="4">
-			<property name="id">$NUMBER[4]</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="5">
-			<property name="id">$NUMBER[5]</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)] + [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="6">
-			<property name="id">$NUMBER[6]</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)] + [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="7">
-			<property name="id">$NUMBER[7]</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="8">
-			<property name="id">$NUMBER[8]</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>
-			<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.HasAudio] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
-			<onclick>Skin.SetString(recentitems,music)</onclick>
-			<property name="path">Skin.SetString(recentitems,music)</property>
-			<property name="list">Skin.SetString(recentitems,music)</property>
-			<onclick>activateWindow(1103)</onclick>
-			<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>
-			<label>$LOCALIZE[31005]</label>
-			<label2>$LOCALIZE[10005]</label2>
-			<icon>DefaultAddon.png</icon>
-			<thumb />
-			<property name="labelID">31005</property>
-			<property name="defaultID">31005</property>
-			<onclick>ActivateWindow(1106)</onclick>
-			<property name="path">ActivateWindow(1106)</property>
-			<property name="list">1106</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="3">
-			<property name="id">$NUMBER[3]</property>
-			<label>$ADDON[script.skinshortcuts 32087]</label>
-			<label2>$LOCALIZE[10005]</label2>
-			<icon>DefaultAddon.png</icon>
-			<thumb />
-			<property name="labelID">radio</property>
-			<property name="defaultID">radio</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>
-			<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)] + [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>
-			<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)] + [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>
-			<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)] + [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>
-			<label>$LOCALIZE[136]</label>
-			<label2>$LOCALIZE[10005]</label2>
-			<icon>DefaultAddon.png</icon>
-			<thumb />
-			<property name="labelID">136</property>
-			<property name="defaultID">136</property>
-			<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
-			<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>
-			<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>
-			<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>
-			<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-dvd">
 		<item id="1">
@@ -1557,21 +834,6 @@
 			<property name="group">dvd</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</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">
@@ -1589,45 +851,24 @@
 			<property name="group">dvd</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</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-radio">
 		<item id="1">
@@ -1638,7 +879,7 @@
 			<thumb />
 			<property name="labelID">19019</property>
 			<property name="defaultID">19019</property>
-			<visible>System.HasPVRAddon</visible>
+			<visible>PVR.HasRadioChannels</visible>
 			<onclick>ActivateWindow(RadioChannels)</onclick>
 			<property name="path">ActivateWindow(RadioChannels)</property>
 			<property name="list">RadioChannels</property>
@@ -1654,7 +895,7 @@
 			<thumb />
 			<property name="labelID">22020</property>
 			<property name="defaultID">22020</property>
-			<visible>System.HasPVRAddon</visible>
+			<visible>PVR.HasRadioChannels</visible>
 			<onclick>ActivateWindow(RadioGuide)</onclick>
 			<property name="path">ActivateWindow(RadioGuide)</property>
 			<property name="list">RadioGuide</property>
@@ -1670,7 +911,7 @@
 			<thumb />
 			<property name="labelID">19163</property>
 			<property name="defaultID">19163</property>
-			<visible>System.HasPVRAddon</visible>
+			<visible>PVR.HasRadioChannels</visible>
 			<onclick>ActivateWindow(RadioRecordings)</onclick>
 			<property name="path">ActivateWindow(RadioRecordings)</property>
 			<property name="list">RadioRecordings</property>
@@ -1686,7 +927,7 @@
 			<thumb />
 			<property name="labelID">19040</property>
 			<property name="defaultID">19040</property>
-			<visible>System.HasPVRAddon</visible>
+			<visible>PVR.HasRadioChannels</visible>
 			<onclick>ActivateWindow(RadioTimers)</onclick>
 			<property name="path">ActivateWindow(RadioTimers)</property>
 			<property name="list">RadioTimers</property>
@@ -1702,7 +943,7 @@
 			<thumb />
 			<property name="labelID">137</property>
 			<property name="defaultID">137</property>
-			<visible>System.HasPVRAddon</visible>
+			<visible>PVR.HasRadioChannels</visible>
 			<onclick>ActivateWindow(RadioSearch)</onclick>
 			<property name="path">ActivateWindow(RadioSearch)</property>
 			<property name="list">RadioSearch</property>
@@ -1710,86 +951,6 @@
 			<property name="group">radio</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[19019]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">19019</property>
-			<property name="defaultID">19019</property>
-			<visible>System.HasPVRAddon</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">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
-			<label>$LOCALIZE[22020]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">22020</property>
-			<property name="defaultID">22020</property>
-			<visible>System.HasPVRAddon</visible>
-			<onclick>ActivateWindow(RadioGuide)</onclick>
-			<property name="path">ActivateWindow(RadioGuide)</property>
-			<property name="list">RadioGuide</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
-			<label>$LOCALIZE[19163]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">19163</property>
-			<property name="defaultID">19163</property>
-			<visible>System.HasPVRAddon</visible>
-			<onclick>ActivateWindow(RadioRecordings)</onclick>
-			<property name="path">ActivateWindow(RadioRecordings)</property>
-			<property name="list">RadioRecordings</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
-			<label>$LOCALIZE[19040]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">19040</property>
-			<property name="defaultID">19040</property>
-			<visible>System.HasPVRAddon</visible>
-			<onclick>ActivateWindow(RadioTimers)</onclick>
-			<property name="path">ActivateWindow(RadioTimers)</property>
-			<property name="list">RadioTimers</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
-			<label>$LOCALIZE[137]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">137</property>
-			<property name="defaultID">137</property>
-			<visible>System.HasPVRAddon</visible>
-			<onclick>ActivateWindow(RadioSearch)</onclick>
-			<property name="path">ActivateWindow(RadioSearch)</property>
-			<property name="list">RadioSearch</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
 	</include>
 	<include name="skinshortcuts-group-alt-radio">
 		<item id="1">
@@ -1800,7 +961,7 @@
 			<thumb />
 			<property name="labelID">19019</property>
 			<property name="defaultID">19019</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
+			<visible>[PVR.HasRadioChannels] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
 			<onclick>ActivateWindow(RadioChannels)</onclick>
 			<property name="path">ActivateWindow(RadioChannels)</property>
 			<property name="list">RadioChannels</property>
@@ -1816,7 +977,7 @@
 			<thumb />
 			<property name="labelID">22020</property>
 			<property name="defaultID">22020</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
+			<visible>[PVR.HasRadioChannels] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
 			<onclick>ActivateWindow(RadioGuide)</onclick>
 			<property name="path">ActivateWindow(RadioGuide)</property>
 			<property name="list">RadioGuide</property>
@@ -1832,7 +993,7 @@
 			<thumb />
 			<property name="labelID">19163</property>
 			<property name="defaultID">19163</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
+			<visible>[PVR.HasRadioChannels] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
 			<onclick>ActivateWindow(RadioRecordings)</onclick>
 			<property name="path">ActivateWindow(RadioRecordings)</property>
 			<property name="list">RadioRecordings</property>
@@ -1848,7 +1009,7 @@
 			<thumb />
 			<property name="labelID">19040</property>
 			<property name="defaultID">19040</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
+			<visible>[PVR.HasRadioChannels] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
 			<onclick>ActivateWindow(RadioTimers)</onclick>
 			<property name="path">ActivateWindow(RadioTimers)</property>
 			<property name="list">RadioTimers</property>
@@ -1864,7 +1025,7 @@
 			<thumb />
 			<property name="labelID">137</property>
 			<property name="defaultID">137</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
+			<visible>[PVR.HasRadioChannels] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
 			<onclick>ActivateWindow(RadioSearch)</onclick>
 			<property name="path">ActivateWindow(RadioSearch)</property>
 			<property name="list">RadioSearch</property>
@@ -1872,182 +1033,14 @@
 			<property name="group">radio</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[19019]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">19019</property>
-			<property name="defaultID">19019</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Window(10000).Property(submenuVisibility),radio)</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">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
-			<label>$LOCALIZE[22020]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">22020</property>
-			<property name="defaultID">22020</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
-			<onclick>ActivateWindow(RadioGuide)</onclick>
-			<property name="path">ActivateWindow(RadioGuide)</property>
-			<property name="list">RadioGuide</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
-			<label>$LOCALIZE[19163]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">19163</property>
-			<property name="defaultID">19163</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
-			<onclick>ActivateWindow(RadioRecordings)</onclick>
-			<property name="path">ActivateWindow(RadioRecordings)</property>
-			<property name="list">RadioRecordings</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
-			<label>$LOCALIZE[19040]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">19040</property>
-			<property name="defaultID">19040</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
-			<onclick>ActivateWindow(RadioTimers)</onclick>
-			<property name="path">ActivateWindow(RadioTimers)</property>
-			<property name="list">RadioTimers</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
-			<label>$LOCALIZE[137]</label>
-			<label2>$ADDON[script.skinshortcuts 32087]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">137</property>
-			<property name="defaultID">137</property>
-			<visible>[System.HasPVRAddon] + StringCompare(Window(10000).Property(submenuVisibility),radio)</visible>
-			<onclick>ActivateWindow(RadioSearch)</onclick>
-			<property name="path">ActivateWindow(RadioSearch)</property>
-			<property name="list">RadioSearch</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">radio</property>
-			<property name="isSubmenu">True</property>
-		</item>
 	</include>
 	<include name="skinshortcuts-group-videos">
-		<item id="1">
-			<property name="id">$NUMBER[1]</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>
-			<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>
-			<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>
-			<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>
-			<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>
-			<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>
+		<description>No items</description>
 	</include>
 	<include name="skinshortcuts-group-alt-videos">
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-videos-0">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<label>$LOCALIZE[20389]</label>
@@ -2056,12 +1049,12 @@
 			<thumb />
 			<property name="labelID">musicvideos</property>
 			<property name="defaultID">musicvideos</property>
-			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<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="group">videos--0</property>
 			<property name="isSubmenu">True</property>
 		</item>
 		<item id="2">
@@ -2075,8 +1068,8 @@
 			<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>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos--0</property>
 			<property name="isSubmenu">True</property>
 		</item>
 		<item id="3">
@@ -2090,10 +1083,12 @@
 			<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>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos--0</property>
 			<property name="isSubmenu">True</property>
 		</item>
+	</include>
+	<include name="skinshortcuts-group-alt-videos-0">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<label>$LOCALIZE[20389]</label>
@@ -2102,12 +1097,12 @@
 			<thumb />
 			<property name="labelID">musicvideos</property>
 			<property name="defaultID">musicvideos</property>
-			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Window(10000).Property(submenuVisibility),videos-0)</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>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos--0</property>
 			<property name="isSubmenu">True</property>
 		</item>
 		<item id="2">
@@ -2121,8 +1116,8 @@
 			<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>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videos-0)</visible>
+			<property name="group">videos--0</property>
 			<property name="isSubmenu">True</property>
 		</item>
 		<item id="3">
@@ -2136,19 +1131,11 @@
 			<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>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videos-0)</visible>
+			<property name="group">videos--0</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>
@@ -2195,51 +1182,6 @@
 			<property name="group">music</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[744]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">744</property>
-			<property name="defaultID">744</property>
-			<onclick>ActivateWindow(Music,Files,Return)</onclick>
-			<property name="path">ActivateWindow(Music,Files,Return)</property>
-			<property name="list">Files</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
-			<label>$LOCALIZE[15100]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">15100</property>
-			<property name="defaultID">15100</property>
-			<onclick>ActivateWindow(Music,MusicLibrary,return)</onclick>
-			<property name="path">ActivateWindow(Music,MusicLibrary,return)</property>
-			<property name="list">MusicLibrary</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
-			<label>$LOCALIZE[1038]</label>
-			<label2>$ADDON[script.skinshortcuts 32019]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1038</property>
-			<property name="defaultID">1038</property>
-			<onclick>ActivateWindow(Music,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Music,Addons,return)</property>
-			<property name="list">Addons</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">music</property>
-			<property name="isSubmenu">True</property>
-		</item>
 	</include>
 	<include name="skinshortcuts-group-alt-music">
 		<item id="1">
@@ -2287,6 +1229,8 @@
 			<property name="group">music</property>
 			<property name="isSubmenu">True</property>
 		</item>
+	</include>
+	<include name="skinshortcuts-group-music-0">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<label>$LOCALIZE[744]</label>
@@ -2298,8 +1242,8 @@
 			<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>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">music--0</property>
 			<property name="isSubmenu">True</property>
 		</item>
 		<item id="2">
@@ -2313,8 +1257,8 @@
 			<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>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">music--0</property>
 			<property name="isSubmenu">True</property>
 		</item>
 		<item id="3">
@@ -2328,26 +1272,63 @@
 			<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>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">music--0</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>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Music,Files,Return)</onclick>
+			<property name="path">ActivateWindow(Music,Files,Return)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),music-0)</visible>
+			<property name="group">music--0</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<label>$LOCALIZE[15100]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">15100</property>
+			<property name="defaultID">15100</property>
+			<onclick>ActivateWindow(Music,MusicLibrary,return)</onclick>
+			<property name="path">ActivateWindow(Music,MusicLibrary,return)</property>
+			<property name="list">MusicLibrary</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),music-0)</visible>
+			<property name="group">music--0</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<label>$LOCALIZE[1038]</label>
+			<label2>$ADDON[script.skinshortcuts 32019]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1038</property>
+			<property name="defaultID">1038</property>
+			<onclick>ActivateWindow(Music,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Music,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),music-0)</visible>
+			<property name="group">music--0</property>
+			<property name="isSubmenu">True</property>
+		</item>
 	</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">
@@ -2365,21 +1346,6 @@
 			<property name="group">pictures</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[1039]</label>
-			<label2>$ADDON[script.skinshortcuts 32020]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1039</property>
-			<property name="defaultID">1039</property>
-			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
-			<property name="list">Addons</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">pictures</property>
-			<property name="isSubmenu">True</property>
-		</item>
 	</include>
 	<include name="skinshortcuts-group-alt-pictures">
 		<item id="1">
@@ -2397,21 +1363,6 @@
 			<property name="group">pictures</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[1039]</label>
-			<label2>$ADDON[script.skinshortcuts 32020]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1039</property>
-			<property name="defaultID">1039</property>
-			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
-			<property name="list">Addons</property>
-			<visible>[StringCompare(System.ProfileName,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">
@@ -2475,67 +1426,6 @@
 			<property name="group">settings</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</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>
-			<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>
-			<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>
-			<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">
@@ -2599,75 +1489,12 @@
 			<property name="group">settings</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</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>
-			<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>
-			<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>
-			<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">
@@ -2694,7 +1521,7 @@
 			<thumb />
 			<property name="labelID">livetv</property>
 			<property name="defaultID">livetv</property>
-			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<visible>[PVR.HasTVChannels] + [PVR.HasTVChannels]</visible>
 			<onclick>ActivateWindow(TVChannels)</onclick>
 			<property name="path">ActivateWindow(TVChannels)</property>
 			<property name="list">TVChannels</property>
@@ -2710,7 +1537,7 @@
 			<thumb />
 			<property name="labelID">31112</property>
 			<property name="defaultID">31112</property>
-			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<visible>[PVR.HasTVChannels] + [PVR.HasTVChannels]</visible>
 			<onclick>ActivateWindow(TVGuide)</onclick>
 			<property name="path">ActivateWindow(TVGuide)</property>
 			<property name="list">TVGuide</property>
@@ -2726,7 +1553,7 @@
 			<thumb />
 			<property name="labelID">31165</property>
 			<property name="defaultID">31165</property>
-			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<visible>[PVR.HasTVChannels] + [PVR.HasTVChannels]</visible>
 			<onclick>ActivateWindow(TVRecordings)</onclick>
 			<property name="path">ActivateWindow(TVRecordings)</property>
 			<property name="list">TVRecordings</property>
@@ -2796,132 +1623,6 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</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>Skin.SetString(recentitems,video)</onclick>
-			<property name="path">Skin.SetString(recentitems,video)</property>
-			<property name="list">Skin.SetString(recentitems,video)</property>
-			<onclick>ActivateWindow(1106)</onclick>
-			<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>
-			<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="3">
-			<property name="id">$NUMBER[3]</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="4">
-			<property name="id">$NUMBER[4]</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="5">
-			<property name="id">$NUMBER[5]</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)] + [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="6">
-			<property name="id">$NUMBER[6]</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)] + [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="7">
-			<property name="id">$NUMBER[7]</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="8">
-			<property name="id">$NUMBER[8]</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">
@@ -2948,7 +1649,7 @@
 			<thumb />
 			<property name="labelID">livetv</property>
 			<property name="defaultID">livetv</property>
-			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<visible>[[PVR.HasTVChannels] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
 			<onclick>ActivateWindow(TVChannels)</onclick>
 			<property name="path">ActivateWindow(TVChannels)</property>
 			<property name="list">TVChannels</property>
@@ -2964,7 +1665,7 @@
 			<thumb />
 			<property name="labelID">31112</property>
 			<property name="defaultID">31112</property>
-			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<visible>[[PVR.HasTVChannels] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
 			<onclick>ActivateWindow(TVGuide)</onclick>
 			<property name="path">ActivateWindow(TVGuide)</property>
 			<property name="list">TVGuide</property>
@@ -2980,7 +1681,7 @@
 			<thumb />
 			<property name="labelID">31165</property>
 			<property name="defaultID">31165</property>
-			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<visible>[[PVR.HasTVChannels] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
 			<onclick>ActivateWindow(TVRecordings)</onclick>
 			<property name="path">ActivateWindow(TVRecordings)</property>
 			<property name="list">TVRecordings</property>
@@ -3050,132 +1751,6 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</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>Skin.SetString(recentitems,video)</onclick>
-			<property name="path">Skin.SetString(recentitems,video)</property>
-			<property name="list">Skin.SetString(recentitems,video)</property>
-			<onclick>ActivateWindow(1106)</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="2">
-			<property name="id">$NUMBER[2]</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="3">
-			<property name="id">$NUMBER[3]</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="4">
-			<property name="id">$NUMBER[4]</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="5">
-			<property name="id">$NUMBER[5]</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)] + [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="6">
-			<property name="id">$NUMBER[6]</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)] + [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="7">
-			<property name="id">$NUMBER[7]</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="8">
-			<property name="id">$NUMBER[8]</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">
@@ -3218,7 +1793,7 @@
 			<thumb />
 			<property name="labelID">radio</property>
 			<property name="defaultID">radio</property>
-			<visible>[System.HasPVRAddon] + [PVR.HasRadioChannels]</visible>
+			<visible>[PVR.HasRadioChannels] + [PVR.HasRadioChannels]</visible>
 			<onclick>ActivateWindow(Radiochannels)</onclick>
 			<property name="path">ActivateWindow(Radiochannels)</property>
 			<property name="list">Radiochannels</property>
@@ -3320,148 +1895,6 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</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.HasAudio</visible>
-			<onclick>Skin.SetString(recentitems,music)</onclick>
-			<property name="path">Skin.SetString(recentitems,music)</property>
-			<property name="list">Skin.SetString(recentitems,music)</property>
-			<onclick>activateWindow(1103)</onclick>
-			<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>
-			<label>$LOCALIZE[31005]</label>
-			<label2>$LOCALIZE[10005]</label2>
-			<icon>DefaultAddon.png</icon>
-			<thumb />
-			<property name="labelID">31005</property>
-			<property name="defaultID">31005</property>
-			<onclick>ActivateWindow(1106)</onclick>
-			<property name="path">ActivateWindow(1106)</property>
-			<property name="list">1106</property>
-			<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>
-			<label>$ADDON[script.skinshortcuts 32087]</label>
-			<label2>$LOCALIZE[10005]</label2>
-			<icon>DefaultAddon.png</icon>
-			<thumb />
-			<property name="labelID">radio</property>
-			<property name="defaultID">radio</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>
-			<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)] + [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>
-			<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)] + [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>
-			<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)] + [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>
-			<label>$LOCALIZE[136]</label>
-			<label2>$LOCALIZE[10005]</label2>
-			<icon>DefaultAddon.png</icon>
-			<thumb />
-			<property name="labelID">136</property>
-			<property name="defaultID">136</property>
-			<visible>Library.HasContent(Music)</visible>
-			<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>
-			<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>
-			<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">
@@ -3504,7 +1937,7 @@
 			<thumb />
 			<property name="labelID">radio</property>
 			<property name="defaultID">radio</property>
-			<visible>[[System.HasPVRAddon] + [PVR.HasRadioChannels]] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<visible>[[PVR.HasRadioChannels] + [PVR.HasRadioChannels]] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
 			<onclick>ActivateWindow(Radiochannels)</onclick>
 			<property name="path">ActivateWindow(Radiochannels)</property>
 			<property name="list">Radiochannels</property>
@@ -3606,148 +2039,6 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</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.HasAudio] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
-			<onclick>Skin.SetString(recentitems,music)</onclick>
-			<property name="path">Skin.SetString(recentitems,music)</property>
-			<property name="list">Skin.SetString(recentitems,music)</property>
-			<onclick>activateWindow(1103)</onclick>
-			<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>
-			<label>$LOCALIZE[31005]</label>
-			<label2>$LOCALIZE[10005]</label2>
-			<icon>DefaultAddon.png</icon>
-			<thumb />
-			<property name="labelID">31005</property>
-			<property name="defaultID">31005</property>
-			<onclick>ActivateWindow(1106)</onclick>
-			<property name="path">ActivateWindow(1106)</property>
-			<property name="list">1106</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="3">
-			<property name="id">$NUMBER[3]</property>
-			<label>$ADDON[script.skinshortcuts 32087]</label>
-			<label2>$LOCALIZE[10005]</label2>
-			<icon>DefaultAddon.png</icon>
-			<thumb />
-			<property name="labelID">radio</property>
-			<property name="defaultID">radio</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>
-			<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)] + [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>
-			<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)] + [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>
-			<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)] + [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>
-			<label>$LOCALIZE[136]</label>
-			<label2>$LOCALIZE[10005]</label2>
-			<icon>DefaultAddon.png</icon>
-			<thumb />
-			<property name="labelID">136</property>
-			<property name="defaultID">136</property>
-			<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
-			<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>
-			<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>
-			<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">
@@ -3765,21 +2056,6 @@
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[1039]</label>
-			<label2>$ADDON[script.skinshortcuts 32020]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1039</property>
-			<property name="defaultID">1039</property>
-			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
-			<property name="list">Addons</property>
-			<visible>StringCompare(System.ProfileName,Test profile)</visible>
-			<property name="group">picturessubmenu</property>
-			<property name="isSubmenu">True</property>
-		</item>
 	</include>
 	<include name="skinshortcuts-group-alt-picturessubmenu">
 		<item id="1">
@@ -3797,20 +2073,5 @@
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<label>$LOCALIZE[1039]</label>
-			<label2>$ADDON[script.skinshortcuts 32020]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1039</property>
-			<property name="defaultID">1039</property>
-			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
-			<property name="list">Addons</property>
-			<visible>[StringCompare(System.ProfileName,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/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml
index 4b55295..8d2da9e 100644
--- a/1080i/script-skinshortcuts.xml
+++ b/1080i/script-skinshortcuts.xml
@@ -7,7 +7,7 @@
         <!--background-->
         <include>globalBackground</include>
         <control type="group">
-            <visible>!isempty(skin.string(homeBackground))</visible>
+            <visible>!skin.string(homeBackground)</visible>
             <animation type="windowOpen" condition="!Skin.HasSetting(lowPowerMode)">
                 <effect type="zoom" center="auto" start="105" tween="sine" end="100" time="1500"/>
             </animation>
diff --git a/changelog.txt b/changelog.txt
index ab603ba..5177c2d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -28,11 +28,14 @@
 Gamecontrollers: button separators (see forum)
 dialogPVRinfo: extra button (see forum)
 
-Check all PVR windows and consider including OSD
+Check all PVR windows
 
 Add user option: Revise player stop on return
+PVR mini window
 
-Recent items video: - check recent episodes
+Skin shortcuts default menus not quite right (need overrides?? Multiple actions not allowed in default)
+
+Add user option: Revise player stop on return
 
 Screenshots etc