diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml
index c269466..fa30bb9 100644
--- a/1080i/DialogKeyboard.xml
+++ b/1080i/DialogKeyboard.xml
@@ -43,11 +43,15 @@
                     <textcolor>99FFFFFF</textcolor>
                 </control>
             </control>
+            <!--autocomplete-->
+            <include condition="System.HasAddon(plugin.program.autocompletion) + !System.HasHiddenInput">AutoComplete</include>
+
             <!--headers-->
             <control type="group">
                 <posx>col-1-begin</posx>
                 <posy>0</posy>
                 <control type="label" id="311">
+                    <visible>String.IsEmpty(Container(5000).ListItem.Label) | String.IsEmpty(Control.GetLabel(312).index(1))</visible>
                     <description>header label</description>
                     <posx>0</posx>
                     <posy>-18</posy>
@@ -63,7 +67,7 @@
                     <posy>1-row</posy>
                     <width>24-col</width>
                     <align>center</align>
-                    <onup>300</onup>
+                    <onup>5000</onup>
                     <ondown>309</ondown>
                 </control>
             </control>
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index 57f6999..de987d9 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -297,10 +297,11 @@
                             <label>$LOCALIZE[31219]</label>
                             <label2></label2>
                             <thumb>-</thumb>
-                            <onclick condition="Container.Content(tvshows)">XBMC.RunScript(script.artwork.downloader, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
-                            <onclick condition="Container.Content(movies)">XBMC.RunScript(script.artwork.downloader, mediatype=movie, dbid=$INFO[ListItem.DBID])</onclick>
-                            <onclick condition="Container.Content(musicvideos)">XBMC.RunScript(script.artwork.downloader, mediatype=musicvideos, dbid=$INFO[ListItem.DBID])</onclick>
-                            <visible>[Container.Content(tvshows)|Container.Content(movies)|Container.Content(musicvideos)]+system.hasaddon(script.artwork.downloader)</visible>
+                            <onclick condition="system.hasaddon(script.artwork.downloader) + Container.Content(tvshows)">XBMC.RunScript(script.artwork.downloader, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
+                            <onclick condition="system.hasaddon(script.artwork.downloader) + Container.Content(movies)">XBMC.RunScript(script.artwork.downloader, mediatype=movie, dbid=$INFO[ListItem.DBID])</onclick>
+                            <onclick condition="system.hasaddon(script.artwork.downloader) + Container.Content(musicvideos)">XBMC.RunScript(script.artwork.downloader, mediatype=musicvideos, dbid=$INFO[ListItem.DBID])</onclick>
+                            <onclick condition="!system.hasaddon(script.artwork.downloader)">InstallAddon(script.artwork.downloader)</onclick>
+                            <visible>[Container.Content(tvshows)|Container.Content(movies)|Container.Content(musicvideos)]</visible>
                         </item>
                         <item id="2">
                             <description>Cancel Button</description>
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index 8a7b394..9b73d0c 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -28,16 +28,10 @@
         </control>
         <!--movie / tv show fanart-->
         <control type="group">
-            <control type="image">
-                <visible>!Substring(Container.folderpath,plugin) + !container.content(episodes)</visible>
-                <posx>0</posx>
-                <posy>0</posy>
-                <include>dimensionsFullscreen</include>
-                <texture>$INFO[ListItem.Art(fanart)]</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-                <include>kenBurnsey</include>
-            </control>
+
+            <!--<include condition="!Substring(Container.folderpath,plugin) + !container.content(episodes)">itemFanart</include>-->
+            <include condition="!Substring(Container.folderpath,plugin) + !container.content(episodes)">itemShowcase</include>
+
             <!--music video-->
             <control type="group">
                 <visible>container.content(musicvideos)</visible>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index a62c395..27a6ef5 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -23,16 +23,9 @@
     <include file="View_ArtistAlbums.xml"/>
     <include file="View_MusicVideos.xml"/>
     <include file="script-skinshortcuts-includes.xml"/>
+    <include file="Includes_mediaShowcase.xml"/>
 
-    <!--expressions-->
-    <!--originals
-    <expression name="isSeason">!isempty(container.folderpath) + !StringCompare(container.foldername,files) + !container.content(episodes) + !Substring(Container.folderpath,plugin) + !container.content(addons)</expression>
-    <expression name="isEpisode">Substring(container.folderpath,videodb://) + !isempty(container.folderpath) + container.content(episodes) + !Substring(Container.folderpath,plugin)</expression>
-    <expression name="isTVShow">Substring(container.folderpath,videodb://) + Library.HasContent(tvshows) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + !container.content(files)</expression>
-    <expression name="isMovie">Library.HasContent(movies) + !container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + Substring(container.folderpath,videodb://) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</expression>
-    <expression name="isVideoList">!isempty(container.folderpath) + !Substring(container.folderpath,videodb://) | container.content(files) | StringCompare(container.foldername,files) | Substring(container.folderpath,special://videoplaylists)</expression>
--->
-
+    <!--view type conditions-->
     <expression name="isVideoList">container.content(files) | isempty(container.content) | container.content(playlists) | container.content(addons)</expression>
     <expression name="isMovie">container.content(movies) + [Substring(container.folderpath,videodb://) | Substring(container.folderpath,special://profile/playlists/video)]</expression>
     <expression name="isTVShow">container.content(tvshows) + [Substring(container.folderpath,videodb://) | Substring(container.folderpath,special://profile/playlists/video)]</expression>
@@ -40,6 +33,91 @@
     <expression name="isEpisode">container.content(episodes) + !Substring(Container.folderpath,plugin)</expression>
     <expression name="isMusicVideo">container.content(musicvideos) + !Substring(Container.folderpath,plugin)</expression>
 
+    <!--item fanart-->
+    <include name="itemFanart">
+        <control type="wraplist" id="99999">
+            <posx>0</posx>
+            <posy>0</posy>
+            <width>1000</width>
+            <height>1000</height>
+            <enable>false</enable>
+            <preloaditems>2</preloaditems>
+            <scrolltime>15000</scrolltime>
+            <autoscroll>true</autoscroll>
+            <itemlayout />
+            <focusedlayout />
+            <content>$VAR[extraFanartLocation]</content>
+        </control>
+        <control type="image">
+            <visible>Integer.IsGreater(container(99999).numitems,0) + !Skin.HasSetting(disableExtendedFanart)</visible>
+            <include>dimensionsFullscreen</include>
+            <texture>$INFO[container(99999).listitem.filenameandpath,,]</texture>
+            <colordiffuse>ffffffff</colordiffuse>
+            <fadetime>500</fadetime>
+            <aspectratio>stretch</aspectratio>
+            <include>kenBurnsey</include>
+        </control>
+        <control type="image">
+            <visible>!Integer.IsGreater(container(99999).numitems,0) | Skin.HasSetting(disableExtendedFanart)</visible>
+            <posx>0</posx>
+            <posy>0</posy>
+            <include>dimensionsFullscreen</include>
+            <texture>$INFO[ListItem.Art(fanart)]</texture>
+            <colordiffuse>ffffffff</colordiffuse>
+            <aspectratio>stretch</aspectratio>
+            <include>kenBurnsey</include>
+        </control>
+    </include>
+
+    <!--keyboard autocomplete-->
+    <include name="AutoComplete">
+            <control type="group">
+            <visible>!String.IsEmpty(Control.GetLabel(312).index(1)) + !Control.IsVisible(313)</visible>
+            <posx>0</posx>
+            <posy>0</posy>
+            <control type="group">
+                <animation effect="fade" time="300" tween="cubic" start="0" end="100" reversible="false" condition="!String.IsEmpty(Container(5000).ListItem.Label)">Conditional</animation>
+                <animation effect="fade" time="150" tween="cubic" start="100" end="0" reversible="false" condition="String.IsEmpty(Container(5000).ListItem.Label)">Conditional</animation>
+            </control>
+            <control type="panel" id="5000">
+                <posx>col-5-begin</posx>
+                <posy>-36</posy>
+                <width>16-col</width>
+                <height>2-row</height>
+                <onleft>5000</onleft>
+                <onright>5000</onright>
+                <ondown>312</ondown>
+                <onback>noop</onback>
+                <orientation>horizontal</orientation>
+                <itemlayout height="2-row" width="4-col">
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>4-col-gutter</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <textcolor>textDisabled</textcolor>
+                        <font>itemTitle</font>
+                        <label>$INFO[ListItem.Label]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout height="2-row" width="4-col">
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>4-col-gutter</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <textcolor>textActive</textcolor>
+                        <font>itemTitle</font>
+                        <label>$INFO[ListItem.Label]</label>
+                    </control>
+                </focusedlayout>
+                <content>plugin://plugin.program.autocompletion?info=autocomplete&amp;&amp;id=$INFO[Control.GetLabel(312).index(1)]&amp;&amp;limit=8</content>
+            </control>
+        </control>
+    </include>
+
     <!--modal dialogs-->
     <include name="modalDialog">
         <control type="image">
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index 98f2977..7106805 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -53,7 +53,7 @@
                 <width>col-5-begin</width>
                 <height>832</height>
                 <orientation>vertical</orientation>
-                <onleft>activateWindow(1104)</onleft>
+                <onleft condition="!window.isactive(home)">activateWindow(1104)</onleft>
                 <onright>9999</onright>
                 <onback>activateWindow(home)</onback>
                 <itemlayout width="col-5-begin" height="2-row">
diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml
index e5771a6..302ed34 100644
--- a/1080i/Includes_hubOptionsItems.xml
+++ b/1080i/Includes_hubOptionsItems.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-    <!--home submenu items-->
-    <include name="homeSideMenu">
-        <control type="button" id="506">
-            <description>Menu editor (Home)</description>
-            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <focusedcolor>textActive</focusedcolor>
-            <width>6-col</width>
-            <label>31041</label>
-            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=mainmenu)</onclick>
-        </control>
-    </include>
     <!--video submenu items-->
     <include name="videoSideMenu">
         <control type="button" id="506">
@@ -41,15 +30,6 @@
             <width>6-col</width>
             <onclick>sendclick(videos,4)</onclick>
         </control>
-        <control type="button" id="505">
-            <description>Menu shortcuts</description>
-            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <focusedcolor>textActive</focusedcolor>
-            <width>6-col</width>
-            <label>31041</label>
-            <onclick>dialog.close(1104)</onclick>
-            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=videosubmenu)</onclick>
-        </control>
         <control type="button" id="508">
             <visible>PVR.HasTVChannels</visible>
             <description>PVR Timers</description>
@@ -135,14 +115,6 @@
             <onclick>dialog.close(1104)</onclick>
             <onclick>ActivateWindow(RadioTimerRules)</onclick>
         </control>
-        <control type="button" id="503">
-            <width>6-col</width>
-            <focusedcolor>textActive</focusedcolor>
-            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <label>31041</label>
-            <onclick>dialog.close(1104)</onclick>
-            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=musicsubmenu)</onclick>
-        </control>
         <control type="button" id="504">
             <width>6-col</width>
             <focusedcolor>textActive</focusedcolor>
@@ -173,14 +145,6 @@
             <alttexturefocus colordiffuse="highlight">colors/white.png</alttexturefocus>
             <onclick>sendclick(pictures,4)</onclick>
         </control>
-        <control type="button" id="5">
-            <width>6-col</width>
-            <focusedcolor>textActive</focusedcolor>
-            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <label>31041</label>
-            <onclick>dialog.close(1104)</onclick>
-            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=picturessubmenu)</onclick>
-        </control>
     </include>
     <!--pictures submenu items-->
     <include name="addonsSideMenu">
diff --git a/1080i/Includes_mediaShowcase.xml b/1080i/Includes_mediaShowcase.xml
new file mode 100644
index 0000000..0e1c2ae
--- /dev/null
+++ b/1080i/Includes_mediaShowcase.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+    <!--media showcase-->
+    <include name="itemShowcase">
+        <!--list container to hold extrafanart-->
+        <control type="list" id="99999">
+            <posx>-4</posx>
+            <posy>-4</posy>
+            <width>4</width>
+            <height>4</height>
+            <enable>false</enable>
+            <preloaditems>2</preloaditems>
+            <itemlayout />
+            <focusedlayout />
+            <content>$VAR[extraFanartLocation]</content>
+        </control>
+
+        <!--
+        <control type="image">
+            <visible>Integer.IsGreater(container(99999).numitems,0) + !Skin.HasSetting(disableExtendedFanart)</visible>
+            <include>dimensionsFullscreen</include>
+            <texture>$INFO[container(99999).listitem.filenameandpath,,]</texture>
+            <colordiffuse>ffffffff</colordiffuse>
+            <aspectratio>stretch</aspectratio>
+        </control>
+        -->
+
+        <control type="grouplist" id="99998">
+              <posx>0</posx>
+              <posy>row-7-begin</posy>
+              <width>fullscreenWidth</width>
+              <height>fullscreenHeight</height>
+              <itemgap>36</itemgap>
+              <scrolltime tween="sine" easing="out">1000</scrolltime>
+              <orientation>horizontal</orientation>
+
+              <!--NOOO!! set images to be buttons instead???-->
+
+              <control type="image">
+                  <width>960</width>
+                  <height>540</height>
+                  <texture>$INFO[container(99999).ListItemNoWrap(0).filenameandpath,,]</texture>
+                  <colordiffuse>ffffffff</colordiffuse>
+                  <aspectratio>stretch</aspectratio>
+            </control>
+
+            <control type="image" id="100">
+                  <width>360</width>
+                  <height>540</height>
+                  <texture>$INFO[listitem.art(poster)]</texture>
+                  <colordiffuse>ffffffff</colordiffuse>
+                  <aspectratio>stretch</aspectratio>
+              </control>
+
+            <control type="image">
+                  <visible>!isempty(container(99999).ListItemNoWrap(1).filenameandpath,,)</visible>
+                  <width>960</width>
+                  <height>540</height>
+                  <texture>$INFO[container(99999).ListItemNoWrap(1).filenameandpath,,]</texture>
+                  <colordiffuse>ffffffff</colordiffuse>
+                  <aspectratio>stretch</aspectratio>
+            </control>
+
+            <control type="image">
+                  <visible>!isempty(container(99999).ListItemNoWrap(2).filenameandpath,,)</visible>
+                  <width>960</width>
+                  <height>540</height>
+                  <texture>$INFO[container(99999).ListItemNoWrap(2).filenameandpath,,]</texture>
+                  <colordiffuse>ffffffff</colordiffuse>
+                  <aspectratio>stretch</aspectratio>
+            </control>
+
+            <control type="image">
+                  <visible>!isempty(container(99999).ListItemNoWrap(3).filenameandpath,,)</visible>
+                  <width>960</width>
+                  <height>540</height>
+                  <texture>$INFO[container(99999).ListItemNoWrap(3).filenameandpath,,]</texture>
+                  <colordiffuse>ffffffff</colordiffuse>
+                  <aspectratio>stretch</aspectratio>
+            </control>
+
+            <control type="image">
+                  <visible>!isempty(container(99999).ListItemNoWrap(4).filenameandpath,,)</visible>
+                  <width>960</width>
+                  <height>540</height>
+                  <texture>$INFO[container(99999).ListItemNoWrap(4).filenameandpath,,]</texture>
+                  <colordiffuse>ffffffff</colordiffuse>
+                  <aspectratio>stretch</aspectratio>
+            </control>
+        </control>
+
+        <control type="group">
+            <control type="button" id="1">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>1-col</width>
+                <height>2-row</height>
+                <onleft>2</onleft>
+                <onright>2</onright>
+                <onclick>Control.setfocus(99998,3)</onclick>
+            </control>
+            <control type="button" id="2">
+                <posx>1-col</posx>
+                <posy>0</posy>
+                <width>1-col</width>
+                <height>2-row</height>
+                <onleft>1</onleft>
+                <onright>1</onright>
+                <onclick>Control.Move(99998,1)</onclick>
+            </control>
+        </control>
+
+
+    </include>
+</includes>
\ No newline at end of file
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index ac805d6..aacb8fb 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -88,4 +88,10 @@
         <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) | window.isactive(musicplaylist)"></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) | window.isactive(videoplaylist)"></value>
     </variable>
+    <!--extra fanart sourcing-->
+    <variable name="extraFanartLocation">
+        <value condition="container.content(movies)">$INFO[listitem.path,,extrafanart]</value>
+        <value condition="container.content(tvshows)">$INFO[listitem.filenameandpath,,extrafanart]</value>
+        <value condition="container.content(seasons)">$INFO[container.listitem.path,,extrafanart]</value>
+    </variable>
 </includes>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 06ddabb..64923a1 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -71,7 +71,7 @@
         <include>DebugGrid</include>
         <control type="label">
             <include>WindowID</include>
-            <label>MyVideoNav.xml folderpath: $INFO[container.folderpath] • foldername: $INFO[container.foldername] • content: $INFO[container.content]</label>
+            <label>MyVideoNav.xml $INFO[container.folderpath]</label>
         </control>
     </controls>
 </window>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 5980b2a..ae52c6c 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -228,6 +228,14 @@
                     <label>31174</label>
                     <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=picturessubmenu)</onclick>
                 </control>
+                <control type="radiobutton" id="16">
+                    <visible>Container(8000).Hasfocus(1)</visible>
+                    <description>Extended Fanart</description>
+                    <width>14-col</width>
+                    <label>31220</label>
+                    <onclick>Skin.ToggleSetting(disableExtendedFanart)</onclick>
+                    <selected>Skin.HasSetting(disableExtendedFanart)</selected>
+                </control>
             </control>
         </control>
         <!--debugging-->
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 36144a5..78fa3e3 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -7,17 +7,7 @@
             <control type="group">
                 <visible>!Substring(Container.folderpath,plugin)</visible>
                 <posy>-100</posy>
-                <control type="image">
-                    <include>dimensionsFullscreen</include>
-                    <aspectratio scalediffuse="false">stretch</aspectratio>
-                    <texture background="true" fallback="colors/offblack.png" border="0">$INFO[container.art(fanart)]</texture>
-                    <colordiffuse>ffffffff</colordiffuse>
-                    <animation type="conditional" condition="!controlgroup(9000).hasfocus + !Skin.HasSetting(lowPowerMode)" loop="true" reversible="false">
-                        <effect type="fade" start="0" end="100" time="2000"/>
-                        <effect type="zoom" center="auto" start="130" end="100" time="15000"/>
-                        <effect type="fade" start="100" end="0" time="1000" delay="14000"/>
-                    </animation>
-                </control>
+                <include>itemFanart</include>
                 <control type="image">
                     <include>dimensionsFullscreen</include>
                     <texture>vignette.png</texture>
diff --git a/1080i/script-skinshortcuts-includes.xml b/1080i/script-skinshortcuts-includes.xml
index cb4aaf4..e6f4b60 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>$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,16 +55,16 @@
 		<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>
 			<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>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="submenuVisibility">script-globalsearch</property>
 			<property name="group">mainmenu</property>
@@ -73,7 +73,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 +90,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 +107,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>
@@ -123,12 +123,12 @@
 			<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="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 +145,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 +166,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 +183,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 +200,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>
@@ -216,7 +216,7 @@
 		<item id="13">
 			<property name="id">$NUMBER[13]</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>
@@ -232,7 +232,7 @@
 		<item id="14">
 			<property name="id">$NUMBER[14]</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>
@@ -304,11 +304,11 @@
 			<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>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
 			<visible>StringCompare(System.ProfileName,Test profile)</visible>
 			<property name="submenuVisibility">script-globalsearch</property>
 			<property name="group">mainmenu</property>
@@ -508,55 +508,6 @@
 			<property name="group">dvd</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">7</property>
-			<label>$LOCALIZE[20389]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">musicvideos</property>
-			<property name="defaultID">musicvideos</property>
-			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
-			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
-			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
-			<property name="list">videodb://musicvideos/titles/</property>
-			<visible>StringCompare(System.ProfileName,Master user)</visible>
-			<property name="group">videos</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">7</property>
-			<label>$LOCALIZE[744]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">744</property>
-			<property name="defaultID">744</property>
-			<onclick>ActivateWindow(Videos,Files,return)</onclick>
-			<property name="path">ActivateWindow(Videos,Files,return)</property>
-			<property name="list">Files</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
-			<property name="group">videos</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">7</property>
-			<label>$LOCALIZE[1037]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1037</property>
-			<property name="defaultID">1037</property>
-			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Videos,Addons,return)</property>
-			<property name="list">Addons</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
-			<property name="group">videos</property>
-			<property name="isSubmenu">True</property>
-		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">9</property>
@@ -690,7 +641,7 @@
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">15</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>
@@ -707,8 +658,27 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31147]</label>
+			<label2>Common menu item</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">script.globalsearch</property>
+			<property name="defaultID">script.globalsearch</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31005]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31005</property>
@@ -721,11 +691,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31215]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31215</property>
@@ -739,11 +709,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31112]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31112</property>
@@ -757,11 +727,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31165]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31165</property>
@@ -775,11 +745,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[342]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">movies</property>
@@ -793,11 +763,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">tvshows</property>
@@ -811,11 +781,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">tvshows--0</property>
@@ -829,11 +799,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31088]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31088</property>
@@ -846,11 +816,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[136]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">136</property>
@@ -863,11 +833,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[744]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">744</property>
@@ -901,6 +871,25 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">16</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -915,8 +904,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31031]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -933,8 +922,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -951,8 +940,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -969,8 +958,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -987,8 +976,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1005,8 +994,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1023,8 +1012,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1041,8 +1030,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1059,8 +1048,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1076,8 +1065,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="12">
-			<property name="id">$NUMBER[12]</property>
+		<item id="13">
+			<property name="id">$NUMBER[13]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1094,8 +1083,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="13">
-			<property name="id">$NUMBER[13]</property>
+		<item id="14">
+			<property name="id">$NUMBER[14]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1112,8 +1101,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="14">
-			<property name="id">$NUMBER[14]</property>
+		<item id="15">
+			<property name="id">$NUMBER[15]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1129,8 +1118,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="15">
-			<property name="id">$NUMBER[15]</property>
+		<item id="16">
+			<property name="id">$NUMBER[16]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1149,6 +1138,25 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">17</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</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">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1163,8 +1171,8 @@
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
@@ -1395,6 +1403,25 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">15</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -1409,8 +1436,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31215]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -1427,8 +1454,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31112]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -1445,8 +1472,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31165]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -1463,8 +1490,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[342]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -1481,8 +1508,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -1499,8 +1526,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -1517,8 +1544,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31088]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -1534,8 +1561,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -1551,8 +1578,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -1589,6 +1616,25 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">16</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -1603,8 +1649,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31031]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1621,8 +1667,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1639,8 +1685,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1657,8 +1703,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1675,8 +1721,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1693,8 +1739,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1711,8 +1757,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1729,8 +1775,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1747,8 +1793,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1764,8 +1810,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="12">
-			<property name="id">$NUMBER[12]</property>
+		<item id="13">
+			<property name="id">$NUMBER[13]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1782,8 +1828,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="13">
-			<property name="id">$NUMBER[13]</property>
+		<item id="14">
+			<property name="id">$NUMBER[14]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1800,8 +1846,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="14">
-			<property name="id">$NUMBER[14]</property>
+		<item id="15">
+			<property name="id">$NUMBER[15]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1817,8 +1863,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="15">
-			<property name="id">$NUMBER[15]</property>
+		<item id="16">
+			<property name="id">$NUMBER[16]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -1837,6 +1883,25 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">17</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</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[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1851,8 +1916,8 @@
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
@@ -1978,55 +2043,7 @@
 		<description>No items</description>
 	</include>
 	<include name="skinshortcuts-group-videos">
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">7</property>
-			<label>$LOCALIZE[20389]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">musicvideos</property>
-			<property name="defaultID">musicvideos</property>
-			<visible>Library.HasContent(MusicVideos)</visible>
-			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
-			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
-			<property name="list">videodb://musicvideos/titles/</property>
-			<visible>StringCompare(System.ProfileName,Master user)</visible>
-			<property name="group">videos</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">7</property>
-			<label>$LOCALIZE[744]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">744</property>
-			<property name="defaultID">744</property>
-			<onclick>ActivateWindow(Videos,Files,return)</onclick>
-			<property name="path">ActivateWindow(Videos,Files,return)</property>
-			<property name="list">Files</property>
-			<visible>StringCompare(System.ProfileName,Master user)</visible>
-			<property name="group">videos</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">7</property>
-			<label>$LOCALIZE[1037]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1037</property>
-			<property name="defaultID">1037</property>
-			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Videos,Addons,return)</property>
-			<property name="list">Addons</property>
-			<visible>StringCompare(System.ProfileName,Master user)</visible>
-			<property name="group">videos</property>
-			<property name="isSubmenu">True</property>
-		</item>
+		<description>No items</description>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">7</property>
@@ -2078,55 +2095,7 @@
 		</item>
 	</include>
 	<include name="skinshortcuts-group-alt-videos">
-		<item id="1">
-			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">7</property>
-			<label>$LOCALIZE[20389]</label>
-			<label2>$ADDON[script.skinshortcuts 32034]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">musicvideos</property>
-			<property name="defaultID">musicvideos</property>
-			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
-			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
-			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
-			<property name="list">videodb://musicvideos/titles/</property>
-			<visible>StringCompare(System.ProfileName,Master user)</visible>
-			<property name="group">videos</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">7</property>
-			<label>$LOCALIZE[744]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">744</property>
-			<property name="defaultID">744</property>
-			<onclick>ActivateWindow(Videos,Files,return)</onclick>
-			<property name="path">ActivateWindow(Videos,Files,return)</property>
-			<property name="list">Files</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
-			<property name="group">videos</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">7</property>
-			<label>$LOCALIZE[1037]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">1037</property>
-			<property name="defaultID">1037</property>
-			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
-			<property name="path">ActivateWindow(Videos,Addons,return)</property>
-			<property name="list">Addons</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
-			<property name="group">videos</property>
-			<property name="isSubmenu">True</property>
-		</item>
+		<description>No items</description>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">7</property>
@@ -2742,7 +2711,7 @@
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">15</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>
@@ -2759,8 +2728,27 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31147]</label>
+			<label2>Common menu item</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">script.globalsearch</property>
+			<property name="defaultID">script.globalsearch</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31005]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31005</property>
@@ -2773,11 +2761,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31215]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31215</property>
@@ -2791,11 +2779,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31112]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31112</property>
@@ -2809,11 +2797,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31165]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31165</property>
@@ -2827,11 +2815,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[342]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">movies</property>
@@ -2845,11 +2833,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">tvshows</property>
@@ -2863,11 +2851,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">tvshows--0</property>
@@ -2881,11 +2869,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31088]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31088</property>
@@ -2898,11 +2886,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[136]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">136</property>
@@ -2915,11 +2903,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[744]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">744</property>
@@ -2953,6 +2941,25 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">15</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2967,8 +2974,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31215]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -2985,8 +2992,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31112]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3003,8 +3010,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31165]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3021,8 +3028,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[342]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3039,8 +3046,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3057,8 +3064,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3075,8 +3082,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31088]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3092,8 +3099,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3109,8 +3116,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3132,7 +3139,7 @@
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">15</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>
@@ -3149,8 +3156,27 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31147]</label>
+			<label2>Common menu item</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">script.globalsearch</property>
+			<property name="defaultID">script.globalsearch</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31005]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31005</property>
@@ -3163,11 +3189,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31215]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31215</property>
@@ -3181,11 +3207,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31112]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31112</property>
@@ -3199,11 +3225,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31165]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31165</property>
@@ -3217,11 +3243,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[342]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">movies</property>
@@ -3235,11 +3261,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">tvshows</property>
@@ -3253,11 +3279,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">tvshows--0</property>
@@ -3271,11 +3297,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31088]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31088</property>
@@ -3288,11 +3314,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[136]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">136</property>
@@ -3305,11 +3331,11 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[744]</label>
-			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">744</property>
@@ -3343,6 +3369,25 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">15</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3357,8 +3402,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31215]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3375,8 +3420,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31112]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3393,8 +3438,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31165]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3411,8 +3456,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[342]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3429,8 +3474,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3447,8 +3492,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3465,8 +3510,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[31088]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3482,8 +3527,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3499,8 +3544,8 @@
 			<property name="group">videosubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">15</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
@@ -3539,6 +3584,25 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">16</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3553,8 +3617,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31031]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3571,8 +3635,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3589,8 +3653,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3607,8 +3671,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3625,8 +3689,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3643,8 +3707,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3661,8 +3725,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3679,8 +3743,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3697,8 +3761,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3714,8 +3778,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="12">
-			<property name="id">$NUMBER[12]</property>
+		<item id="13">
+			<property name="id">$NUMBER[13]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3732,8 +3796,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="13">
-			<property name="id">$NUMBER[13]</property>
+		<item id="14">
+			<property name="id">$NUMBER[14]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3750,8 +3814,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="14">
-			<property name="id">$NUMBER[14]</property>
+		<item id="15">
+			<property name="id">$NUMBER[15]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3767,8 +3831,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="15">
-			<property name="id">$NUMBER[15]</property>
+		<item id="16">
+			<property name="id">$NUMBER[16]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3805,6 +3869,25 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">16</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>StringCompare(System.ProfileName,Test profile)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3819,8 +3902,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31031]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3837,8 +3920,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3855,8 +3938,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3873,8 +3956,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3891,8 +3974,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3909,8 +3992,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3927,8 +4010,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3945,8 +4028,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3963,8 +4046,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3980,8 +4063,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="12">
-			<property name="id">$NUMBER[12]</property>
+		<item id="13">
+			<property name="id">$NUMBER[13]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -3998,8 +4081,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="13">
-			<property name="id">$NUMBER[13]</property>
+		<item id="14">
+			<property name="id">$NUMBER[14]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4016,8 +4099,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="14">
-			<property name="id">$NUMBER[14]</property>
+		<item id="15">
+			<property name="id">$NUMBER[15]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4033,8 +4116,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="15">
-			<property name="id">$NUMBER[15]</property>
+		<item id="16">
+			<property name="id">$NUMBER[16]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4073,6 +4156,25 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">16</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -4087,8 +4189,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31031]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4105,8 +4207,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4123,8 +4225,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4141,8 +4243,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4159,8 +4261,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4177,8 +4279,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4195,8 +4297,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4213,8 +4315,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4231,8 +4333,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4248,8 +4350,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="12">
-			<property name="id">$NUMBER[12]</property>
+		<item id="13">
+			<property name="id">$NUMBER[13]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4266,8 +4368,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="13">
-			<property name="id">$NUMBER[13]</property>
+		<item id="14">
+			<property name="id">$NUMBER[14]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4284,8 +4386,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="14">
-			<property name="id">$NUMBER[14]</property>
+		<item id="15">
+			<property name="id">$NUMBER[15]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4301,8 +4403,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="15">
-			<property name="id">$NUMBER[15]</property>
+		<item id="16">
+			<property name="id">$NUMBER[16]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4339,6 +4441,25 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<property name="mainmenuid">16</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
+			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>$LOCALIZE[10005]</label2>
 			<icon>DefaultAddon.png</icon>
@@ -4353,8 +4474,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="3">
-			<property name="id">$NUMBER[3]</property>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31031]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4371,8 +4492,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4389,8 +4510,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4407,8 +4528,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4425,8 +4546,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4443,8 +4564,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4461,8 +4582,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4479,8 +4600,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4497,8 +4618,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4514,8 +4635,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="12">
-			<property name="id">$NUMBER[12]</property>
+		<item id="13">
+			<property name="id">$NUMBER[13]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4532,8 +4653,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="13">
-			<property name="id">$NUMBER[13]</property>
+		<item id="14">
+			<property name="id">$NUMBER[14]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4550,8 +4671,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="14">
-			<property name="id">$NUMBER[14]</property>
+		<item id="15">
+			<property name="id">$NUMBER[15]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4567,8 +4688,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="15">
-			<property name="id">$NUMBER[15]</property>
+		<item id="16">
+			<property name="id">$NUMBER[16]</property>
 			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$LOCALIZE[10005]</label2>
@@ -4589,6 +4710,25 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">17</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</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">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -4603,8 +4743,8 @@
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
@@ -4623,6 +4763,25 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">17</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</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[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -4637,8 +4796,8 @@
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
@@ -4659,6 +4818,25 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">17</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</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">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -4673,8 +4851,8 @@
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
@@ -4693,6 +4871,25 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">17</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>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(script.globalsearch)</onclick>
+			<property name="path">InstallAddon(script.globalsearch)</property>
+			<property name="list">InstallAddon(script.globalsearch)</property>
+			<onclick condition="!system.hasaddon(script.globalsearch)">InstallAddon(plugin.program.autocompletion)</onclick>
+			<onclick condition="system.hasaddon(script.globalsearch)">RunScript(script.globalsearch)</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[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -4707,8 +4904,8 @@
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="2">
-			<property name="id">$NUMBER[2]</property>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
diff --git a/addon.xml b/addon.xml
index 86b9707..396408f 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.pellucid" version="1.1.1" name="Pellucid" provider-name="theDeadman">
+<addon id="skin.pellucid" version="1.2.0" 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 fec2112..fd413eb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,12 @@
 **Changelog**
 
 [PLANNED WORKS]
-- expand image handling
+
+
+[V1.2.0]
+- [NEW] Extended fanart support for video info and seasons (active by default)
+- [NEW] User option: disable extended fanart
+- [NEW] Keyboard autocomplete support
 
 [V1.1.1]
 - [FIXED] Aspect ratio incorrect in poster view (thanks wiiija)
diff --git a/language/English/strings.po b/language/English/strings.po
index 17897dd..3fd8a2c 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -905,3 +905,7 @@ msgctxt "#31219"
 msgid "Download art"
 msgstr ""
 
+msgctxt "#31220"
+msgid "Disable extended fanart"
+msgstr ""
+
diff --git a/shortcuts/mainmenu.DATA.xml b/shortcuts/mainmenu.DATA.xml
index cdca626..d2f99fc 100644
--- a/shortcuts/mainmenu.DATA.xml
+++ b/shortcuts/mainmenu.DATA.xml
@@ -24,13 +24,11 @@
         <action>EjectTray()</action>
     </shortcut>
     <shortcut>
-        <visible>System.HasAddon(script.globalsearch)</visible>
         <label>31147</label>
         <label2>32034</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
         <action>RunScript(script.globalsearch)</action>
-        <action>right</action>
     </shortcut>
     <shortcut>
         <visible>PVR.HasTVChannels</visible>
diff --git a/shortcuts/musicsubmenu.DATA.xml b/shortcuts/musicsubmenu.DATA.xml
index d638ce2..2c2d9f0 100644
--- a/shortcuts/musicsubmenu.DATA.xml
+++ b/shortcuts/musicsubmenu.DATA.xml
@@ -8,6 +8,13 @@
         <thumb />
         <action>activateWindow(1103)</action>
     </shortcut>
+    <shortcut>
+        <label>31147</label>
+        <label2>32034</label2>
+        <icon>DefaultAddon.png</icon>
+        <thumb />
+        <action>RunScript(script.globalsearch)</action>
+    </shortcut>
     <shortcut>
         <label>31005</label>
         <label2>10005</label2>
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index 697cf0f..f5e32bc 100644
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -15,6 +15,17 @@
         <action>::ACTION::</action>
     </override>
 
+    <override action="RunScript(script.globalsearch)">
+        <condition>!system.hasaddon(script.globalsearch)</condition>
+        <action>InstallAddon(script.globalsearch)</action>
+        <action>InstallAddon(plugin.program.autocompletion)</action>
+    </override>
+
+    <override action="RunScript(script.globalsearch)">
+        <condition>system.hasaddon(script.globalsearch)</condition>
+        <action>::ACTION::</action>
+    </override>
+
     <groupoverride group="videosubmenu" condition="true">control.setfocus(9999)</groupoverride>
     <groupoverride group="musicsubmenu" condition="true">control.setfocus(9999)</groupoverride>
     <groupoverride group="picturessubmenu" condition="true">control.setfocus(9999)</groupoverride>
diff --git a/shortcuts/picturessubmenu.DATA.xml b/shortcuts/picturessubmenu.DATA.xml
index 7328f75..d1d21f5 100644
--- a/shortcuts/picturessubmenu.DATA.xml
+++ b/shortcuts/picturessubmenu.DATA.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shortcuts>
+    <shortcut>
+        <label>31147</label>
+        <label2>32034</label2>
+        <icon>DefaultAddon.png</icon>
+        <thumb />
+        <action>RunScript(script.globalsearch)</action>
+    </shortcut>
     <shortcut>
         <label>744</label>
         <label2>32020</label2>
diff --git a/shortcuts/videosubmenu.DATA.xml b/shortcuts/videosubmenu.DATA.xml
index a08b73f..1e1ab4f 100644
--- a/shortcuts/videosubmenu.DATA.xml
+++ b/shortcuts/videosubmenu.DATA.xml
@@ -8,6 +8,13 @@
         <thumb />
         <action>action(FullScreen)</action>
     </shortcut>
+    <shortcut>
+        <label>31147</label>
+        <label2>32034</label2>
+        <icon>DefaultAddon.png</icon>
+        <thumb />
+        <action>RunScript(script.globalsearch)</action>
+    </shortcut>
     <shortcut>
         <label>31005</label>
         <label2>32014</label2>