From 7ab6142b791aa05d2985b330843f9ae1581cb1ab Mon Sep 17 00:00:00 2001
From: realcopacetic <ahekmat400@googlemail.com>
Date: Mon, 29 Apr 2024 13:19:42 +0100
Subject: [PATCH] globalsearch

---
 16x9/Actions.xml                        | 42 ++++++++++++----
 16x9/Buttons_Infoscreen_Path_Tracer.xml |  4 +-
 16x9/Colors.xml                         | 24 ++++++++-
 16x9/Custom_1180_globalsearch.xml       |  4 +-
 16x9/Home.xml                           |  5 +-
 16x9/Navigation.xml                     | 65 ++++++++++++++++++-------
 16x9/Scrollbars.xml                     |  6 +--
 16x9/Templates_Widgets.xml              | 28 +++++------
 addon.xml                               |  2 +-
 9 files changed, 126 insertions(+), 54 deletions(-)

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/Custom_1180_globalsearch.xml b/16x9/Custom_1180_globalsearch.xml
index bac00d84..3f4e9fa9 100644
--- a/16x9/Custom_1180_globalsearch.xml
+++ b/16x9/Custom_1180_globalsearch.xml
@@ -1,6 +1,7 @@
 <?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>
 
@@ -32,6 +33,7 @@
       <include content="globalsearch_Widget_3205_Albums" />
       <include content="globalsearch_Widget_3206_Songs" />
       <include content="globalsearch_Scrollbar" />
-    </control>   
+    </control>
+
   </controls>
 </window>
\ No newline at end of file
diff --git a/16x9/Home.xml b/16x9/Home.xml
index 97618ba5..02f8af30 100644
--- a/16x9/Home.xml
+++ b/16x9/Home.xml
@@ -67,8 +67,9 @@
 					<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>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)">
diff --git a/16x9/Navigation.xml b/16x9/Navigation.xml
index eeb3a79e..bd0535eb 100644
--- a/16x9/Navigation.xml
+++ b/16x9/Navigation.xml
@@ -510,28 +510,43 @@
 		<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(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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</ondown>
-		<ondown condition="Control.HasFocus(3207)">SetFocus(3000)</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>
@@ -539,28 +554,42 @@
 		<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(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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</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)">SetFocus(3000)</onup>
-		<onup condition="Control.HasFocus(3201)">SetFocus(3000)</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">
@@ -584,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 1a71c1b7..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)" />
@@ -653,8 +653,8 @@
 	<include name="globalsearch_Scrollbar">
 		<include content="Widget_Scrollbar_Template">
 			<param name="visible" value="!$EXP[TransparentDialog_IsVisible]" />
-			<param name="background_color" value="$VAR[Home_Scroll_Widget_Background_Color]" />
-			<param name="focused_color" value="$VAR[Home_Scroll_Widget_Focused_Color]" />
+			<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)" />
diff --git a/16x9/Templates_Widgets.xml b/16x9/Templates_Widgets.xml
index 80d5c926..f5192c80 100644
--- a/16x9/Templates_Widgets.xml
+++ b/16x9/Templates_Widgets.xml
@@ -800,10 +800,10 @@
 			<param name="widget_position" value="1" />
 			<param name="bypass_min_items" value="true" />
 			<param name="target" value="videos" />
-			<param name="sortby" value="title" />
-			<param name="sortorder" value="ascending" />
+			<param name="sortby" value="votes" />
+			<param name="sortorder" value="descending" />
 			<param name="content" value="$VAR[Path_globalsearch_Movies]" />
-			<!--<param name="click_action" value="Open_More_From_Studio" />-->
+			<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]" />
@@ -818,11 +818,10 @@
 			<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="sortby" value="votes" />
+			<param name="sortorder" value="descending" />
 			<param name="content" value="$VAR[Path_globalsearch_TVShows]" />
-			<!--<param name="click_action" value="Open_More_From_Studio" />-->
+			<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]" />
@@ -837,11 +836,10 @@
 			<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="sortby" value="votes" />
+			<param name="sortorder" value="descending" />
 			<param name="content" value="$VAR[Path_globalsearch_Episodes]" />
-			<!--<param name="click_action" value="Open_More_From_Studio" />-->
+			<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]" />
@@ -857,10 +855,10 @@
 			<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="sortby" value="artist" />
 			<param name="sortorder" value="ascending" />
 			<param name="content" value="$VAR[Path_globalsearch_Artists]" />
-			<!--<param name="click_action" value="Open_More_From_Studio" />-->
+			<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]" />
@@ -876,10 +874,10 @@
 			<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="sortby" value="album" />
 			<param name="sortorder" value="ascending" />
 			<param name="content" value="$VAR[Path_globalsearch_Albums]" />
-			<!--<param name="click_action" value="Open_More_From_Studio" />-->
+			<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]" />
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">