From fcb54e1783b7c64bc925c0c45c743e001195cf1e Mon Sep 17 00:00:00 2001
From: realcopacetic <ahekmat400@googlemail.com>
Date: Thu, 25 Apr 2024 14:22:50 +0100
Subject: [PATCH] globalsearch

---
 16x9/Actions.xml                            |  42 ++++--
 16x9/Buttons_Infoscreen_Path_Tracer.xml     |   4 +-
 16x9/Colors.xml                             |  24 +++-
 16x9/Components_Viewtypes.xml               |  36 -----
 16x9/Custom_1180_globalsearch.xml           |  39 ++++++
 16x9/Expressions.xml                        |   3 +-
 16x9/Home.xml                               |  20 ++-
 16x9/Navigation.xml                         | 138 ++++++++++++++++++--
 16x9/Scrollbars.xml                         |  31 ++++-
 16x9/Templates_Widgets.xml                  | 129 +++++++++++++++++-
 16x9/Variables_Labels_Media.xml             |   9 ++
 16x9/Variables_Paths_Widgets.xml            |  34 ++++-
 16x9/Variables_Textures_Artwork_Widgets.xml |   7 +
 16x9/Viewtype_504_Strip.xml                 |   8 +-
 16x9/_IDs                                   |   1 +
 README.md                                   |   3 +
 addon.xml                                   |   2 +-
 17 files changed, 451 insertions(+), 79 deletions(-)
 create mode 100644 16x9/Custom_1180_globalsearch.xml

diff --git a/16x9/Actions.xml b/16x9/Actions.xml
index f1782479..5a3f7e1c 100644
--- a/16x9/Actions.xml
+++ b/16x9/Actions.xml
@@ -26,15 +26,15 @@
 		<param name="type" default="videos" />
 		<param name="method" default="from_here" />
 		<definition>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3201)">RunScript(script.copacetic.helper,action=play_items,id=3201,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3202)">RunScript(script.copacetic.helper,action=play_items,id=3202,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3203)">RunScript(script.copacetic.helper,action=play_items,id=3203,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3204)">RunScript(script.copacetic.helper,action=play_items,id=3204,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3205)">RunScript(script.copacetic.helper,action=play_items,id=3205,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3206)">RunScript(script.copacetic.helper,action=play_items,id=3206,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3207)">RunScript(script.copacetic.helper,action=play_items,id=3207,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3208)">RunScript(script.copacetic.helper,action=play_items,id=3208,type=$PARAM[type],method=$PARAM[method])</onclick>
-			<onclick condition="System.AddonIsEnabled(script.copacetic.helper) + Control.HasFocus(3209)">RunScript(script.copacetic.helper,action=play_items,id=3209,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3201)">RunScript(script.copacetic.helper,action=play_items,id=3201,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3202)">RunScript(script.copacetic.helper,action=play_items,id=3202,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3203)">RunScript(script.copacetic.helper,action=play_items,id=3203,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3204)">RunScript(script.copacetic.helper,action=play_items,id=3204,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3205)">RunScript(script.copacetic.helper,action=play_items,id=3205,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3206)">RunScript(script.copacetic.helper,action=play_items,id=3206,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3207)">RunScript(script.copacetic.helper,action=play_items,id=3207,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3208)">RunScript(script.copacetic.helper,action=play_items,id=3208,type=$PARAM[type],method=$PARAM[method])</onclick>
+			<onclick condition="Control.HasFocus(3209)">RunScript(script.copacetic.helper,action=play_items,id=3209,type=$PARAM[type],method=$PARAM[method])</onclick>
 		</definition>
 	</include>
 
@@ -110,6 +110,11 @@
 		<onclick>ActivateWindow(music,musicdb://albums/$INFO[Container.ListItem.DBID]/-2/?albumid=$INFO[Container.ListItem.DBID],return)</onclick>
 	</include>
 
+	<include name="ClickAction_Play_All_Videos">
+		<onclick>Dialog.Close(all)</onclick>
+		<include content="Default_Play_Items" />
+	</include>
+
 	<include name="ClickAction_Play_All_Songs">
 		<include content="Default_Play_Items">
 			<param name="type" value="music" />
@@ -123,16 +128,33 @@
 		<onclick condition="Integer.IsGreater(ListItem.DBID,0) + !String.IsEqual(Container(3201).ListItem.DBID,window(movieinformation).property(SelectedItem))">PlayMedia($ESCINFO[ListItem.Filenameandpath])</onclick>
 	</include>
 
+	<include name="ClickAction_Play_File">
+		<onclick>Dialog.Close(all)</onclick>
+		<onclick>PlayMedia($ESCINFO[ListItem.Filenameandpath])</onclick>
+	</include>
+
 	<include name="ClickAction_Open_Season_Folder">
 		<onclick condition="Integer.IsGreater(ListItem.DBID,0)">Dialog.Close(all)</onclick>
 		<onclick condition="Integer.IsGreater(ListItem.DBID,0)">SetProperty(SentFromInfo,true,movieinformation)</onclick>
 		<onclick condition="Integer.IsGreater(ListItem.DBID,0)">ActivateWindow(Videos,$INFO[Container(3202).ListItem.FolderPath]/,return)</onclick>
 	</include>
 
+	<include name="ClickAction_Open_Artist">
+		<onclick>Dialog.Close(all)</onclick>
+		<onclick>SetProperty(SentFromInfo,true,musicinformation)</onclick>
+		<onclick condition="Control.HasFocus(3204)">ActivateWindow(music,musicdb://artists/$INFO[Container(3202).ListItem.DBID]/,return)</onclick>
+	</include>
+
 	<include name="ClickAction_Open_Album">
 		<onclick>Dialog.Close(all)</onclick>
 		<onclick>SetProperty(SentFromInfo,true,musicinformation)</onclick>
-		<onclick>ActivateWindow(music,musicdb://albums/$INFO[Container(3202).ListItem.DBID]/-2/,return)</onclick>
+		<onclick condition="Control.HasFocus(3202)">ActivateWindow(music,musicdb://albums/$INFO[Container(3202).ListItem.DBID]/-2/,return)</onclick>
+		<onclick condition="Control.HasFocus(3205)">ActivateWindow(music,musicdb://albums/$INFO[Container(3205).ListItem.DBID]/-2/,return)</onclick>
+	</include>
+
+	<include name="ClickAction_Open_TVShow">
+		<onclick>Dialog.Close(all)</onclick>
+		<onclick>ActivateWindow(videos,videodb://tvshows/titles/$INFO[ListItem.DBID]/,return)</onclick>
 	</include>
 
 	<include name="ClickAction_Open_Set">
diff --git a/16x9/Buttons_Infoscreen_Path_Tracer.xml b/16x9/Buttons_Infoscreen_Path_Tracer.xml
index c5e622da..db9a9990 100644
--- a/16x9/Buttons_Infoscreen_Path_Tracer.xml
+++ b/16x9/Buttons_Infoscreen_Path_Tracer.xml
@@ -59,7 +59,7 @@
 
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + String.IsEmpty(Window(home).Property(Origin))">ClearProperty(ContainerPath_1,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + String.IsEmpty(Window(home).Property(Origin))">ClearProperty(Breadcrumb_Level,$PARAM[window])</onfocus>
-				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + String.IsEmpty(Window(home).Property(Origin))">Dialog.Close(all,true)</onfocus>
+				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + String.IsEmpty(Window(home).Property(Origin))">Dialog.Close</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + !String.IsEmpty(Window(home).Property(Origin))">ActivateWindow(home)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1) + !String.IsEmpty(Window(home).Property(Origin))">SetFocus(6001)</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),1)">ClearProperty(Origin,home)</onfocus>
@@ -100,7 +100,7 @@
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),10)">ClearProperty(ContainerPath_10,$PARAM[window])</onfocus>
 				<onfocus condition="String.IsEqual(Window.Property(Breadcrumb_Level),10)">SetProperty(Breadcrumb_Level,9,$PARAM[window])</onfocus>
 
-				<onfocus condition="!String.IsEqual(Window.Property(Breadcrumb_Level),1)">Dialog.Close(all,true)</onfocus>
+				<onfocus condition="!String.IsEqual(Window.Property(Breadcrumb_Level),1)">Dialog.Close</onfocus>
 				<onfocus condition="!String.IsEqual(Window.Property(Breadcrumb_Level),1)">SetFocus(6001)</onfocus>
 
 			</control>
diff --git a/16x9/Colors.xml b/16x9/Colors.xml
index c91c6400..c7e8802c 100644
--- a/16x9/Colors.xml
+++ b/16x9/Colors.xml
@@ -720,7 +720,7 @@
 		<value>$VAR[Primary_Color]</value>
 	</variable>
 	<variable name="Home_Scroll_Widget_Background_Color">
-		<value condition="Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | $EXP[Container_HasBackground]">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | $EXP[Container_HasBackground] | Control.HasFocus(4201)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Theme,Light) + Skin.String(Widget1_View,Showcase)">$VAR[Alpha_15]$VAR[Dark_Hex]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Widget1_View,Strip) + Skin.String(Widget1_Display,Posters) + !String.IsEmpty(Container(3201).ListItemNoWrap(2).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Widget1_View,Strip) + Skin.String(Widget1_Display,Square) + !String.IsEmpty(Container(3201).ListItemNoWrap(1).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
@@ -788,7 +788,7 @@
 		<value>$VAR[Alpha_15]$VAR[Light_Hex]</value>
 	</variable>
 	<variable name="Home_Scroll_Widget_Focused_Color">
-		<value condition="Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | $EXP[Container_HasBackground]">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | $EXP[Container_HasBackground] | Control.HasFocus(4201)">$VAR[Light_Color]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Theme,Light) + Skin.String(Widget1_View,Showcase)">$VAR[Dark_Grey_Color]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Widget1_View,Strip) + Skin.String(Widget1_Display,Posters) + !String.IsEmpty(Container(3201).ListItemNoWrap(2).Label)">$VAR[Light_Color]</value>
 		<value condition="Control.HasFocus(3201) + Skin.String(Widget1_View,Strip) + Skin.String(Widget1_Display,Square) + !String.IsEmpty(Container(3201).ListItemNoWrap(1).Label)">$VAR[Light_Color]</value>
@@ -854,6 +854,26 @@
 		<value condition="Control.HasFocus(3209) + Skin.String(Widget9_View,Grid) + Skin.String(Widget9_Display,Fanart) + !String.IsEmpty(Container(3209).ListItemNoWrap(3).Label)">$VAR[Light_Color]</value>
 		<value>$VAR[Primary_Color]</value>
 	</variable>
+
+	<variable name="globalsearch_Scroll_Widget_Background_Color">
+		<value condition="Control.HasFocus(3201) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3201).ListitemNoWrap(2).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3202) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3202).ListitemNoWrap(2).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3203) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3203).ListitemNoWrap(1).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3204) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3204).ListitemNoWrap(1).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3205) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3205).ListitemNoWrap(2).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="Control.HasFocus(3206) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3206).ListitemNoWrap(2).Label)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value>$VAR[Alpha_15]$VAR[Dark_Hex]</value>
+	</variable>
+	<variable name="globalsearch_Scroll_Widget_Focused_Color">
+		<value condition="Control.HasFocus(3201) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3201).ListitemNoWrap(2).Label)">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3202) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3202).ListitemNoWrap(2).Label)">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3203) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3203).ListitemNoWrap(1).Label)">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3204) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3204).ListitemNoWrap(1).Label)">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3205) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3205).ListitemNoWrap(2).Label)">$VAR[Light_Color]</value>
+		<value condition="Control.HasFocus(3206) + Skin.String(Theme,Light) + !String.IsEmpty(Container(3206).ListitemNoWrap(2).Label)">$VAR[Light_Color]</value>
+		<value>$VAR[Dark_Grey_Color]</value>
+	</variable>
+
 	<variable name="Seekbar_Background_Color">
 		<value condition="Skin.String(Theme,Light) + $EXP[visualisation_Background_IsEmpty] + Skin.String(visualisation_Layout,Large)">$VAR[Alpha_15]$VAR[Dark_Hex]</value>
 		<value>$VAR[Alpha_15]$VAR[Light_Hex]</value>
diff --git a/16x9/Components_Viewtypes.xml b/16x9/Components_Viewtypes.xml
index f59ecba1..e19d9b01 100644
--- a/16x9/Components_Viewtypes.xml
+++ b/16x9/Components_Viewtypes.xml
@@ -99,42 +99,6 @@
 		</control>
 	</include>
 
-	<include name="Media_Cacher">
-		<control type="grouplist">
-			<include content="Hidden_Control" />
-			<control type="image">
-				<width>1</width>
-				<height>1</height>
-				<texture>$INFO[ListItem.Art(clearlogo)]</texture>
-			</control>
-			<control type="image">
-				<width>1</width>
-				<height>1</height>
-				<texture>$INFO[ListItem.Art(clearlogo-alt)]</texture>
-			</control>
-			<control type="image">
-				<width>1</width>
-				<height>1</height>
-				<texture>$INFO[ListItem.Art(clearlogo-billboard)]</texture>
-			</control>
-			<control type="image">
-				<width>1</width>
-				<height>1</height>
-				<texture>$INFO[Container(3100).ListItem.Art(clearlogo)]</texture>
-			</control>
-			<control type="image">
-				<width>1</width>
-				<height>1</height>
-				<texture>$INFO[Container(3100).ListItem.Art(clearlogo-alt)]</texture>
-			</control>
-			<control type="image">
-				<width>1</width>
-				<height>1</height>
-				<texture>$INFO[Container(3100).ListItem.Art(clearlogo-billboard)]</texture>
-			</control>
-		</control>
-	</include>
-
 	<include name="Custom_List">
 		<param name="type" default="fixedlist" />
 		<param name="id" />
diff --git a/16x9/Custom_1180_globalsearch.xml b/16x9/Custom_1180_globalsearch.xml
new file mode 100644
index 00000000..3f4e9fa9
--- /dev/null
+++ b/16x9/Custom_1180_globalsearch.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window type="dialog" id="1180">
+  <!-- global search -->
+  <include content="Widget_Position_Reset_OnLoad" />
+  <defaultcontrol always="true">3000</defaultcontrol>
+  <controls>
+
+    <!-- Button bouncer until containers are populated -->
+    <control type="button" id="3000">
+      <visible allowhiddenfocus="true">false</visible>
+      <animation effect="slide" end="0,0" time="360" reversible="false">Focus</animation>
+      <include content="globalsearch_Focus_Setter">
+        <param name="bounce_id" value="3001" />
+      </include>
+    </control>
+    <control type="button" id="3001">
+      <visible allowhiddenfocus="true">false</visible>
+      <animation effect="slide" end="0,0" time="360" reversible="false">Focus</animation>
+      <include content="globalsearch_Focus_Setter">
+        <param name="bounce_id" value="3000" />
+      </include>
+    </control>
+
+    <control type="group">
+      <visible>!$EXP[Infoscreen_IsVisible]</visible>
+      <include content="Visible_Fade_Delayed_Animation" />
+      <include content="WindowOpenClose_Fade_Delayed_Long_Animation" />
+      <include content="User_Scroll_Delay" />
+      <include content="globalsearch_Widget_3201_Movies" />
+      <include content="globalsearch_Widget_3202_TVShows" />
+      <include content="globalsearch_Widget_3203_Episodes" />
+      <include content="globalsearch_Widget_3204_Artists" />
+      <include content="globalsearch_Widget_3205_Albums" />
+      <include content="globalsearch_Widget_3206_Songs" />
+      <include content="globalsearch_Scrollbar" />
+    </control>
+
+  </controls>
+</window>
\ No newline at end of file
diff --git a/16x9/Expressions.xml b/16x9/Expressions.xml
index e89508ee..387a14e7 100644
--- a/16x9/Expressions.xml
+++ b/16x9/Expressions.xml
@@ -2,7 +2,7 @@
 <includes>
 	
 	<!-- Windows -->
-	<expression name="Home_HasBackground">Window.IsVisible(home) + [String.IsEmpty(Window(home).Property(Home_Widget)) | $EXP[BillboardView_Display_IsFanart_Widget_Home]]</expression>
+	<expression name="Home_HasBackground">Window.IsVisible(home) + [String.IsEmpty(Window(home).Property(Home_Widget)) | $EXP[BillboardView_Display_IsFanart_Widget_Home]] + !$EXP[globalsearch_IsVisible]</expression>
 	<expression name="Settings_Window_IsVisible">Window.IsVisible(settings) | Window.IsVisible(skinsettings) | Window.IsVisible(appearancesettings) | Window.IsVisible(mediasettings) | Window.IsVisible(playersettings) | Window.IsVisible(servicesettings) | Window.IsVisible(systemsettings) | Window.IsVisible(pvrsettings) | Window.IsVisible(gamesettings) | Window.IsVisible(profiles) | Window.IsVisible(systeminfo) | Window.IsVisible(filemanager)</expression>
 	<expression name="Window_HasBackground">Window.IsVisible(addonsettings) + !String.IsEmpty(ListItem.Art(fanart))] | [Window.IsVisible(addonbrowser) + !Container.Content(addons)] | Window.IsVisible(favouritesbrowser) | Window.IsVisible(loginscreen) | Window.IsVisible(musicplaylisteditor)</expression>
 	<expression name="Container_HasBackground">$EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible] | $EXP[ShowcaseView_Display_HasBackground]</expression>
@@ -13,6 +13,7 @@
 	<expression name="Infoscreen_IsVisible">Window.IsVisible(movieinformation) | Window.IsVisible(musicinformation) | Window.IsVisible(songinformation) | Window.IsVisible(addoninformation) | $EXP[Infoscreen_Widget_Transition] | Window.IsVisible(pvrguideinfo) | Window.IsVisible(pvrrecordinginfo)</expression>
 	<expression name="Infoscreen_Widget_HasFocus">$EXP[Infoscreen_IsVisible] + [String.IsEmpty(Window(movieinformation).Property(Focused_Button)) + String.IsEmpty(Window(musicinformation).Property(Focused_Button)) + String.IsEmpty(Window(addoninformation).Property(Focused_Button)) + String.IsEmpty(Window(pvrguideinfo).Property(Focused_Button))]</expression>
 	<expression name="Infoscreen_Widget_Transition">Control.HasFocus(6001) | Control.HasFocus(6002) | String.IsEqual(Window(home).Property(Infoscreen_Transition),true)</expression>
+	<expression name="globalsearch_IsVisible">Window.IsVisible(1180)</expression>
 
 	<expression name="PanelDialog_IsVisible">Window.IsVisible(selectdialog) | Window.IsVisible(selectvideoversion) | !String.IsEmpty(Window(home).Property(SelectDialog)) | Window.IsVisible(filebrowser) | Window.IsVisible(virtualkeyboard) | Window.IsVisible(numericinput) | Window.IsVisible(mediasource) | Window.IsVisible(mediafilter) | Window.IsVisible(smartplaylistrule) | Window.IsVisible(addonsettings) | Window.IsVisible(osdsubtitlesettings) | Window.IsVisible(osdvideosettings) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(networksetup) | Window.IsVisible(profilesettings) | Window.IsVisible(locksettings) | Window.IsVisible(contentsettings) | Window.IsVisible(libexportsettings) | Window.IsVisible(peripheralsettings) | Window.IsVisible(osdcmssettings) | Window.IsVisible(infoprovidersettings) | Window.IsVisible(pvrtimersetting) | Window.IsVisible(gamevideofilter) | Window.IsVisible(visualisationpresetlist) | Window.IsVisible(managevideoversions) | Window.IsVisible(managevideoextras)</expression>
 	<expression name="NoPanelDialog_IsVisible">String.IsEqual(Window(home).Property(OptionsMenu),Active) | Window.IsVisible(shutdownmenu) | Window.IsVisible(contextmenu) | Window.IsVisible(okdialog) | Window.IsVisible(yesnodialog) | Window.IsVisible(progressdialog) | Window.IsVisible(10148) | Window.IsVisible(dialogcolorpicker)</expression>
diff --git a/16x9/Home.xml b/16x9/Home.xml
index 2157c481..02f8af30 100644
--- a/16x9/Home.xml
+++ b/16x9/Home.xml
@@ -35,14 +35,14 @@
 			<include content="Trailer_Autoplay_Fade_Delayed_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 		</include>
 		<control type="group">
-			<visible>[Control.HasFocus(4010) | Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible]</visible>
+			<visible>[Control.HasFocus(4010) | Control.HasFocus(4201) | Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible] + !$EXP[globalsearch_IsVisible]</visible>
 			<include content="VisibleHidden_Fade_Animation" />
 			<include content="Background_Home" />
 			<include content="Home_Clearlogo" condition="Skin.HasSetting(Home_Screensaver_Enabled)" />
 		</control>
 		<!-- Video player -->
 		<include content="Embedded_VideoPlayer">
-			<param name="visible" value="[VideoPlayer.Content(livetv) + [Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible]] | String.IsEqual(Window(home).Property(Trailer_Autoplay),true)" />
+			<param name="visible" value="[VideoPlayer.Content(livetv) + [Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible] + !$EXP[globalsearch_IsVisible]] | String.IsEqual(Window(home).Property(Trailer_Autoplay),true)" />
 		</include>
 		<include content="Trailer_Autoplay_Mask" condition="Skin.HasSetting(Trailer_Autoplay)">
 			<param name="timer" value="trailer_autoplay_home" />
@@ -52,14 +52,26 @@
 			<include content="WindowOpenClose_Fade_Delayed_Long_Animation" />
 			<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 			<control type="group">
-				<visible>Control.HasFocus(3000) | $EXP[Music_Player_HasFocus]</visible>
-				<visible>!$EXP[TransparentDialog_IsVisible] + !$EXP[Infoscreen_IsVisible]</visible>
+				<visible>Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | Control.HasFocus(4201)</visible>
+				<visible>!$EXP[TransparentDialog_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[globalsearch_IsVisible]</visible>
 				<include content="Visible_Fade_Delayed_Animation" />
 				<include content="Horizontal_List">
 					<param name="hidden_id" value="3000" />
 					<param name="focused_color" value="$VAR[Light_Color]" />
 					<param name="unfocused_color" value="$VAR[Light_Color]" />
 				</include>
+				<control type="button" id="4201">
+					<width>120</width>
+					<height>120</height>
+					<left>30</left>
+					<top>30</top>
+					<texturenofocus colordiffuse="$VAR[Light_Color]">icons/icon_browse_unfocused_120.png</texturenofocus>
+					<texturefocus colordiffuse="$VAR[Light_Color]">icons/icon_browse_focused_120.png</texturefocus>
+					<!-- <onclick>Skin.SetString(globalsearch)</onclick> -->
+					<!-- <onclick>ActivateWindow(1180)</onclick> -->
+					<onclick>RunScript(script.copacetic.helper,action=globalsearch_input)</onclick>
+					<include content="globalsearch_home_Navigation" />
+				</control>
 				<include content="Clock" condition="!Skin.HasSetting(Hide_Home_Clock)">
 					<param name="textcolor" value="$VAR[Notification_Widget_Label_Color]" />
 				</include>
diff --git a/16x9/Navigation.xml b/16x9/Navigation.xml
index 904c4e6a..bd0535eb 100644
--- a/16x9/Navigation.xml
+++ b/16x9/Navigation.xml
@@ -193,6 +193,7 @@
 		<onup condition="Window.Is(home) + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + !Control.IsVisible(3203) + !Control.IsVisible(3202) + !Control.IsVisible(3201)">3000</onup>
 		<ondown condition="Window.Is(home)">3000</ondown>
 		<onback condition="Window.Is(home)">3000</onback>
+		<onleft condition="Window.Is(home)">4201</onleft>
 		<onback condition="$EXP[ListView_IsVisible] + !$EXP[Infoscreen_IsVisible]">50</onback>
 		<onleft condition="$EXP[ListView_IsVisible] + !$EXP[Infoscreen_IsVisible]">50</onleft>
 		<onright condition="$EXP[ListView_IsVisible] + Integer.IsLessOrEqual(Container.NumItems,11) + !$EXP[Infoscreen_IsVisible] + !$EXP[Hidden_Options_Menu_Disabled]">SetFocus(3000,0,absolute)</onright>
@@ -225,15 +226,7 @@
 
 	<include name="Home_Menu_Navigation">
 		<onup condition="Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio">SetFocus(3500,1)</onup>
-		<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio] + Control.IsVisible(3209)">3209</onup>
-		<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio]  + !Control.IsVisible(3209) + Control.IsVisible(3208)">3208</onup>
-		<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio]  + !Control.IsVisible(3209) + !Control.IsVisible(3208) + Control.IsVisible(3207)">3207</onup>
-		<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio]  + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + Control.IsVisible(3206)">3206</onup>
-		<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio]  + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + Control.IsVisible(3205)">3205</onup>
-		<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio]  + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + Control.IsVisible(3204)">3204</onup>
-		<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio]  + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + Control.IsVisible(3203)">3203</onup>
-		<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio]  + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + !Control.IsVisible(3203) + Control.IsVisible(3202)">3202</onup>
-		<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio]  + !Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + !Control.IsVisible(3203) + !Control.IsVisible(3202) + Control.IsVisible(3201)">3201</onup>
+		<onup condition="![Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio]">4201</onup>
 		<ondown condition="Control.IsVisible(3201)">3201</ondown>
 		<ondown condition="!Control.IsVisible(3201) + Control.IsVisible(3202)">3202</ondown>
 		<ondown condition="!Control.IsVisible(3201) + !Control.IsVisible(3202) + Control.IsVisible(3203)">3203</ondown>
@@ -246,6 +239,21 @@
 		<include content="Widget_Reset" />
 	</include>
 
+	<include name="globalsearch_home_Navigation">
+		<onup condition="Control.IsVisible(3209)">3209</onup>
+		<onup condition="!Control.IsVisible(3209) + Control.IsVisible(3208)">3208</onup>
+		<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + Control.IsVisible(3207)">3207</onup>
+		<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + Control.IsVisible(3206)">3206</onup>
+		<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + Control.IsVisible(3205)">3205</onup>
+		<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + Control.IsVisible(3204)">3204</onup>
+		<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + Control.IsVisible(3203)">3203</onup>
+		<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + !Control.IsVisible(3203) + Control.IsVisible(3202)">3202</onup>
+		<onup condition="!Control.IsVisible(3209) + !Control.IsVisible(3208) + !Control.IsVisible(3207) + !Control.IsVisible(3206) + !Control.IsVisible(3205) + !Control.IsVisible(3204) + !Control.IsVisible(3203) + !Control.IsVisible(3202) + Control.IsVisible(3201)">3201</onup>
+		<onright condition="Skin.HasSetting(Music_Player_Enabled) + Player.HasAudio">SetFocus(3500,1)</onright>
+		<ondown>SetFocus(3000)</ondown>
+		<onback>SetFocus(3000)</onback>
+	</include>
+
 	<include name="Widget_Reset">
 		<onfocus condition="!String.IsEqual(Container(3201).CurrentItem,1)">Control.Move(3201,$INFO[Container(3201).CurrentItem,-])</onfocus>
 		<onfocus condition="!String.IsEqual(Container(3201).CurrentItem,1)">Control.Move(3201,1)</onfocus>
@@ -480,6 +488,110 @@
 		<onup condition="Control.HasFocus(3201)">SetFocus(3000)</onup>
 	</include>
 
+	<include name="globalsearch_Focus_Setter">
+		<param name="bounce_id" />
+		<definition>
+			<onfocus condition="Integer.IsGreater(Container(3201).NumItems,0)">SetFocus(3201)</onfocus>
+			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">SetFocus(3202)</onfocus>
+			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">SetFocus(3203)</onfocus>
+			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">SetFocus(3204)</onfocus>
+			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">SetFocus(3205)</onfocus>
+			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">SetFocus(3206)</onfocus>
+			<onfocus condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0)">SetFocus($PARAM[bounce_id])</onfocus>
+		</definition>
+	</include>
+
+	<include name="globalsearch_Navigation">
+		<onleft condition="!Container.HasNext">0</onleft>
+		<onright condition="!Container.HasPrevious">0</onright>
+		<ondown condition="Control.HasFocus(3201) + Integer.IsGreater(Container(3202).NumItems,0)">3202</ondown>
+		<ondown condition="Control.HasFocus(3201) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</ondown>
+		<ondown condition="Control.HasFocus(3201) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</ondown>
+		<ondown condition="Control.HasFocus(3201) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</ondown>
+		<ondown condition="Control.HasFocus(3201) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</ondown>
+		<ondown condition="Control.HasFocus(3201) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</ondown>
+		<ondown condition="Control.HasFocus(3202) + Integer.IsGreater(Container(3203).NumItems,0)">3203</ondown>
+		<ondown condition="Control.HasFocus(3202) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</ondown>
+		<ondown condition="Control.HasFocus(3202) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</ondown>
+		<ondown condition="Control.HasFocus(3202) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</ondown>
+		<ondown condition="Control.HasFocus(3202) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</ondown>
+		<ondown condition="Control.HasFocus(3202) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</ondown>
+		<ondown condition="Control.HasFocus(3203) + Integer.IsGreater(Container(3204).NumItems,0)">3204</ondown>
+		<ondown condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</ondown>
+		<ondown condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</ondown>
+		<ondown condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</ondown>
+		<ondown condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</ondown>
+		<ondown condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</ondown>
+		<ondown condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</ondown>
+		<ondown condition="Control.HasFocus(3204) + Integer.IsGreater(Container(3205).NumItems,0)">3205</ondown>
+		<ondown condition="Control.HasFocus(3204) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</ondown>
+		<ondown condition="Control.HasFocus(3204) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</ondown>
+		<ondown condition="Control.HasFocus(3204) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</ondown>
+		<ondown condition="Control.HasFocus(3204) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</ondown>
+		<ondown condition="Control.HasFocus(3204) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</ondown>
+		<ondown condition="Control.HasFocus(3205) + Integer.IsGreater(Container(3206).NumItems,0)">3206</ondown>
+		<ondown condition="Control.HasFocus(3205) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</ondown>
+		<ondown condition="Control.HasFocus(3205) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</ondown>
+		<ondown condition="Control.HasFocus(3205) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</ondown>
+		<ondown condition="Control.HasFocus(3205) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</ondown>
+		<ondown condition="Control.HasFocus(3205) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</ondown>
+		<ondown condition="Control.HasFocus(3206) + Integer.IsGreater(Container(3207).NumItems,0)">3207</ondown>
+		<ondown condition="Control.HasFocus(3206) + !Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</ondown>
+		<ondown condition="Control.HasFocus(3206) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</ondown>
+		<ondown condition="Control.HasFocus(3206) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</ondown>
+		<ondown condition="Control.HasFocus(3206) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</ondown>
+		<ondown condition="Control.HasFocus(3206) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</ondown>
+		<ondown condition="Control.HasFocus(3207) + Integer.IsGreater(Container(3201).NumItems,0)">3201</ondown>
+		<ondown condition="Control.HasFocus(3207) + !Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</ondown>
+		<ondown condition="Control.HasFocus(3207) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</ondown>
+		<ondown condition="Control.HasFocus(3207) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</ondown>
+		<ondown condition="Control.HasFocus(3207) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</ondown>
+		<ondown condition="Control.HasFocus(3207) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</ondown>
+
+		<onup condition="Control.HasFocus(3207) + Integer.IsGreater(Container(3206).NumItems,0)">3206</onup>
+		<onup condition="Control.HasFocus(3207) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</onup>
+		<onup condition="Control.HasFocus(3207) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</onup>
+		<onup condition="Control.HasFocus(3207) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</onup>
+		<onup condition="Control.HasFocus(3207) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</onup>
+		<onup condition="Control.HasFocus(3207) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</onup>
+		<onup condition="Control.HasFocus(3206) + Integer.IsGreater(Container(3205).NumItems,0)">3205</onup>
+		<onup condition="Control.HasFocus(3206) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</onup>
+		<onup condition="Control.HasFocus(3206) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</onup>
+		<onup condition="Control.HasFocus(3206) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</onup>
+		<onup condition="Control.HasFocus(3206) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</onup>
+		<onup condition="Control.HasFocus(3206) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</onup>
+		<onup condition="Control.HasFocus(3205) + Integer.IsGreater(Container(3204).NumItems,0)">3204</onup>
+		<onup condition="Control.HasFocus(3205) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</onup>
+		<onup condition="Control.HasFocus(3205) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</onup>
+		<onup condition="Control.HasFocus(3205) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</onup>
+		<onup condition="Control.HasFocus(3205) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</onup>
+		<onup condition="Control.HasFocus(3205) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</onup>
+		<onup condition="Control.HasFocus(3204) + Integer.IsGreater(Container(3203).NumItems,0)">3203</onup>
+		<onup condition="Control.HasFocus(3204) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</onup>
+		<onup condition="Control.HasFocus(3204) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</onup>
+		<onup condition="Control.HasFocus(3204) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</onup>
+		<onup condition="Control.HasFocus(3204) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</onup>
+		<onup condition="Control.HasFocus(3204) + !Integer.IsGreater(Container(3203).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</onup>
+		<onup condition="Control.HasFocus(3203) + Integer.IsGreater(Container(3202).NumItems,0)">3202</onup>
+		<onup condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3201).NumItems,0)">3201</onup>
+		<onup condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</onup>
+		<onup condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</onup>
+		<onup condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</onup>
+		<onup condition="Control.HasFocus(3203) + !Integer.IsGreater(Container(3202).NumItems,0) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</onup>
+		<onup condition="Control.HasFocus(3202) + Integer.IsGreater(Container(3201).NumItems,0)">3201</onup>
+		<onup condition="Control.HasFocus(3202) + !Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3207).NumItems,0)">3207</onup>
+		<onup condition="Control.HasFocus(3202) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</onup>
+		<onup condition="Control.HasFocus(3202) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0)">3205</onup>
+		<onup condition="Control.HasFocus(3202) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</onup>
+		<onup condition="Control.HasFocus(3202) + !Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</onup>
+		<onup condition="Control.HasFocus(3201) + Integer.IsGreater(Container(3207).NumItems,0)">3207</onup>
+		<onup condition="Control.HasFocus(3201) + !Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</onup>
+		<onup condition="Control.HasFocus(3201) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</onup>
+		<onup condition="Control.HasFocus(3201) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + Integer.IsGreater(Container(3204).NumItems,0)">3204</onup>
+		<onup condition="Control.HasFocus(3201) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</onup>
+		<onup condition="Control.HasFocus(3201) + !Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + !Integer.IsGreater(Container(3205).NumItems,0) + !Integer.IsGreater(Container(3204).NumItems,0) + !Integer.IsGreater(Container(3203).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</onup>
+	</include>
+
 	<include name="Multiart_Reset_OnLoad">
 		<onunload condition="Skin.HasSetting(Multiart_Slideshow)">ClearProperty(Multiart_0,home)</onunload>
 		<onunload condition="Skin.HasSetting(Multiart_Slideshow)">ClearProperty(Multiart_1,home)</onunload>
@@ -501,10 +613,10 @@
 	</include>
 
 	<include name="Widget_Position_Reset_OnLoad">
-		<onload condition="Integer.IsGreater(Container(3000).CurrentItem,1)">Control.Move(3000,$INFO[Container(3000).CurrentItem,-])</onload>
-		<onload condition="Integer.IsGreater(Container(3000).CurrentItem,1)">Control.Move(3000,1)</onload>
-		<onload condition="Integer.IsGreater(Container(50).CurrentItem,1)">Control.Move(50,$INFO[Container(50).CurrentItem,-])</onload>
-		<onload condition="Integer.IsGreater(Container(50).CurrentItem,1)">Control.Move(50,1)</onload>
+		<onload condition="!Window.IsVisible(1180) + Integer.IsGreater(Container(3000).CurrentItem,1)">Control.Move(3000,$INFO[Container(3000).CurrentItem,-])</onload>
+		<onload condition="!Window.IsVisible(1180) + Integer.IsGreater(Container(3000).CurrentItem,1)">Control.Move(3000,1)</onload>
+		<onload condition="!Window.IsVisible(1180) + Integer.IsGreater(Container(50).CurrentItem,1)">Control.Move(50,$INFO[Container(50).CurrentItem,-])</onload>
+		<onload condition="!Window.IsVisible(1180) + Integer.IsGreater(Container(50).CurrentItem,1)">Control.Move(50,1)</onload>
 		<onload condition="Integer.IsGreater(Container(3201).CurrentItem,1)">Control.Move(3201,$INFO[Container(3201).CurrentItem,-])</onload>
 		<onload condition="Integer.IsGreater(Container(3201).CurrentItem,1)">Control.Move(3201,1)</onload>
 		<onload condition="Integer.IsGreater(Container(3202).CurrentItem,1)">Control.Move(3202,$INFO[Container(3202).CurrentItem,-])</onload>
diff --git a/16x9/Scrollbars.xml b/16x9/Scrollbars.xml
index 466d31d4..0e4a3fc3 100644
--- a/16x9/Scrollbars.xml
+++ b/16x9/Scrollbars.xml
@@ -619,7 +619,7 @@
 			<param name="focused_color" value="$VAR[Home_Scroll_Widget_Focused_Color]" />
 			<param name="pos0_enabled" value="true" />
 			<param name="pos0_visible" value="true" />
-			<param name="pos0_active" value="Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]" />
+			<param name="pos0_active" value="Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus] | Control.HasFocus(4201)" />
 			<param name="pos1_enabled" value="!Skin.HasSetting(Widget1_Content_Disabled)" />
 			<param name="pos1_visible" value="Control.IsVisible(3201)" />
 			<param name="pos1_active" value="Control.HasFocus(3201)" />
@@ -650,6 +650,35 @@
 		</include>
 	</include>
 
+	<include name="globalsearch_Scrollbar">
+		<include content="Widget_Scrollbar_Template">
+			<param name="visible" value="!$EXP[TransparentDialog_IsVisible]" />
+			<param name="background_color" value="$VAR[globalsearch_Scroll_Widget_Background_Color]" />
+			<param name="focused_color" value="$VAR[globalsearch_Scroll_Widget_Focused_Color]" />
+			<param name="pos0_enabled" value="true" />
+			<param name="pos0_visible" value="Integer.IsGreater(Container(3201).NumItems,0)" />
+			<param name="pos0_active" value="Control.HasFocus(3201)" />
+			<param name="pos1_enabled" value="true" />
+			<param name="pos1_visible" value="Integer.IsGreater(Container(3202).NumItems,0)" />
+			<param name="pos1_active" value="Control.HasFocus(3202)" />
+			<param name="pos2_enabled" value="true" />
+			<param name="pos2_visible" value="Integer.IsGreater(Container(3203).NumItems,0)" />
+			<param name="pos2_active" value="Control.HasFocus(3203)" />
+			<param name="pos3_enabled" value="true" />
+			<param name="pos3_visible" value="Integer.IsGreater(Container(3204).NumItems,0)" />
+			<param name="pos3_active" value="Control.HasFocus(3204)" />
+			<param name="pos4_enabled" value="true" />
+			<param name="pos4_visible" value="Integer.IsGreater(Container(3205).NumItems,0)" />
+			<param name="pos4_active" value="Control.HasFocus(3205)" />
+			<param name="pos5_enabled" value="true" />
+			<param name="pos5_visible" value="Integer.IsGreater(Container(3206).NumItems,0)" />
+			<param name="pos5_active" value="Control.HasFocus(3206)" />
+			<param name="pos6_enabled" value="true" />
+			<param name="pos6_visible" value="Integer.IsGreater(Container(3207).NumItems,0)" />
+			<param name="pos6_active" value="Control.HasFocus(3207)" />
+		</include>
+	</include>
+
 	<include name="DialogAddonInfo_Scrollbar">
 		<include content="Widget_Scrollbar_Template">
 			<param name="visible" value="!Window.IsVisible(shutdownmenu) + Control.IsVisible(50)" />
diff --git a/16x9/Templates_Widgets.xml b/16x9/Templates_Widgets.xml
index 88f6a6a8..f5192c80 100644
--- a/16x9/Templates_Widgets.xml
+++ b/16x9/Templates_Widgets.xml
@@ -29,7 +29,7 @@
 			<control type="fixedlist" id="$PARAM[id]">
 				<visible>Integer.IsGreaterOrEqual(Container($PARAM[id]).NumItems,$PARAM[min_items]) | Container($PARAM[id]).IsUpdating | $PARAM[bypass_min_items]</visible>
 				<onfocus condition="Window.Is(home)">SetProperty(Home_Widget,$PARAM[id],home)</onfocus>
-				<onfocus condition="Window.Is(movieinformation) | Window.Is(musicinformation) | Window.Is(songinformation) | Window.Is(addoninformation)">SetProperty(Infoscreen_Widget,$PARAM[id],home)</onfocus>
+				<onfocus condition="Window.Is(movieinformation) | Window.Is(musicinformation) | Window.Is(songinformation) | Window.Is(addoninformation) | Window.Is(1180)">SetProperty(Infoscreen_Widget,$PARAM[id],home)</onfocus>
 				<onfocus>ClearProperty(Focused_Button,movieinformation)</onfocus>
 				<onfocus>ClearProperty(Focused_Button,musicinformation)</onfocus>
 				<onfocus>ClearProperty(Focused_Button,addoninformation)</onfocus>
@@ -435,7 +435,7 @@
 
 	<include name="Home_Widgets">
 		<control type="group">
-			<visible>!$EXP[Infoscreen_IsVisible] + !Control.HasFocus(4010)</visible>
+			<visible>!$EXP[Infoscreen_IsVisible] + !Control.HasFocus(4010) + !$EXP[globalsearch_IsVisible]</visible>
 			<include content="Visible_Fade_Delayed_Animation" />
 			<include content="Widget_1" condition="!Skin.HasSetting(Widget1_Content_Disabled)" />
 			<include content="Widget_2" condition="!Skin.HasSetting(Widget2_Content_Disabled)" />
@@ -452,6 +452,7 @@
 
 	<include name="Infoscreen_Widget_Template">
 		<param name="id" />
+		<param name="widget_type" default="Infoscreen_Widget" />
 		<param name="widget_position" default="0" />
 		<param name="use_custom_content" default="true" />
 		<param name="use_custom_click" default="true" />
@@ -469,7 +470,7 @@
 			<include content="Widget_List">
 				<param name="min_items" value="$PARAM[min_items]" />
 				<param name="bypass_min_items" value="$PARAM[bypass_min_items]" />
-				<param name="widget_type" value="Infoscreen_Widget" />
+				<param name="widget_type" value="$PARAM[widget_type]" />
 				<param name="id" value="$PARAM[id]" />
 				<param name="use_custom_content" value="$PARAM[use_custom_content]" />
 				<param name="target" value="$PARAM[target]" />
@@ -708,6 +709,7 @@
 
 	<include name="Infoscreen_Widget_3206_StudioCredits">
 		<include content="Infoscreen_Widget_Template">
+			<param name="min_items" value="1" />
 			<param name="widget_view" value="Strip" />
 			<param name="widget_display" value="Fanart" />
 			<param name="id" value="3206" />
@@ -788,4 +790,125 @@
 		</include>
 	</include>
 
+	<!-- globalsearch -->
+	<include name="globalsearch_Widget_3201_Movies">
+		<include content="Infoscreen_Widget_Template">
+			<param name="widget_type" value="globalsearch" />
+			<param name="widget_view" value="Strip" />
+			<param name="widget_display" value="Posters" />
+			<param name="id" value="3201" />
+			<param name="widget_position" value="1" />
+			<param name="bypass_min_items" value="true" />
+			<param name="target" value="videos" />
+			<param name="sortby" value="votes" />
+			<param name="sortorder" value="descending" />
+			<param name="content" value="$VAR[Path_globalsearch_Movies]" />
+			<param name="click_action" value="Play_File" />
+			<param name="limit" value="30" />
+			<param name="widget_header" value="'$INFO[Skin.String(globalsearch)]'" />
+			<param name="widget_info" value="$VAR[Copacetic_Divider_Bold] $LOCALIZE[342]" />
+		</include>
+	</include>
+
+	<include name="globalsearch_Widget_3202_TVShows">
+		<include content="Infoscreen_Widget_Template">
+			<param name="widget_type" value="globalsearch" />
+			<param name="widget_view" value="Strip" />
+			<param name="widget_display" value="Posters" />
+			<param name="id" value="3202" />
+			<param name="widget_position" value="2" />
+			<param name="bypass_min_items" value="true" />
+			<param name="sortby" value="votes" />
+			<param name="sortorder" value="descending" />
+			<param name="content" value="$VAR[Path_globalsearch_TVShows]" />
+			<param name="click_action" value="Open_TVShow" />
+			<param name="limit" value="30" />
+			<param name="widget_header" value="'$INFO[Skin.String(globalsearch)]'" />
+			<param name="widget_info" value="$VAR[Copacetic_Divider_Bold] $LOCALIZE[20343]" />
+		</include>
+	</include>
+
+	<include name="globalsearch_Widget_3203_Episodes">
+		<include content="Infoscreen_Widget_Template">
+			<param name="widget_type" value="globalsearch" />
+			<param name="widget_view" value="Strip" />
+			<param name="widget_display" value="Fanart" />
+			<param name="id" value="3203" />
+			<param name="widget_position" value="3" />
+			<param name="bypass_min_items" value="true" />
+			<param name="sortby" value="votes" />
+			<param name="sortorder" value="descending" />
+			<param name="content" value="$VAR[Path_globalsearch_Episodes]" />
+			<param name="click_action" value="Play_File" />
+			<param name="limit" value="30" />
+			<param name="widget_header" value="'$INFO[Skin.String(globalsearch)]'" />
+			<param name="widget_info" value="$VAR[Copacetic_Divider_Bold] $LOCALIZE[20360]" />
+		</include>
+	</include>
+
+	<include name="globalsearch_Widget_3204_Artists">
+		<include content="Infoscreen_Widget_Template">
+			<param name="widget_type" value="globalsearch" />
+			<param name="widget_view" value="Strip" />
+			<param name="widget_display" value="Fanart" />
+			<param name="id" value="3204" />
+			<param name="widget_position" value="4" />
+			<param name="bypass_min_items" value="true" />
+			<param name="target" value="music" />
+			<param name="sortby" value="artist" />
+			<param name="sortorder" value="ascending" />
+			<param name="content" value="$VAR[Path_globalsearch_Artists]" />
+			<param name="click_action" value="Open_Artist" />
+			<param name="limit" value="30" />
+			<param name="widget_header" value="'$INFO[Skin.String(globalsearch)]'" />
+			<param name="widget_info" value="$VAR[Copacetic_Divider_Bold] $LOCALIZE[133]" />
+		</include>
+	</include>
+
+	<include name="globalsearch_Widget_3205_Albums">
+		<include content="Infoscreen_Widget_Template">
+			<param name="widget_type" value="globalsearch" />
+			<param name="widget_view" value="Strip" />
+			<param name="widget_display" value="Square" />
+			<param name="id" value="3205" />
+			<param name="widget_position" value="5" />
+			<param name="bypass_min_items" value="true" />
+			<param name="target" value="music" />
+			<param name="sortby" value="album" />
+			<param name="sortorder" value="ascending" />
+			<param name="content" value="$VAR[Path_globalsearch_Albums]" />
+			<param name="click_action" value="Open_Album" />
+			<param name="limit" value="30" />
+			<param name="widget_header" value="'$INFO[Skin.String(globalsearch)]'" />
+			<param name="widget_info" value="$VAR[Copacetic_Divider_Bold] $LOCALIZE[132]" />
+		</include>
+	</include>
+
+	<include name="globalsearch_Widget_3206_Songs">
+		<include content="Infoscreen_Widget_Template">
+			<param name="widget_type" value="globalsearch" />
+			<param name="widget_view" value="Strip" />
+			<param name="widget_display" value="Square" />
+			<param name="id" value="3206" />
+			<param name="widget_position" value="6" />
+			<param name="bypass_min_items" value="true" />
+			<param name="target" value="music" />
+			<param name="sortby" value="title" />
+			<param name="sortorder" value="ascending" />
+			<param name="content" value="$VAR[Path_globalsearch_Songs]" />
+			<param name="click_action" value="Play_All_Songs" />
+			<param name="limit" value="30" />
+			<param name="widget_header" value="'$INFO[Skin.String(globalsearch)]'" />
+			<param name="widget_info" value="$VAR[Copacetic_Divider_Bold] $LOCALIZE[134]" />
+		</include>
+	</include>
+
+	<!--
+
+		{"rules":{"or":[{"field":"title","operator":"contains","value":["XXXX"]},{"field":"album","operator":"contains","value":["XXXX"]},{"field":"artist","operator":"contains","value":["XXXX"]},{"field":"genre","operator":"contains","value":["XXXX"]}]},"type":"songs"}
+
+	 title, album, artist, genre
+
+	-->
+
 </includes>
\ No newline at end of file
diff --git a/16x9/Variables_Labels_Media.xml b/16x9/Variables_Labels_Media.xml
index e6282b1a..20e03be7 100644
--- a/16x9/Variables_Labels_Media.xml
+++ b/16x9/Variables_Labels_Media.xml
@@ -866,6 +866,15 @@
 		<value>$INFO[ListItem.SortLetter]</value>
 	</variable>
 
+	<variable name="Studio_Label">
+		<!-- Fix for strings breaking in xsp filtered paths when + included in filename - this is for Same Studio widget -->
+		<value condition="String.Contains(Window(home).Property(StudioSplit.0),Apple TV)">"Apple TV"</value>
+		<value condition="String.Contains(Window(home).Property(StudioSplit.0),Paramount)">"Paramount"</value>
+		<value condition="String.Contains(Window(home).Property(StudioSplit.0),Disney)">"Disney"</value>
+		<value condition="!String.IsEmpty(Window(home).Property(StudioSplit.0)">$ESCINFO[Window(home).Property(StudioSplit.0)]</value>
+		<value condition="!String.IsEmpty(ListItem.Studio)">$ESCINFO[ListItem.Studio]</value>
+	</variable>
+
 	<variable name="Theme_Label">
 		<value condition="Skin.String(Theme,Light)">$LOCALIZE[31408]</value>
 		<value>$LOCALIZE[31407]</value>
diff --git a/16x9/Variables_Paths_Widgets.xml b/16x9/Variables_Paths_Widgets.xml
index 55a732aa..48132233 100644
--- a/16x9/Variables_Paths_Widgets.xml
+++ b/16x9/Variables_Paths_Widgets.xml
@@ -66,7 +66,7 @@
 	</variable>
 
 	<variable name="Path_StudioCredits">
-		<value condition="!String.IsEmpty(Window(home).Property(StudioSplit.0)) + Integer.IsGreater(ListItem.DBID,0) + !String.IsEmpty(ListItem.TVShowTitle)">videodb://tvshows/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[Window(home).Property(StudioSplit.0)]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D</value>
+		<value condition="!String.IsEmpty(Window(home).Property(StudioSplit.0)) + Integer.IsGreater(ListItem.DBID,0) + !String.IsEmpty(ListItem.TVShowTitle)">videodb://tvshows/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$VAR[Studio_Label]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D</value>
 		<value condition="!String.IsEmpty(Window(home).Property(StudioSplit.0)) + Integer.IsGreater(ListItem.DBID,0)">videodb://movies/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[Window(home).Property(StudioSplit.0)]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D</value>
 		<value condition="!String.IsEmpty(ListItem.Studio) + Integer.IsGreater(ListItem.DBID,0) + !String.IsEmpty(ListItem.TVShowTitle)">videodb://tvshows/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Studio]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D</value>
 		<value condition="!String.IsEmpty(ListItem.Studio) + Integer.IsGreater(ListItem.DBID,0)">videodb://movies/titles/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22is%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Studio]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D</value>
@@ -93,7 +93,6 @@
 		<value condition="!String.IsEmpty(Window(home).Property(RandomGenre)) + String.IsEqual(ListItem.DBType,song)">musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[Window(home).Property(RandomGenre)]%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Artist]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D%0A</value>
 		<value condition="!String.IsEmpty(ListItem.Genre) + String.IsEqual(ListItem.DBType,artist)">musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Genre]%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Label]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D%0A</value>
 		<value condition="!String.IsEmpty(ListItem.Genre) + String.IsEqual(ListItem.DBType,song)">musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Genre]%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Artist]%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D%0A</value>
-
 	</variable>
 
 	<variable name="Path_SimilarAlbums">
@@ -106,4 +105,35 @@
 		<value condition="!String.IsEmpty(ListItem.Genre)">musicdb://songs/?xsp=%7B%22rules%22%3A%7B%22and%22%3A%5B%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Genre]%5D%7D%2C%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22isnot%22%2C%22value%22%3A%5B$ESCINFO[ListItem.Title]%5D%7D%5D%7D%2C%22type%22%3A%22songs%22%7D%0A</value>
 	</variable>
 
+	<!-- globalsearch -->
+	<variable name="Path_globalsearch_Movies">
+		<!-- title, plot, genre, set, director, actor, studio, tag -->
+		<value>videodb://movies/titles/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22plot%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22set%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22director%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22actor%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22tag%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22movies%22%7D</value>
+	</variable>
+
+	<variable name="Path_globalsearch_TVShows">
+		<!-- title, plot, genre, director, actor, studio, tag -->
+		<value>videodb://tvshows/titles/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22plot%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22director%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22actor%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22studio%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22tag%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22tvshows%22%7D</value>
+	</variable>
+
+	<variable name="Path_globalsearch_Episodes">
+		<!-- title, plot, genre, director, actor, tags -->
+		<value>videodb://recentlyaddedepisodes/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22plot%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22director%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22actor%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22episodes%22%7D</value>
+	</variable>
+
+	<variable name="Path_globalsearch_Artists">
+		<!-- artist, genre, biography -->
+		<value>musicdb://artists/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22biography%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22artists%22%7D</value>
+	</variable>
+
+	<variable name="Path_globalsearch_Albums">
+		<!-- album, genre, artist, review, label -->
+		<value>musicdb://albums/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22album%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22review%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22label%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22albums%22%7D</value>
+	</variable>
+
+		<variable name="Path_globalsearch_Songs">
+		<!-- title, album, artist, genre -->
+		<value>musicdb://songs/?xsp=%7B%22rules%22%3A%7B%22or%22%3A%5B%7B%22field%22%3A%22title%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22album%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22artist%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%2C%7B%22field%22%3A%22genre%22%2C%22operator%22%3A%22contains%22%2C%22value%22%3A%5B%22$INFO[Skin.String(globalsearch)]%22%5D%7D%5D%7D%2C%22type%22%3A%22songs%22%7D</value>
+	</variable>
+
 </includes>
\ No newline at end of file
diff --git a/16x9/Variables_Textures_Artwork_Widgets.xml b/16x9/Variables_Textures_Artwork_Widgets.xml
index f399a195..ed6e966b 100644
--- a/16x9/Variables_Textures_Artwork_Widgets.xml
+++ b/16x9/Variables_Textures_Artwork_Widgets.xml
@@ -1027,6 +1027,9 @@
 		<value condition="Control.HasFocus(3201) + !String.IsEqual(Container(3201).ListItem(1).DBType,episode) + !String.IsEmpty(Container(3201).ListItem(0).Art(fanart))">$INFO[Container(3201).ListItem(0).Art(fanart)]</value>
 		<value condition="Control.HasFocus(3201) + !String.IsEmpty(Container(3201).ListItem(0).Icon)">$INFO[Container(3201).ListItem(0).Icon]</value>
 		<value condition="Control.HasFocus(50) + !String.IsEmpty(Container(50).ListItem(0).Icon)">$INFO[Container(50).ListItem(0).Icon]</value>
+		<value condition="Control.HasFocus(3203) + !String.IsEmpty(Container(3203).ListItem(0).Icon)">$INFO[Container(3203).ListItem(0).Icon]</value>
+		<value condition="Control.HasFocus(3204) + !String.IsEmpty(Container(3204).ListItem(0).Art(fanart))">$INFO[Container(3204).ListItem(0).Art(fanart)]</value>
+		<value condition="Control.HasFocus(3204) + !String.IsEmpty(Container(3204).ListItem(0).Art(thumb))">$INFO[Container(3204).ListItem(0).Art(thumb)]</value>
 		<value condition="Control.HasFocus(3205) + !String.IsEqual(Container(3205).ListItem(1).DBType,episode) + !String.IsEmpty(Container(3205).ListItem(0).Art(fanart))">$INFO[Container(3205).ListItem(0).Art(fanart)]</value>
 		<value condition="Control.HasFocus(3205) + !String.IsEmpty(Container(3205).ListItem(0).Icon)">$INFO[Container(3205).ListItem(0).Icon]</value>
 		<value condition="Control.HasFocus(3206) + !String.IsEqual(Container(3206).ListItem(1).DBType,episode) + !String.IsEmpty(Container(3206).ListItem(0).Art(fanart))">$INFO[Container(3206).ListItem(0).Art(fanart)]</value>
@@ -1069,6 +1072,10 @@
 	<variable name="Widget_Square_Thumbnail(0)Content">
 		<value condition="Control.HasFocus(3201) + !String.IsEmpty(Container(3201).ListItemNoWrap(0).Icon)">$INFO[Container(3201).ListItem(0).Icon]</value>
 		<value condition="Control.HasFocus(3202) + !String.IsEmpty(Container(3202).ListItemNoWrap(0).Icon)">$INFO[Container(3202).ListItem(0).Icon]</value>
+		<value condition="Control.HasFocus(3203) + !String.IsEmpty(Container(3203).ListItemNoWrap(0).Icon)">$INFO[Container(3203).ListItem(0).Icon]</value>
+		<value condition="Control.HasFocus(3204) + !String.IsEmpty(Container(3204).ListItemNoWrap(0).Icon)">$INFO[Container(3204).ListItem(0).Icon]</value>
+		<value condition="Control.HasFocus(3205) + !String.IsEmpty(Container(3205).ListItemNoWrap(0).Icon)">$INFO[Container(3205).ListItem(0).Icon]</value>
+		<value condition="Control.HasFocus(3206) + !String.IsEmpty(Container(3206).ListItemNoWrap(0).Icon)">$INFO[Container(3206).ListItem(0).Icon]</value>
 		<value condition="Control.HasFocus(3207) + !String.IsEmpty(Container(3207).ListItemNoWrap(0).Icon)">$INFO[Container(3207).ListItem(0).Icon]</value>
 	</variable>
 	<variable name="Widget_Square_Thumbnail(1)Content">
diff --git a/16x9/Viewtype_504_Strip.xml b/16x9/Viewtype_504_Strip.xml
index 55268165..d4aaed90 100644
--- a/16x9/Viewtype_504_Strip.xml
+++ b/16x9/Viewtype_504_Strip.xml
@@ -48,12 +48,12 @@
 			<include content="Viewtype_Details_Template">
 				<param name="visible" value="$PARAM[visible]" />
 				<param name="viewtype_label" value="Strip" />
-				<include content="Progress" condition="Window.Is(videos) | Window.Is(music) | Window.Is(home) | Window.Is(movieinformation)">
+				<include content="Progress" condition="Window.Is(videos) | Window.Is(music) | Window.Is(home) | Window.Is(movieinformation) | Window.Is(1180)">
 					<param name="id" value="$PARAM[id]" />
 					<param name="bottom" value="144" />
 					<animation effect="slide" end="0,-30" time="0" condition="$EXP[StripView_Display_IsSquare] | $EXP[StripView_Display_IsFanart]">Conditional</animation>
-					<animation effect="slide" end="75,0" time="0" condition="$EXP[StripView_Display_IsSquare] + !$EXP[StripView_Details_Off] + !$EXP[Infoscreen_Widget_HasFocus]">Conditional</animation>
-					<animation effect="slide" end="320,0" time="0" condition="$EXP[StripView_Display_IsFanart] + !$EXP[StripView_Details_Off] + !$EXP[Infoscreen_Widget_HasFocus]">Conditional</animation>
+					<animation effect="slide" end="75,0" time="0" condition="$EXP[StripView_Display_IsSquare] + !$EXP[StripView_Details_Off] + !$EXP[Infoscreen_Widget_HasFocus] + !Window.Is(1180)">Conditional</animation>
+					<animation effect="slide" end="320,0" time="0" condition="$EXP[StripView_Display_IsFanart] + !$EXP[StripView_Details_Off] + !$EXP[Infoscreen_Widget_HasFocus] + !Window.Is(1180)">Conditional</animation>
 				</include>
 				<include content="Common_Details" condition="!$EXP[Infoscreen_IsVisible]">
 					<param name="viewtype_label" value="Strip" />
@@ -66,7 +66,7 @@
 					<animation effect="slide" end="0,15" time="0" condition="$EXP[StripView_Display_IsFanart] | $EXP[StripView_Display_IsSquare]">Conditional</animation>
 				</include>
 				<include content="Variable_Title_Label" condition="!Window.Is(home) + !Window.Is(addoninformation)">
-					<param name="visible" value="[!$EXP[Infoscreen_Widget_HasFocus] + $EXP[StripView_Details_Title] + !$EXP[StripView_Logo_On]] | [$EXP[Infoscreen_Widget_HasFocus] + ![String.IsEqual(Container(3202).ListItem.DBType,Season) + Control.HasFocus(3202)]]" />
+					<param name="visible" value="[!$EXP[Infoscreen_Widget_HasFocus] + $EXP[StripView_Details_Title] + !$EXP[StripView_Logo_On]] | [$EXP[Infoscreen_Widget_HasFocus] + ![String.IsEqual(Container(3202).ListItem.DBType,Season) + Control.HasFocus(3202)]] | Window.IsVisible(1180)" />
 					<param name="label" value="$VAR[Title_Label]" />
 					<param name="textcolor" value="$VAR[Primary_Color]" />
 				</include>
diff --git a/16x9/_IDs b/16x9/_IDs
index 70f62311..fd8319f4 100644
--- a/16x9/_IDs
+++ b/16x9/_IDs
@@ -50,6 +50,7 @@ BUTTONS
 4022          Infoscreen star rating down button
 410X          Set focus away from secondary list
 4200          Reset widgets
+4201          Global search button
 4300          Set focus to screensaver
 
 ANIMATION DELAYS
diff --git a/README.md b/README.md
index feacf951..73780154 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,9 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 
 ### Changelog
 ---
+**1.3.2**
+-
+
 **1.3.1**
 - Support for videoversions management dialog and embedded lists [omega]
 - Support for videoversions folder views [omega]
diff --git a/addon.xml b/addon.xml
index 3db7d92a..25075483 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.copacetic" version="1.3.1~omega" name="Copacetic" provider-name="realcopacetic">
+<addon id="skin.copacetic" version="1.3.2" name="Copacetic" provider-name="realcopacetic">
 	<requires>
 		<import addon="xbmc.gui" version="5.17.0" />
 		<import addon="script.copacetic.helper" version="1.0.12" />