diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 0b0a757..53039e6 100755
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -295,6 +295,15 @@
                         <height>10-col</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
                         <texture fallback="defaultAddon.png" border="0">$INFO[listitem.thumb]</texture>
+                        <colordiffuse></colordiffuse>
+                    </control>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>17-row</posy>
+                        <width>10-col</width>
+                        <height>3-row</height>
+                        <aspectratio scalediffuse="false">stretch</aspectratio>
+                        <texture border="0">colors/black.png</texture>
                         <colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="label">
diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index 83cc716..f2409df 100755
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -124,7 +124,7 @@
                     <width>12-col-gutter</width>
                     <font>smallStrong</font>
                     <textcolor>highlight</textcolor>
-                    <label>$INFO[ListItem.AddonCreator,$LOCALIZE[31082] ,]</label>
+                    <label>$INFO[ListItem.AddonCreator,$LOCALIZE[31082] ,] • $INFO[ListItem.addonversion,$LOCALIZE[31139]: , ]</label>
                 </control>
                 <control type="textbox" id="400">
                     <posx>12</posx>
@@ -245,14 +245,14 @@
                         </item>
                         <item>
                             <visible>Control.IsEnabled(7) + String.IsEqual(Control.GetLabel(7),enable)</visible>
-                            <label>$INFO[Control.GetLabel(7)] $LOCALIZE[31104]</label>
+                            <label>$LOCALIZE[31218]</label>
                             <label2></label2>
                             <thumb>-</thumb>
                             <onclick>SendClick(146,7)</onclick>
                         </item>
                         <item>
                             <visible>Control.IsEnabled(7) + String.IsEqual(Control.GetLabel(7),disable)</visible>
-                            <label>$INFO[Control.GetLabel(7)] $LOCALIZE[31104]</label>
+                            <label>$LOCALIZE[31104]</label>
                             <label2></label2>
                             <thumb>-</thumb>
                             <onclick>SendClick(146,7)</onclick>
diff --git a/1080i/DialogExtendedProgressBar.xml b/1080i/DialogExtendedProgressBar.xml
index 998073b..5975ca4 100755
--- a/1080i/DialogExtendedProgressBar.xml
+++ b/1080i/DialogExtendedProgressBar.xml
@@ -25,57 +25,57 @@
                     <bordertexture colordiffuse="highlight">colors/white.png</bordertexture>
                     <bordersize>6,0,0,0</bordersize>
                 </control>
-            </control>
-            <control type="label" id="30">
-                <visible>!StringCompare(control.getlabel(30),control.getlabel(31))</visible>
-                <description>heading</description>
-                <posx>24</posx>
-                <posy>0</posy>
-                <font>itemSubTitle</font>
-                <width>468</width>
-                <height>60</height>
-                <aligny>center</aligny>
-                <label>-</label>
-                <textcolor>black</textcolor>
-                <shadowcolor>-</shadowcolor>
-                <!--animations-->
-                <animation type="Windowopen">
-                    <effect type="fade" start="0" end="100" delay="400" time="400" tween="sine"/>
-                </animation>
-            </control>
-            <control type="label">
-                <visible>StringCompare(control.getlabel(30),control.getlabel(31))</visible>
-                <description>heading</description>
-                <posx>24</posx>
-                <posy>0</posy>
-                <font>itemSubTitle</font>
-                <width>468</width>
-                <height>60</height>
-                <aligny>center</aligny>
-                <label>31023</label>
-                <textcolor>black</textcolor>
-                <shadowcolor>-</shadowcolor>
-                <!--animations-->
-                <animation type="Windowopen">
-                    <effect type="fade" start="0" end="100" delay="400" time="400" tween="sine"/>
-                </animation>
-            </control>
-            <control type="label" id="31">
-                <description>message</description>
-                <posx>24</posx>
-                <posy>1-row</posy>
-                <font>dialogTitle</font>
-                <textcolor>black</textcolor>
-                <width>468</width>
-                <height>2-row</height>
-                <aligny>center</aligny>
-                <label>-</label>
-                <scroll>true</scroll>
-                <scrollspeed>100</scrollspeed>
-                <!--animations-->
-                <animation type="Windowopen">
-                    <effect type="fade" start="0" end="100" delay="600" time="400" tween="sine"/>
-                </animation>
+                <control type="label" id="30">
+                    <visible>!StringCompare(control.getlabel(30),control.getlabel(31))</visible>
+                    <description>heading</description>
+                    <posx>24</posx>
+                    <posy>0</posy>
+                    <font>itemSubTitle</font>
+                    <width>468</width>
+                    <height>60</height>
+                    <aligny>center</aligny>
+                    <label>-</label>
+                    <textcolor>black</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <!--animations-->
+                    <animation type="Windowopen">
+                        <effect type="fade" start="0" end="100" delay="400" time="400" tween="sine"/>
+                    </animation>
+                </control>
+                <control type="label">
+                    <visible>StringCompare(control.getlabel(30),control.getlabel(31))</visible>
+                    <description>heading</description>
+                    <posx>24</posx>
+                    <posy>0</posy>
+                    <font>itemSubTitle</font>
+                    <width>468</width>
+                    <height>60</height>
+                    <aligny>center</aligny>
+                    <label>31023</label>
+                    <textcolor>black</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <!--animations-->
+                    <animation type="Windowopen">
+                        <effect type="fade" start="0" end="100" delay="400" time="400" tween="sine"/>
+                    </animation>
+                </control>
+                <control type="label" id="31">
+                    <description>message</description>
+                    <posx>24</posx>
+                    <posy>1-row</posy>
+                    <font>dialogTitle</font>
+                    <textcolor>black</textcolor>
+                    <width>468</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
+                    <label>-</label>
+                    <scroll>true</scroll>
+                    <scrollspeed>100</scrollspeed>
+                    <!--animations-->
+                    <animation type="Windowopen">
+                        <effect type="fade" start="0" end="100" delay="600" time="400" tween="sine"/>
+                    </animation>
+                </control>
             </control>
         </control>
         <!--debugging-->
diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml
index 0fffa40..324fddd 100755
--- a/1080i/DialogMusicInfo.xml
+++ b/1080i/DialogMusicInfo.xml
@@ -410,6 +410,20 @@
             <visible>container.content(songs)</visible>
             <posx>0</posx>
             <posy>0</posy>
+            <control type="image">
+                <include>dimensionsFullscreen</include>
+                <texture>colors/black.png</texture>
+                <colordiffuse>e9FFFFFF</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <include>dimensionsFullscreen</include>
+                <texture>vignette.png</texture>
+                <colordiffuse>ffffffff</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <!--content-->
             <control type="group">
                 <posx>col-7-begin</posx>
@@ -617,7 +631,6 @@
                     </content>
                 </control>
             </control>
-
         </control>
         <!--dialog controls-->
         <control type="group">
diff --git a/1080i/DialogNotification.xml b/1080i/DialogNotification.xml
index bbc8427..0c2c213 100755
--- a/1080i/DialogNotification.xml
+++ b/1080i/DialogNotification.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <onload condition="Window.isactive(Videos) | window.isactive(videoplaylist) | Window.isactive(pvr) Window.isactive(Music) | window.isactive(musicplaylist)">SetFocus(9000,0)</onload>
     <controls>
         <control type="group">
             <posx>col-19-begin</posx>
@@ -27,56 +26,56 @@
                     <bordertexture colordiffuse="highlight">colors/white.png</bordertexture>
                     <bordersize>6,0,0,0</bordersize>
                 </control>
-            </control>
-            <control type="label" id="401">
-                <description>heading</description>
-                <visible>!StringCompare(control.getlabel(401),control.getlabel(402))</visible>
-                <posx>24</posx>
-                <posy>0</posy>
-                <font>itemSubTitle</font>
-                <width>468</width>
-                <height>60</height>
-                <aligny>center</aligny>
-                <label>-</label>
-                <textcolor>black</textcolor>
-                <shadowcolor>-</shadowcolor>
-                <!--animations-->
-                <animation type="Windowopen">
-                    <effect type="fade" start="0" end="100" delay="400" time="400" tween="sine"/>
-                </animation>
-            </control>
-            <control type="label">
-                <visible>StringCompare(control.getlabel(401),control.getlabel(402))</visible>
-                <posx>24</posx>
-                <posy>0</posy>
-                <font>itemSubTitle</font>
-                <width>468</width>
-                <height>60</height>
-                <aligny>center</aligny>
-                <label>31023</label>
-                <textcolor>black</textcolor>
-                <shadowcolor>-</shadowcolor>
-                <!--animations-->
-                <animation type="Windowopen">
-                    <effect type="fade" start="0" end="100" delay="400" time="400" tween="sine"/>
-                </animation>
-            </control>
-            <control type="label" id="402">
-                <description>message</description>
-                <posx>24</posx>
-                <posy>1-row</posy>
-                <font>dialogTitle</font>
-                <textcolor>black</textcolor>
-                <width>468</width>
-                <height>2-row</height>
-                <aligny>center</aligny>
-                <label>-</label>
-                <scroll>true</scroll>
-                <scrollspeed>100</scrollspeed>
-                <!--animations-->
-                <animation type="Windowopen">
-                    <effect type="fade" start="0" end="100" delay="600" time="400" tween="sine"/>
-                </animation>
+                <control type="label" id="401">
+                    <description>heading</description>
+                    <visible>!StringCompare(control.getlabel(401),control.getlabel(402))</visible>
+                    <posx>24</posx>
+                    <posy>0</posy>
+                    <font>itemSubTitle</font>
+                    <width>468</width>
+                    <height>60</height>
+                    <aligny>center</aligny>
+                    <label>-</label>
+                    <textcolor>black</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <!--animations-->
+                    <animation type="Windowopen">
+                        <effect type="fade" start="0" end="100" delay="400" time="400" tween="sine"/>
+                    </animation>
+                </control>
+                <control type="label">
+                    <visible>StringCompare(control.getlabel(401),control.getlabel(402))</visible>
+                    <posx>24</posx>
+                    <posy>0</posy>
+                    <font>itemSubTitle</font>
+                    <width>468</width>
+                    <height>60</height>
+                    <aligny>center</aligny>
+                    <label>31023</label>
+                    <textcolor>black</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <!--animations-->
+                    <animation type="Windowopen">
+                        <effect type="fade" start="0" end="100" delay="400" time="400" tween="sine"/>
+                    </animation>
+                </control>
+                <control type="label" id="402">
+                    <description>message</description>
+                    <posx>24</posx>
+                    <posy>1-row</posy>
+                    <font>dialogTitle</font>
+                    <textcolor>black</textcolor>
+                    <width>468</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
+                    <label>-</label>
+                    <scroll>true</scroll>
+                    <scrollspeed>100</scrollspeed>
+                    <!--animations-->
+                    <animation type="Windowopen">
+                        <effect type="fade" start="0" end="100" delay="600" time="400" tween="sine"/>
+                    </animation>
+                </control>
             </control>
         </control>
         <!--debugging-->
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index a41d747..69e09a5 100755
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -503,22 +503,22 @@
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
-                <posx>0</posx>
+                <posx>-6</posx>
                 <posy>0</posy>
-                <width>10-col</width>
-                <height>row-5-begin</height>
+                <width>6</width>
+                <height>fullscreenHeight</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <!--content-->
             <control type="group">
-                <posx>12</posx>
+                <posx>24</posx>
                 <posy>row-1-begin</posy>
                 <control type="label">
                     <posx>0</posx>
                     <posy>-12</posy>
-                    <width>672</width>
+                    <width>660</width>
                     <align>left</align>
                     <height>3-row</height>
                     <aligny>center</aligny>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index b5bfaa6..09555cf 100755
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -54,7 +54,7 @@
                 <label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)]</label>
             </control>
             <control type="label">
-                <visible>!isempty(Window(Weather).Property(WeatherProvider))</visible>
+                <visible>!isempty(Window(Weather).Property(WeatherProvider)) + !skin.hassetting(weatherdisplay) + !String.isempty(weather.location) + !String.isempty(weather.temperature) + !String.isempty(weather.conditions)</visible>
                 <posx>0</posx>
                 <posy>3-row</posy>
                 <width>24-col</width>
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index bc675f1..7787325 100755
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -26,6 +26,7 @@
             </control>
             <!--logo-->
             <control type="image">
+                <visible>window.isactive(home)</visible>
                 <posx>col-1-begin</posx>
                 <posy>row-1-begin</posy>
                 <width>1-col</width>
@@ -34,6 +35,18 @@
                 <colordiffuse>textActive</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
+            <control type="label">
+                <visible>!window.isactive(home)"</visible>
+                <posx>col-1-begin</posx>
+                <posy>row-1-begin</posy>
+                <width>1-col</width>
+                <height>1-col</height>
+                <font>symbolVeryLarge</font>
+                <aligny>center</aligny>
+                <textcolor>textActive</textcolor>
+                <shadowcolor>-</shadowcolor>
+                <label>$VAR[menuLogo]</label>
+            </control>
             <control type="list" id="9001">
                 <posx>0</posx>
                 <posy>row-4-begin</posy>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index b8bd597..675d6bd 100755
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -6,7 +6,8 @@
         <value condition="Window.isactive(1106)">$LOCALIZE[31012]</value>
         <value condition="Window.isactive(Videos) + Substring(Container.folderpath,plugin)">$INFO[container.foldername] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[31011] ,]</value>
         <value condition="Window.isactive(Videos) + Container.Content(movies)">$LOCALIZE[20342] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR]</value>
-        <value condition="Window.isactive(Videos) + [Container.Content(seasons) | Container.Content(tvshows) | Container.Content(episodes)]">$LOCALIZE[20343] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
+        <value condition="Window.isactive(Videos) + Container.Content(tvshows)">$LOCALIZE[31216] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR]</value>
+        <value condition="Window.isactive(Videos) + [Container.Content(seasons) | Container.Content(episodes)]">$LOCALIZE[20343]</value>
         <value condition="Window.isactive(Videos) + !isEmpty(container.foldername)">$INFO[container.foldername]</value>
         <value condition="Window.isactive(Videos) + isEmpty(container.foldername)">$LOCALIZE[31012]</value>
         <value condition="Window.isactive(Music) + SubString(container.folderpath,addons://)">$LOCALIZE[31058]</value>
@@ -80,4 +81,10 @@
         <value condition="!isempty(Skin.String(homeBackground))">$INFO[Skin.String(homeBackground)]</value>
         <value>special://skin/extras/homeBackgrounds</value>
     </variable>
+    <!--menu logos-->
+    <variable name="menuLogo">
+        <value condition="window.isactive(pictures)"></value>
+        <value condition="[window.isactive(1106) + String.IsEqual(skin.string(recentitems),music)] | window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers)"></value>
+        <value condition="[window.isactive(1106) + String.IsEqual(skin.string(recentitems),video)] | window.isactive(videos) | window.isactive(tvchannels) | window.isactive(tvrecordings) | window.isactive(tvguide) | window.isactive(tvtimers)"></value>
+    </variable>
 </includes>
diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml
index 7cc233b..b421377 100755
--- a/1080i/MyPics.xml
+++ b/1080i/MyPics.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol always="false">9000</defaultcontrol>
+    <defaultcontrol always="true">9000</defaultcontrol>
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
     <include>fadeInOut</include>
     <controls>
@@ -47,7 +47,7 @@
                     <posy>45</posy>
                     <width>24-col</width>
                     <font>regular</font>
-                    <label>$INFO[container.Numitems,, $LOCALIZE[31037]]</label>
+                    <label>$INFO[container.Numitems,, $LOCALIZE[31038]]</label>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="label">
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 5b9a68c..927ab16 100755
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -188,6 +188,14 @@
                     <onclick>ReloadSkin()</onclick>
                     <selected>Skin.HasSetting(lowPowerMode)</selected>
                 </control>
+                <control type="radiobutton" id="11">
+                    <visible>Container(8000).Hasfocus(1)</visible>
+                    <description>Disable weather label on homescreen</description>
+                    <width>14-col</width>
+                    <label>31217</label>
+                    <onclick>Skin.ToggleSetting(weatherdisplay)</onclick>
+                    <selected>Skin.HasSetting(weatherdisplay)</selected>
+                </control>
             </control>
         </control>
         <!--debugging-->
diff --git a/1080i/script-skinshortcuts-includes.xml b/1080i/script-skinshortcuts-includes.xml
index ab19654..7d67ffc 100755
--- 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>$LOCALIZE[31136]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31136</property>
@@ -21,7 +21,7 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</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>
@@ -38,7 +38,7 @@
 		<item id="3">
 			<property name="id">$NUMBER[3]</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>
@@ -55,7 +55,7 @@
 		<item id="4">
 			<property name="id">$NUMBER[4]</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>
@@ -64,7 +64,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>
@@ -73,7 +72,7 @@
 		<item id="5">
 			<property name="id">$NUMBER[5]</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>
@@ -90,7 +89,7 @@
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
 			<label>$LOCALIZE[31059]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31059</property>
@@ -107,7 +106,7 @@
 		<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</property>
@@ -128,7 +127,7 @@
 		<item id="8">
 			<property name="id">$NUMBER[8]</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>
@@ -145,7 +144,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</property>
@@ -166,7 +165,7 @@
 		<item id="10">
 			<property name="id">$NUMBER[10]</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>
@@ -183,7 +182,7 @@
 		<item id="11">
 			<property name="id">$NUMBER[11]</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>
@@ -200,7 +199,7 @@
 		<item id="12">
 			<property name="id">$NUMBER[12]</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>
@@ -215,8 +214,25 @@
 		</item>
 		<item id="13">
 			<property name="id">$NUMBER[13]</property>
+			<label>test</label>
+			<label2>Custom item</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">test</property>
+			<property name="defaultID" />
+			<visible>Library.HasContent(Movies)</visible>
+			<onclick>ActivateWindow(Videos,library://video/movies/titles.xml/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,library://video/movies/titles.xml/,return)</property>
+			<property name="list">library://video/movies/titles.xml/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">test</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="14">
+			<property name="id">$NUMBER[14]</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>
@@ -229,10 +245,10 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">True</property>
 		</item>
-		<item id="14">
-			<property name="id">$NUMBER[14]</property>
+		<item id="15">
+			<property name="id">$NUMBER[15]</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>
@@ -623,7 +639,7 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[7]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -639,7 +655,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[13200]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -655,7 +671,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[10007]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -671,7 +687,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[14111]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -688,7 +704,7 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -705,7 +721,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -723,13 +739,13 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">15</property>
-			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31215]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
-			<property name="labelID">livetv</property>
-			<property name="defaultID">livetv</property>
+			<property name="labelID">31215</property>
+			<property name="defaultID">31215</property>
 			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
 			<onclick>ActivateWindow(TVChannels)</onclick>
 			<property name="path">ActivateWindow(TVChannels)</property>
@@ -740,7 +756,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31112]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -757,7 +773,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31165]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -774,7 +790,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[342]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -791,7 +807,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -808,7 +824,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31088]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -824,7 +840,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -840,7 +856,7 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -857,7 +873,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -875,7 +891,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -892,7 +908,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -909,7 +925,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -926,7 +942,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -943,7 +959,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -959,7 +975,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -975,7 +991,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -991,16 +1007,51 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">17</property>
+			<property name="mainmenuid">18</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>Pictures</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<property name="path">ActivateWindow(Pictures,files)</property>
+			<property name="list">files</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),picturessubmenu)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">18</property>
+			<label>test</label>
+			<label2>Custom item</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">test</property>
+			<property name="defaultID" />
+			<onclick condition="true">ActivateWindow(Pictures,"/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/",return)</onclick>
+			<property name="path">ActivateWindow(Pictures,"/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/",return)</property>
+			<property name="list">/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),picturessubmenu)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">18</property>
 			<label>$LOCALIZE[1039]</label>
-			<label2>$ADDON[script.skinshortcuts 32020]</label2>
+			<label2>Pictures</label2>
 			<icon>DefaultShortcut.png</icon>
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -1237,12 +1288,12 @@
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">15</property>
-			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<label>$LOCALIZE[31215]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
-			<property name="labelID">livetv</property>
-			<property name="defaultID">livetv</property>
+			<property name="labelID">31215</property>
+			<property name="defaultID">31215</property>
 			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
 			<onclick>ActivateWindow(TVChannels)</onclick>
 			<property name="path">ActivateWindow(TVChannels)</property>
@@ -1505,15 +1556,33 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">17</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32020]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<property name="path">ActivateWindow(Pictures,files)</property>
+			<property name="list">files</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<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>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -2115,10 +2184,16 @@
 			<property name="isSubmenu">True</property>
 		</item>
 	</include>
+	<include name="skinshortcuts-group-test">
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-test">
+		<description>No items</description>
+	</include>
 	<include name="skinshortcuts-group-settings">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[7]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2134,7 +2209,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[13200]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2150,7 +2225,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[10007]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2166,7 +2241,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[14111]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2250,7 +2325,7 @@
 	<include name="skinshortcuts-group-alt-settings">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[7]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2266,7 +2341,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[13200]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2282,7 +2357,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[10007]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2298,7 +2373,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[14111]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2390,7 +2465,7 @@
 	<include name="skinshortcuts-group-videosubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2407,7 +2482,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2425,13 +2500,13 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">15</property>
-			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31215]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
-			<property name="labelID">livetv</property>
-			<property name="defaultID">livetv</property>
+			<property name="labelID">31215</property>
+			<property name="defaultID">31215</property>
 			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
 			<onclick>ActivateWindow(TVChannels)</onclick>
 			<property name="path">ActivateWindow(TVChannels)</property>
@@ -2442,7 +2517,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31112]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2459,7 +2534,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31165]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2476,7 +2551,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[342]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2493,7 +2568,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2510,7 +2585,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31088]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2526,7 +2601,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2578,12 +2653,12 @@
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">15</property>
-			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<label>$LOCALIZE[31215]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
-			<property name="labelID">livetv</property>
-			<property name="defaultID">livetv</property>
+			<property name="labelID">31215</property>
+			<property name="defaultID">31215</property>
 			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
 			<onclick>ActivateWindow(TVChannels)</onclick>
 			<property name="path">ActivateWindow(TVChannels)</property>
@@ -2696,7 +2771,7 @@
 	<include name="skinshortcuts-group-alt-videosubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2713,7 +2788,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2731,13 +2806,13 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">15</property>
-			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31215]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
-			<property name="labelID">livetv</property>
-			<property name="defaultID">livetv</property>
+			<property name="labelID">31215</property>
+			<property name="defaultID">31215</property>
 			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
 			<onclick>ActivateWindow(TVChannels)</onclick>
 			<property name="path">ActivateWindow(TVChannels)</property>
@@ -2748,7 +2823,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31112]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2765,7 +2840,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31165]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2782,7 +2857,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[342]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2799,7 +2874,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2816,7 +2891,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31088]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2832,7 +2907,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2884,12 +2959,12 @@
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">15</property>
-			<label>$ADDON[script.skinshortcuts 32022]</label>
+			<label>$LOCALIZE[31215]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
-			<property name="labelID">livetv</property>
-			<property name="defaultID">livetv</property>
+			<property name="labelID">31215</property>
+			<property name="defaultID">31215</property>
 			<visible>[[System.HasPVRAddon] + [PVR.HasTVChannels]] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
 			<onclick>ActivateWindow(TVChannels)</onclick>
 			<property name="path">ActivateWindow(TVChannels)</property>
@@ -3002,7 +3077,7 @@
 	<include name="skinshortcuts-group-musicsubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3019,7 +3094,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3037,7 +3112,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3054,7 +3129,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3071,7 +3146,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3088,7 +3163,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3105,7 +3180,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3121,7 +3196,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3137,7 +3212,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3306,7 +3381,7 @@
 	<include name="skinshortcuts-group-alt-musicsubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3323,7 +3398,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3341,7 +3416,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3358,7 +3433,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3375,7 +3450,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3392,7 +3467,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3409,7 +3484,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3425,7 +3500,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3441,7 +3516,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3610,16 +3685,51 @@
 	<include name="skinshortcuts-group-picturessubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">17</property>
+			<property name="mainmenuid">18</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>Pictures</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<property name="path">ActivateWindow(Pictures,files)</property>
+			<property name="list">files</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">18</property>
+			<label>test</label>
+			<label2>Custom item</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">test</property>
+			<property name="defaultID" />
+			<onclick condition="true">ActivateWindow(Pictures,"/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/",return)</onclick>
+			<property name="path">ActivateWindow(Pictures,"/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/",return)</property>
+			<property name="list">/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">18</property>
 			<label>$LOCALIZE[1039]</label>
-			<label2>$ADDON[script.skinshortcuts 32020]</label2>
+			<label2>Pictures</label2>
 			<icon>DefaultShortcut.png</icon>
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3627,15 +3737,33 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">17</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32020]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<property name="path">ActivateWindow(Pictures,files)</property>
+			<property name="list">files</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>StringCompare(System.ProfileName,Test profile)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3644,16 +3772,51 @@
 	<include name="skinshortcuts-group-alt-picturessubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">17</property>
+			<property name="mainmenuid">18</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>Pictures</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<property name="path">ActivateWindow(Pictures,files)</property>
+			<property name="list">files</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),picturessubmenu)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">18</property>
+			<label>test</label>
+			<label2>Custom item</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">test</property>
+			<property name="defaultID" />
+			<onclick condition="true">ActivateWindow(Pictures,"/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/",return)</onclick>
+			<property name="path">ActivateWindow(Pictures,"/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/",return)</property>
+			<property name="list">/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),picturessubmenu)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">18</property>
 			<label>$LOCALIZE[1039]</label>
-			<label2>$ADDON[script.skinshortcuts 32020]</label2>
+			<label2>Pictures</label2>
 			<icon>DefaultShortcut.png</icon>
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3661,15 +3824,33 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">17</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32020]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<property name="path">ActivateWindow(Pictures,files)</property>
+			<property name="list">files</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),picturessubmenu)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
diff --git a/README.md b/README.md
index 019a1e4..fc88cf9 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 Pellucid
 ===================
 
+[![Pellucid](http://img.youtube.com/vi/QYzGpAwfgaw/0.jpg)](https://www.youtube.com/watch?v=QYzGpAwfgaw "Pellucid")
+
 Pellucid is a skin for Kodi Media Centre.
 
 Built for the living room, Pellucid is a clean and simple Kodi experience designed for maximum usability and minimum fuss.
diff --git a/addon.xml b/addon.xml
index e3d6ec7..67eb61f 100755
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.pellucid" version="1.0.3" name="Pellucid" provider-name="theDeadman">
+<addon id="skin.pellucid" version="1.0.4" name="Pellucid" provider-name="theDeadman">
     <requires>
         <import addon="xbmc.gui" version="5.12.0"/>
         <import addon="script.skinshortcuts" version="1.0.13"/>
diff --git a/changelog.txt b/changelog.txt
index 8c8a72c..119d9f1 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,9 @@
 **Changelog**
 
+[V1.0.4]
+- Minor tweaks and bug fixes
+- [NEW] User option to remove weather data from homescreen
+
 [V1.0.3]
 - Minor bug fixes and tweaks
 - [CHANGED] TVShow Episode count now reflects watched / unwatched status
diff --git a/language/English/strings.po b/language/English/strings.po
index 181812c..3df5122 100755
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -442,7 +442,7 @@ msgid "Control how Kodi is used"
 msgstr ""
 
 msgctxt "#31104"
-msgid "Addon"
+msgid "Disable this addon"
 msgstr ""
 
 msgctxt "#31105"
@@ -581,6 +581,10 @@ msgctxt "#31138"
 msgid "Stop video playing on return to menu"
 msgstr ""
 
+msgctxt "#31139"
+msgid "Version"
+msgstr ""
+
 msgctxt "#31142"
 msgid "Prioritise exit over shutdown in power menu"
 msgstr ""
@@ -815,4 +819,16 @@ msgstr ""
 
 msgctxt "#31215"
 msgid "TV Channels"
+msgstr ""
+
+msgctxt "#31216"
+msgid "TV Shows"
+msgstr ""
+
+msgctxt "#31217"
+msgid "Hide weather summary on homescreen"
+msgstr ""
+
+msgctxt "#31218"
+msgid "Enable this addon"
 msgstr ""
\ No newline at end of file
diff --git a/media/DefaultAddonsRecentlyUpdated.png b/media/DefaultAddonsRecentlyUpdated.png
new file mode 100644
index 0000000..e69b44c
Binary files /dev/null and b/media/DefaultAddonsRecentlyUpdated.png differ
diff --git a/media/DefaultNetwork.png b/media/DefaultNetwork.png
new file mode 100644
index 0000000..ad13645
Binary files /dev/null and b/media/DefaultNetwork.png differ
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index b962f6a..f1aaf33 100755
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -36,4 +36,10 @@
         <action>::ACTION::</action>
         <action>control.setfocus(9998)</action>
     </override>
+
+    <override action="globaloverride" group="picturessubmenu">
+         <condition>true</condition>
+         <action>::ACTION::</action>
+         <action>control.setfocus(9999)</action>
+    </override>
 </overrides>
diff --git a/shortcuts/picturessubmenu.DATA.xml b/shortcuts/picturessubmenu.DATA.xml
index 007858f..7328f75 100755
--- a/shortcuts/picturessubmenu.DATA.xml
+++ b/shortcuts/picturessubmenu.DATA.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shortcuts>
-	<shortcut>
-		<label>1039</label>
-		<label2>32020</label2>
-		<icon>DefaultAddonPicture.png</icon>
-		<thumb />
-		<action>ActivateWindow(Pictures,Addons,return)</action>
-	</shortcut>
+    <shortcut>
+        <label>744</label>
+        <label2>32020</label2>
+        <icon>DefaultAddonPicture.png</icon>
+        <thumb />
+        <action>ActivateWindow(Pictures,files)</action>
+    </shortcut>
+    <shortcut>
+        <label>1039</label>
+        <label2>32020</label2>
+        <icon>DefaultAddonPicture.png</icon>
+        <thumb />
+        <action>ActivateWindow(Pictures,Addons,return)</action>
+    </shortcut>
 </shortcuts>