From a18e7f1c187feefb93ed5b7978cb53b2797df874 Mon Sep 17 00:00:00 2001
From: realcopacetic <ahekmat400@googlemail.com>
Date: Fri, 26 Apr 2024 13:42:21 +0100
Subject: [PATCH] global search wip

---
 16x9/Custom_1180_globalsearch.xml           |  27 +++--
 16x9/Expressions.xml                        |   5 +-
 16x9/Home.xml                               |   6 +-
 16x9/Navigation.xml                         |  80 +++++++++++++
 16x9/Templates_Widgets.xml                  | 122 ++++++++++++++++++--
 16x9/Variables_Paths_Widgets.xml            |  31 +++++
 16x9/Variables_Textures_Artwork_Widgets.xml |   6 +
 16x9/Viewtype_504_Strip.xml                 |   8 +-
 16x9/script-globalsearch-main.xml           |  11 --
 addon.xml                                   |   2 +-
 10 files changed, 259 insertions(+), 39 deletions(-)
 delete mode 100644 16x9/script-globalsearch-main.xml

diff --git a/16x9/Custom_1180_globalsearch.xml b/16x9/Custom_1180_globalsearch.xml
index cafb244e..93801b0b 100644
--- a/16x9/Custom_1180_globalsearch.xml
+++ b/16x9/Custom_1180_globalsearch.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1180">
   <!-- global search -->
-  <defaultcontrol always="true">100</defaultcontrol>
+  <defaultcontrol always="true">3000</defaultcontrol>
   <controls>
-    <control type="button" id="100">
-      <onclick>Skin.SetString(globalsearch)</onclick>
-      <ondown>3201</ondown>
-    </control>
-    <include content="User_Scroll_Delay" />
-    <include content="globalsearch_Widget_3201_Movies" />
-    <control type="label">
-      <label>$INFO[Window(home).Property(Infoscreen_Widget)]</label>
-      <align>right</align>
+    <control type="group">
+      <visible>!$EXP[Infoscreen_IsVisible]</visible>
+      <include content="Visible_Fade_Delayed_Animation" />
+      <control type="button" id="3000">
+        <onclick>Skin.SetString(globalsearch)</onclick>
+        <onfocus>ClearProperty(Infoscreen_Widget,home)</onfocus>
+        <ondown>3201</ondown>
+        <include content="globalsearch_Button_Navigation" />
+      </control>
+      <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" />
     </control>
   </controls>
 </window>
\ No newline at end of file
diff --git a/16x9/Expressions.xml b/16x9/Expressions.xml
index deba5e90..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>
@@ -10,9 +10,10 @@
 	<expression name="Infoscreen_HasBackground">[Window.IsVisible(movieinformation) + [Window.IsVisible(1104) | Window.IsVisible(1150) | !String.IsEmpty(Window(movieinformation).Property(Focused_Button)) | String.IsEqual(Window(home).Property(Infoscreen_Widget),3205)]] | [Window.IsVisible(musicinformation) + String.IsEqual(Window(musicinformation).Property(Info_Type),artist) + [Window.IsVisible(1104) | Window.IsVisible(1150) | !String.IsEmpty(Window(musicinformation).Property(Focused_Button))]] | [Window.IsVisible(musicinformation) + String.IsEqual(Window(musicinformation).Property(Focused_Button),$LOCALIZE[21891])]</expression>
 	<expression name="Background_IsVisible">$EXP[Home_HasBackground] | $EXP[Settings_Window_IsVisible] | $EXP[Container_HasBackground] | $EXP[Content_HasBackground] | $EXP[Infoscreen_HasBackground] | [Container.Content() + $EXP[ListView_Display_IsBackground] + [Window.IsVisible(videos) | Window.IsVisible(music)]]</expression>
 	
-	<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) | Window.IsVisible(1180)</expression>
+	<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..5bd044dc 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(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" />
@@ -53,7 +53,7 @@
 			<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>!$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" />
diff --git a/16x9/Navigation.xml b/16x9/Navigation.xml
index 904c4e6a..1ce94a99 100644
--- a/16x9/Navigation.xml
+++ b/16x9/Navigation.xml
@@ -480,6 +480,86 @@
 		<onup condition="Control.HasFocus(3201)">SetFocus(3000)</onup>
 	</include>
 
+	<include name="globalsearch_Button_Navigation">
+		<ondown condition="Integer.IsGreater(Container(3201).NumItems,0)">3201</ondown>
+		<ondown condition="!Integer.IsGreater(Container(3201).NumItems,0) + Integer.IsGreater(Container(3202).NumItems,0)">3202</ondown>
+		<ondown condition="!Integer.IsGreater(Container(3201).NumItems,0) + !Integer.IsGreater(Container(3202).NumItems,0) + Integer.IsGreater(Container(3203).NumItems,0)">3203</ondown>
+		<ondown 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)">3204</ondown>
+		<ondown 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)">3205</ondown>
+		<ondown 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)">3206</ondown>
+		<ondown 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)">3207</ondown>
+		<onup condition="Integer.IsGreater(Container(3207).NumItems,0)">3207</onup>
+		<onup condition="!Integer.IsGreater(Container(3207).NumItems,0) + Integer.IsGreater(Container(3206).NumItems,0)">3206</onup>
+		<onup condition="!Integer.IsGreater(Container(3207).NumItems,0) + !Integer.IsGreater(Container(3206).NumItems,0) + Integer.IsGreater(Container(3205).NumItems,0)">3205</onup>
+		<onup condition="!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="!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="!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>
+		<onup condition="!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) + Integer.IsGreater(Container(3201).NumItems,0)">3201</onup>
+	</include>
+
+	<include name="globalsearch_Navigation">
+		<onback>SetFocus(3000)</onback>
+		<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(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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</ondown>
+		<ondown condition="Control.HasFocus(3207)">SetFocus(3000)</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(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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</onup>
+		<onup condition="Control.HasFocus(3201)">SetFocus(3000)</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>
diff --git a/16x9/Templates_Widgets.xml b/16x9/Templates_Widgets.xml
index 7214781f..03735ead 100644
--- a/16x9/Templates_Widgets.xml
+++ b/16x9/Templates_Widgets.xml
@@ -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]" />
@@ -788,24 +789,129 @@
 		</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="random" />
+			<param name="sortby" value="title" />
 			<param name="sortorder" value="ascending" />
-			<param name="content" 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%22director%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" />
+			<param name="content" value="$VAR[Path_globalsearch_Movies]" />
 			<!--<param name="click_action" value="Open_More_From_Studio" />-->
-			<param name="limit" value="50" />
-			<param name="widget_header" value="hello" />
-			<param name="widget_info" value="how are you?" />
+			<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="target" value="videos" />
+			<param name="sortby" value="title" />
+			<param name="sortorder" value="ascending" />
+			<param name="content" value="$VAR[Path_globalsearch_TVShows]" />
+			<!--<param name="click_action" value="Open_More_From_Studio" />-->
+			<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="target" value="videos" />
+			<param name="sortby" value="title" />
+			<param name="sortorder" value="ascending" />
+			<param name="content" value="$VAR[Path_globalsearch_Episodes]" />
+			<!--<param name="click_action" value="Open_More_From_Studio" />-->
+			<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>
 
-	<!--{"rules":{"or":[{"field":"title","operator":"contains","value":["XXXX"]},{"field":"plot","operator":"contains","value":["XXXX"]},{"field":"studio","operator":"contains","value":["XXXX"]},{"field":"plot","operator":"contains","value":["XXXX"]},{"field":"director","operator":"contains","value":["XXXX"]}]},"type":"movies"}-->
+	<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="title" />
+			<param name="sortorder" value="ascending" />
+			<param name="content" value="$VAR[Path_globalsearch_Artists]" />
+			<!--<param name="click_action" value="Open_More_From_Studio" />-->
+			<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="title" />
+			<param name="sortorder" value="ascending" />
+			<param name="content" value="$VAR[Path_globalsearch_Albums]" />
+			<!--<param name="click_action" value="Open_More_From_Studio" />-->
+			<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="Open_More_From_Studio" />-->
+			<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_Paths_Widgets.xml b/16x9/Variables_Paths_Widgets.xml
index 50aa8185..9a9a8a3c 100644
--- a/16x9/Variables_Paths_Widgets.xml
+++ b/16x9/Variables_Paths_Widgets.xml
@@ -105,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..b639982a 100644
--- a/16x9/Variables_Textures_Artwork_Widgets.xml
+++ b/16x9/Variables_Textures_Artwork_Widgets.xml
@@ -1027,6 +1027,8 @@
 		<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(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 +1071,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/script-globalsearch-main.xml b/16x9/script-globalsearch-main.xml
deleted file mode 100644
index b620466b..00000000
--- a/16x9/script-globalsearch-main.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<!-- globalsearch -->
-	<defaultcontrol always="true">111</defaultcontrol>
-	<backgroundcolor>$VAR[Dark_Color]</backgroundcolor>
-	<controls>
-		<control type="group" id="100">
-			<include content="globalsearch_Movies_Widget" />
-		</control>
-	</controls>
-</window>
\ No newline at end of file
diff --git a/addon.xml b/addon.xml
index 877973c7..25075483 100644
--- a/addon.xml
+++ b/addon.xml
@@ -7,7 +7,7 @@
 		<import addon="script.skinshortcuts" version="1.1.5" />
 		<import addon="service.upnext" version="1.1.9+MATRIX.1" />
 	</requires>
-	<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.7" debugging="true">
+	<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.7" debugging="false">
 		<res width="1920" height="1080" aspect="16:9" default="true" folder="16x9" />
 	</extension>
 	<extension point="xbmc.addon.metadata">