From 5714c9e9a11ac3a8ac21cd81c5bd491e242b24f2 Mon Sep 17 00:00:00 2001
From: jurialmunkey <jurialmunkey@kodi.tv>
Date: Wed, 20 Mar 2019 00:09:21 +1100
Subject: [PATCH] 0.9.10 - rewrite multiwidget code

---
 1080i/Home.xml                              |  20 +++-
 1080i/Includes_Home.xml                     |  27 +++++-
 1080i/Includes_Labels.xml                   |   4 +-
 1080i/SkinSettings.xml                      |   2 +-
 1080i/script-skinshortcuts.xml              |  88 +++++++++++++----
 addon.xml                                   |   2 +-
 changelog.txt                               |   3 +
 language/resource.language.en_gb/strings.po |  15 +++
 shortcuts/overrides.xml                     |  13 ++-
 shortcuts/template.xml                      | 102 +++-----------------
 10 files changed, 155 insertions(+), 121 deletions(-)

diff --git a/1080i/Home.xml b/1080i/Home.xml
index 7b47942e..d49f4b16 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -17,13 +17,31 @@
     <onunload condition="!Control.HasFocus(301) + [Window.Next(VideoFullScreen.xml) | Window.Next(MusicVisualisation.xml)]">SetFocus(301)</onunload>
     <onload condition="Window.Previous(VideoFullScreen.xml) | Window.Previous(MusicVisualisation.xml)">SetFocus(301)</onload>
     
-    <onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=301&amp;mode=single&amp;group=mainmenu|powermenu)</onload>
+    <onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=301&amp;levels=1&amp;group=mainmenu|powermenu)</onload>
     
     <onload condition="String.IsEmpty(Window(Home).Property(SkinSplashStarted))">AlarmClock(SkinSplashStarted,SetProperty(SkinSplashStarted,1,home),00:01,silent,false)</onload>
 
     <onunload>ClearProperty(SkinHelper.WidgetContainer)</onunload>
 
     <controls>
+        <control type="list" id="9989">
+            <description>hidden container for widget count</description>
+            <posx>-20</posx>
+            <posy>-20</posy>
+            <width>1</width>
+            <height>1</height>
+            <visible>true</visible>
+            <onup>50</onup>
+            <ondown>50</ondown>
+            <onleft>50</onleft>
+            <onright>50</onright>
+            <autoscroll time="10000">true</autoscroll>
+            <itemlayout width="1" height="1">
+            </itemlayout>
+            <focusedlayout height="1" width="1">
+            </focusedlayout>
+            <content><include>skinshortcuts-submenu-1</include></content>
+        </control>
         <control type="list" id="9988">
             <description>hidden container for playlist background</description>
             <posx>-20</posx>
diff --git a/1080i/Includes_Home.xml b/1080i/Includes_Home.xml
index ba41e3e7..f715db74 100644
--- a/1080i/Includes_Home.xml
+++ b/1080i/Includes_Home.xml
@@ -860,8 +860,8 @@
                         <itemgap>-52</itemgap>
                         <usecontrolcoords>true</usecontrolcoords>
                         <control type="group" id="7999"><height>0</height></control>
-                        <include>skinshortcuts-template-vertical-main</include>
                         <include>skinshortcuts-template-vertical-submenu</include>
+                        <include>skinshortcuts-template-vertical-main</include>
                     </control>
                     <control type="group">
                         <visible>Integer.IsEqual(Container(3000).NumItems,1)</visible>
@@ -880,8 +880,20 @@
                         <control type="group">
                             <width>1500</width>
                             <visible>!ControlGroup(3000).HasFocus()</visible>
+                            <visible>!Control.IsVisible(993100)</visible>
                             <include>skinshortcuts-template-vertical-info</include>
                         </control>
+                        <control type="group">
+                            <width>1500</width>
+                            <visible>!ControlGroup(3000).HasFocus()</visible>
+                            <visible>Control.IsVisible(993100)</visible>
+                            <include content="Home_Vertical_Info">
+                                <param name="font" value="font_title" />
+                                <param name="plotheight" value="160" />
+                                <param name="titleheight" value="60" />
+                                <param name="id" value="993100" />
+                            </include>
+                        </control>
                     </control>
                 </control>
             </control>
@@ -949,8 +961,8 @@
                     <itemgap>-52</itemgap>
                     <usecontrolcoords>true</usecontrolcoords>
                     <control type="group" id="7999"><height>0</height></control>
-                    <include>skinshortcuts-template-vertical-main</include>
                     <include>skinshortcuts-template-vertical-submenu</include>
+                    <include>skinshortcuts-template-vertical-main</include>
                 </control>
                 <control type="group">
                     <visible>Integer.IsEqual(Container(3000).NumItems,1)</visible>
@@ -968,8 +980,19 @@
                     </control>
                     <control type="group">
                         <visible>!ControlGroup(3000).HasFocus()</visible>
+                        <visible>!Control.IsVisible(993100)</visible>
                         <include>skinshortcuts-template-vertical-info</include>
                     </control>
+                    <control type="group">
+                        <visible>!ControlGroup(3000).HasFocus()</visible>
+                        <visible>Control.IsVisible(993100)</visible>
+                        <include content="Home_Vertical_Info">
+                            <param name="font" value="font_title" />
+                            <param name="plotheight" value="160" />
+                            <param name="titleheight" value="60" />
+                            <param name="id" value="993100" />
+                        </include>
+                    </control>
                 </control>
             </control>
         </control>
diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
index 159d9402..c0baf6e0 100644
--- a/1080i/Includes_Labels.xml
+++ b/1080i/Includes_Labels.xml
@@ -18,8 +18,8 @@
     </variable>
 
     <variable name="Label_SkinShortcuts_SubmenuWidget">
-        <value condition="Skin.HasSetting(VerticalHome)">$LOCALIZE[31010]</value>
-        <value>$LOCALIZE[31038]</value>
+        <value condition="String.EndsWith(Window.Property(groupname),.1)">$LOCALIZE[31011]</value>
+        <value>$LOCALIZE[31038] - $LOCALIZE[31011]</value>
     </variable>
 
     <variable name="Label_WidgetName">
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index fdcc84b9..0a8e928b 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -1,7 +1,7 @@
 <window>
     <defaultcontrol always="true">300</defaultcontrol>
     <include>Defs_Settings_OnLoad</include>
-    <onunload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=301&amp;mode=single&amp;group=mainmenu|powermenu)</onunload>
+    <onunload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=301&amp;levels=1&amp;group=mainmenu|powermenu)</onunload>
     <onunload condition="System.HasAddon(script.colorbox)">SetProperty(NINE_manual_set,"var=main,set=$INFO[Skin.String(colorbox_main)]|var=comp,set=$INFO[Skin.String(colorbox_comp)]|var=quality,set=$INFO[Skin.String(colorbox_quality)]|var=blursize,set=$INFO[Skin.String(colorbox_blursize)]|var=bitsize,set=$INFO[Skin.String(colorbox_bitsize)]|var=pixelsize,set=$INFO[Skin.String(colorbox_pixelsize)]|var=black,set=$INFO[Skin.String(colorbox_black)]|var=white,set=$INFO[Skin.String(colorbox_white)]|var=blend,set=$INFO[Skin.String(colorbox_blend)]|var=desat,set=$INFO[Skin.String(colorbox_desat)]",home)</onunload> 
     <onload condition="String.IsEmpty(Window.Property(CurrentFocus))">SetProperty(CurrentFocus,$NUMBER[9001])</onload>
     <controls>
diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml
index 47e6e66c..1dc7e41a 100644
--- a/1080i/script-skinshortcuts.xml
+++ b/1080i/script-skinshortcuts.xml
@@ -19,17 +19,18 @@
                 <font>font_small_bold</font>
                 <align>left</align>
                 <textcolor>dialog_fg_70</textcolor>
+                <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
             </control>
-
-            <!-- Edit Widgets / Shortcuts Header -->
+            <!-- Widgets Header Label -->
             <control type="label">
-                <description>Widgets</description>
-                <left>580</left>
+                <description>header label</description>
+                <left>30</left>
                 <height>90</height>
-                <label>$LOCALIZE[31248]</label>
                 <font>font_small_bold</font>
                 <align>left</align>
                 <textcolor>dialog_fg_70</textcolor>
+                <label>Customize Widgets</label>
+                <visible>String.EndsWith(Window.Property(groupname),.1)</visible>
             </control>
 
             <!-- Shortcuts List -->
@@ -170,6 +171,41 @@
                 <control type="button" id="401" description="Choose Shortcut">
                     <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
                     <include>Dialog_Standard_Button</include>
+                    <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
+                </control>
+
+                <control type="button" id="4001" description="Choose Widget">
+                    <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
+                    <label>$LOCALIZE[31098]</label>
+                    <onclick>SetProperty(custom-grouping,widget)</onclick>
+                    <onclick>SendClick(401)</onclick>
+                    <include>Dialog_Standard_Button</include>
+                    <visible>String.EndsWith(Window.Property(groupname),.1)</visible>
+
+                    <onback condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SetProperty(customProperty,widgetTarget)</onback>
+                    <onback condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SetProperty(customValue,music)</onback>
+                    <onback condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SendClick(404)</onback>
+
+                    <onback condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),Pictures)]">SetProperty(customProperty,widgetTarget)</onback>
+                    <onback condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),Pictures)]">SetProperty(customValue,pictures)</onback>
+                    <onback condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),Pictures)]">SendClick(404)</onback>
+
+                    <onback condition="!String.IsEmpty(Container(211).ListItem.Property(path)) + String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + ![String.Contains(Container(211).ListItem.Property(path),Pictures) | String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SetProperty(customProperty,widgetTarget)</onback>
+                    <onback condition="!String.IsEmpty(Container(211).ListItem.Property(path)) + String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + ![String.Contains(Container(211).ListItem.Property(path),Pictures) | String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SetProperty(customValue,videos)</onback>
+                    <onback condition="!String.IsEmpty(Container(211).ListItem.Property(path)) + String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + ![String.Contains(Container(211).ListItem.Property(path),Pictures) | String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SendClick(404)</onback>
+
+                    <!-- Unfocus set target -->
+                    <onunfocus condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SetProperty(customProperty,widgetTarget)</onunfocus>
+                    <onunfocus condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SetProperty(customValue,music)</onunfocus>
+                    <onunfocus condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SendClick(404)</onunfocus>
+
+                    <onunfocus condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),Pictures)]">SetProperty(customProperty,widgetTarget)</onunfocus>
+                    <onunfocus condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),Pictures)]">SetProperty(customValue,pictures)</onunfocus>
+                    <onunfocus condition="String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + [String.Contains(Container(211).ListItem.Property(path),Pictures)]">SendClick(404)</onunfocus>
+
+                    <onunfocus condition="!String.IsEmpty(Container(211).ListItem.Property(path)) + String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + ![String.Contains(Container(211).ListItem.Property(path),Pictures) | String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SetProperty(customProperty,widgetTarget)</onunfocus>
+                    <onunfocus condition="!String.IsEmpty(Container(211).ListItem.Property(path)) + String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + ![String.Contains(Container(211).ListItem.Property(path),Pictures) | String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SetProperty(customValue,videos)</onunfocus>
+                    <onunfocus condition="!String.IsEmpty(Container(211).ListItem.Property(path)) + String.IsEmpty(Container(211).ListItem.Property(widgetTarget)) + ![String.Contains(Container(211).ListItem.Property(path),Pictures) | String.Contains(Container(211).ListItem.Property(path),musicdb://) | String.Contains(Container(211).ListItem.Property(path),library://music) | String.Contains(Container(211).ListItem.Property(path),sources://music) | String.Contains(Container(211).ListItem.Property(path),plugin://plugin.audio)]">SendClick(404)</onunfocus>
                 </control>
 
                 <control type="button" id="307" description="Action">
@@ -177,6 +213,7 @@
                     <label2>$INFO[Container(211).ListItem.Property(Path)]</label2>
                     <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
                     <include>Dialog_Standard_Button</include>
+                    <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
                 </control>
 
                 <control type="button" id="19312" description="Custom Hub Node">
@@ -190,6 +227,7 @@
                     <onunfocus condition="!String.IsEmpty(Skin.String(1134_Node))">SendClick(404)</onunfocus>
                     <onunfocus condition="!String.IsEmpty(Skin.String(1134_Node))">Skin.Reset(1134_Node)</onunfocus>
                     <include>Dialog_Standard_Button</include>
+                    <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
                 </control>
 
                 <control type="button" id="305" description="Label">
@@ -204,6 +242,16 @@
                     <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
                     <include>Dialog_Standard_Button</include>
                     <visible>!String.IsEqual(Window.Property(groupname),powermenu)</visible>
+                    <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
+                </control>
+
+                <control type="button" id="406" description="Submenu">
+                    <label>$LOCALIZE[31099]</label>
+                    <visible>String.IsEqual(Window.Property(groupname),mainmenu)</visible>
+                    <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
+                    <include>Dialog_Standard_Button</include>
+                    <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
+                    <visible>Skin.HasSetting(VerticalHome)</visible>
                 </control>
 
                 <control type="button" id="405" description="Submenu">
@@ -211,21 +259,31 @@
                     <visible>String.IsEqual(Window.Property(groupname),mainmenu)</visible>
                     <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
                     <include>Dialog_Standard_Button</include>
+                    <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
                 </control>
 
                 <control type="button" id="312" description="Widget Submenu Path">
-                    <label>$VAR[Label_SkinShortcuts_SubmenuWidget]</label>
+                    <label>$LOCALIZE[31038]</label>
                     <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
                     <label2>$INFO[Container(211).ListItem.Property(widgetName)]</label2>
-                    <visible>String.IsEqual(Container(211).ListItem.Property(path),ActivateWindow(1135)) | !Skin.HasSetting(SubmenuOnly) | Skin.HasSetting(VerticalHome)</visible>
+                    <visible>String.IsEqual(Container(211).ListItem.Property(path),ActivateWindow(1135)) | !Skin.HasSetting(SubmenuOnly)</visible>
                     <include>Dialog_Standard_Button</include>
+                    <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
                 </control>
 
                 <control type="button" id="9901" description="Widget Submenu Aspect">
-                    <label>$VAR[Label_SkinShortcuts_SubmenuWidget,, - Aspect]</label>
+                    <label>$VAR[Label_SkinShortcuts_SubmenuWidget]</label>
                     <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
                     <label2>$INFO[Container(211).ListItem.Property(widgetAspect)]</label2>
-                    <visible>String.IsEqual(Container(211).ListItem.Property(path),ActivateWindow(1135)) | !Skin.HasSetting(SubmenuOnly) | Skin.HasSetting(VerticalHome)</visible>
+                    <visible>String.IsEqual(Container(211).ListItem.Property(path),ActivateWindow(1135)) | !Skin.HasSetting(SubmenuOnly) | [Skin.HasSetting(VerticalHome) + String.EndsWith(Window.Property(groupname),.1)]</visible>
+                    <include>Dialog_Standard_Button</include>
+                </control>
+
+                <control type="button" id="9902" description="Content Type / Widget Target">
+                    <label>$LOCALIZE[31100]</label>
+                    <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
+                    <label2>$INFO[Container(211).ListItem.Property(widgetTarget)]</label2>
+                    <visible>Skin.HasSetting(VerticalHome) + String.EndsWith(Window.Property(groupname),.1)</visible>
                     <include>Dialog_Standard_Button</include>
                 </control>
 
@@ -238,28 +296,22 @@
                     <visible>String.IsEqual(Window.Property(groupname),mainmenu)</visible>
                     <visible>!Skin.HasSetting(VerticalHome)</visible>
                     <include>Dialog_Standard_Button</include>
+                    <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
                 </control>
 
-                <!-- <control type="button" id="9902" description="Widget Aspect">
-                    <label>$LOCALIZE[31010] - $LOCALIZE[31011]</label>
-                    <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
-                    <label2>$INFO[Container(211).ListItem.Property(widgetAspect.backgroundWidget)]</label2>
-                    <visible>String.IsEqual(Window.Property(groupname),mainmenu)</visible>
-                    <visible>Skin.HasSetting(VerticalHome)</visible>
-                    <include>Dialog_Standard_Button</include>
-                </control> -->
-
                 <control type="button" id="310" description="Background">
                     <label>31110</label>
                     <label2>$INFO[Container(211).ListItem.Property(background)]</label2>
                     <visible>String.IsEqual(Window.Property(groupname),mainmenu)</visible>
                     <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
                     <include>Dialog_Standard_Button</include>
+                    <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
                 </control>
 
                 <control type="button" id="308" description="Reset">
                     <visible>!String.IsEqual(Container(211).ListItem.Property(skinshortcuts-disabled),True)</visible>
                     <include>Dialog_Standard_Button</include>
+                    <visible>!String.EndsWith(Window.Property(groupname),.1)</visible>
                 </control>
 
             </control>
diff --git a/addon.xml b/addon.xml
index a8075473..f57ac4aa 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.9">
+<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.10">
     <requires>
         <import addon="xbmc.gui" version="5.14.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />
diff --git a/changelog.txt b/changelog.txt
index 0503c157..473cd91a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+0.9.10
+Rewrite widget code for better handling
+
 0.9.9
 Fix for programs menu
 Scrolling for horizontal menu (no limit on number of items)
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 496a1d6d..5b466e71 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -500,6 +500,21 @@ msgctxt "#31097"
 msgid "Ends at"
 msgstr ""
 
+#: /1080i/script-skinshortcuts.xml
+msgctxt "#31098"
+msgid "Choose widget"
+msgstr ""
+
+#: /1080i/script-skinshortcuts.xml
+msgctxt "#31099"
+msgid "Widgets"
+msgstr ""
+
+#: /1080i/script-skinshortcuts.xml
+msgctxt "#31100"
+msgid "Content type"
+msgstr ""
+
 msgctxt "#31101"
 msgid "items"
 msgstr ""
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index 911e04b6..80f3ace6 100644
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -56,17 +56,20 @@
     <shortcut label="Widget" type="Widget" grouping="common" condition="Window.IsVisible(SkinSettings.xml)">Widget</shortcut>
 
     <!-- Properties -->
+    <!-- Widget Aspect -->
     <property property="widgetAspect">Poster</property>
     <property property="widgetAspect">Square</property>
     <property property="widgetAspect">Icon</property>
     <property property="widgetAspect">Landscape</property>
     <propertySettings property="widgetAspect" buttonID="9901" title="Widget Aspect" />
 
-    <property property="widgetAspect.backgroundWidget">Poster</property>
-    <property property="widgetAspect.backgroundWidget">Square</property>
-    <property property="widgetAspect.backgroundWidget">Icon</property>
-    <property property="widgetAspect.backgroundWidget">Landscape</property>
-    <propertySettings property="widgetAspect.backgroundWidget" buttonID="9902" title="Widget Aspect" />
+    <!-- Widget Target -->
+    <property property="widgetTarget">videos</property>
+    <property property="widgetTarget">music</property>
+    <property property="widgetTarget">pictures</property>
+    <property property="widgetTarget">programs</property>
+    <propertySettings property="widgetTarget" buttonID="9902" title="Widget Target" />
+
 
     <!-- Icon Overrides -->
     <icon labelID="livetv">special://skin/extras/icons/livetv.png</icon>
diff --git a/shortcuts/template.xml b/shortcuts/template.xml
index 322f419f..3a2f1ff9 100644
--- a/shortcuts/template.xml
+++ b/shortcuts/template.xml
@@ -1,74 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
-    <other include="vertical-main">
-        <condition tag="property" attribute="name|widgetPath" />
-        <property name="widgetAspect" tag="property" attribute="name|widgetAspect" />
-        <property name="widgetAspect">Poster</property>
-        <property name="widgetTarget" tag="property" attribute="name|widgetTarget" />
-        <property name="widgetTarget">videos</property>
-        <property name="widgetPath" tag="property" attribute="name|widgetPath" />
-        <property name="widgetName" tag="property" attribute="name|widgetName" />
-        <property name="widgetName">$LOCALIZE[31105]</property>
-        <property name="submenuVisibility" tag="property" attribute="name|submenuVisibility" />
-        <property name="submenuVisibility">noMenu</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[1]">1</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[2]">2</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[3]">3</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[4]">4</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[5]">5</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[6]">6</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[7]">7</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[8]">8</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[9]">9</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[10]">10</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[11]">11</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[12]">12</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[13]">13</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[14]">14</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[15]">15</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[16]">16</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[17]">17</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[18]">18</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[19]">19</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[20]">20</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[21]">21</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[22]">22</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[23]">23</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[24]">24</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[25]">25</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[26]">26</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[27]">27</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[28]">28</property>
-        <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[29]">29</property>
-        <property name="mainmenuid">30</property>
-        <controls>
-            <include content="View_Cast_Toplabel">
-                <param name="groupid" value="$PYTHON[int(mainmenuid)]7500" />
-                <param name="id" value="$PYTHON[int(mainmenuid)]3100" />
-                <param name="label" value="$SKINSHORTCUTS[widgetName]" />
-                <skinshortcuts>visibility</skinshortcuts>
-            </include>
-            <include content="Object_Widget_Spotlight">
-                <param name="id" value="$PYTHON[int(mainmenuid)]3100" />
-                <param name="top" value="52" />
-                <param name="left" value="0" />
-                <param name="right" value="-30" />
-                <param name="height" value="item_cast_height" />
-                <param name="orientation" value="horizontal" />
-                <param name="labelinclude" value="Defs_Null" />
-                <param name="landscapelabelinclude" value="Defs_Null" />
-                <param name="target" value="$SKINSHORTCUTS[widgetTarget]" />
-                <param name="content" value="$SKINSHORTCUTS[widgetPath]" />
-                <param name="squarecondition" value="$PYTHON['true' if widgetAspect in 'Square' else 'false']" />
-                <param name="landscapecondition" value="$PYTHON['true' if widgetAspect in 'Landscape' else 'false']" />
-                <param name="iconcondition" value="$PYTHON['true' if widgetAspect in 'Icon' else 'false']" />
-                <autoscroll time="12000">!ControlGroup(3000).HasFocus() + System.IdleTime(1)</autoscroll>
-                <onback>301</onback>
-                <visible>Integer.IsGreater(Container($PYTHON[int(mainmenuid)]3100).NumItems,0) | Container($PYTHON[int(mainmenuid)]3100).IsUpdating</visible>
-                <skinshortcuts>visibility</skinshortcuts>
-            </include>
-        </controls>
-    </other>
     <other include="vertical-main">
         <property name="widgetAspect">Poster</property>
         <property name="widgetName">$LOCALIZE[31105]</property>
@@ -80,6 +11,7 @@
                 <param name="id" value="993100" />
                 <param name="label" value="$SKINSHORTCUTS[widgetName]" />
                 <skinshortcuts>visibility</skinshortcuts>
+                <visible>Integer.IsEqual(Container(9989).NumItems,0)</visible>
             </include>
             <include content="Object_Widget_Spotlight">
                 <param name="id" value="993100" />
@@ -99,19 +31,20 @@
                 <onback>301</onback>
                 <visible>Integer.IsGreater(Container(993100).NumItems,0) | Container(993100).IsUpdating</visible>
                 <skinshortcuts>visibility</skinshortcuts>
+                <visible>Integer.IsEqual(Container(9989).NumItems,0)</visible>
             </include>
         </controls>
     </other>
     
-    <submenuOther include="vertical-submenu" container="302">
-        <condition tag="property" attribute="name|widgetPath" />
+    <submenuOther include="vertical-submenu" container="302" level="1">
+        <condition tag="property" attribute="name|list" />
         <property name="widgetAspect" tag="property" attribute="name|widgetAspect" />
         <property name="widgetAspect">Poster</property>
         <property name="widgetTarget" tag="property" attribute="name|widgetTarget" />
-        <property name="widgetName" tag="property" attribute="name|widgetName" />
-        <property name="widgetPath" tag="property" attribute="name|widgetPath" />
-        <property name="submenuVisibility" tag="property" attribute="name|group" />
-        <property name="submenuVisibility">noMenu</property>
+        <property name="widgetTarget">videos</property>
+        <property name="widgetName" tag="label" />
+        <property name="widgetName">$LOCALIZE[31105]</property>
+        <property name="widgetPath" tag="property" attribute="name|list" />
 
         <property name="mainmenuid" tag="property" attribute="name|mainmenuid" />
 
@@ -150,7 +83,7 @@
                 <param name="groupid" value="$PYTHON[int(mainmenuid)]$PYTHON[int(id) + 7500]" />
                 <param name="id" value="$PYTHON[int(mainmenuid)]$PYTHON[int(id) + 3100]" />
                 <param name="label" value="$SKINSHORTCUTS[widgetName]" />
-                <visible>String.IsEqual(Container(301).ListItem.Property(submenuVisibility),num-$SKINSHORTCUTS[submenuVisibility]) | String.IsEqual(Container(301).ListItem.Property(submenuVisibility),$SKINSHORTCUTS[submenuVisibility])</visible>
+                <visible>String.IsEqual(Container(301).ListItem.Property(id),$SKINSHORTCUTS[mainmenuid])</visible>
             </include>
             <include content="Object_Widget_Spotlight">
                 <param name="id" value="$PYTHON[int(mainmenuid)]$PYTHON[int(id) + 3100]" />
@@ -167,15 +100,13 @@
                 <param name="landscapecondition" value="$PYTHON['true' if widgetAspect in 'Landscape' else 'false']" />
                 <param name="iconcondition" value="$PYTHON['true' if widgetAspect in 'Icon' else 'false']" />
                 <onback>301</onback>
-                <!-- <onright>$PYTHON[int(mainmenuid)]$PYTHON[int(id) + 3100]</onright> -->
                 <visible>Integer.IsGreater(Container($PYTHON[int(mainmenuid)]$PYTHON[int(id) + 3100]).NumItems,0) | Container($PYTHON[int(mainmenuid)]$PYTHON[int(id) + 3100]).IsUpdating</visible>
-                <visible>String.IsEqual(Container(301).ListItem.Property(submenuVisibility),num-$SKINSHORTCUTS[submenuVisibility]) | String.IsEqual(Container(301).ListItem.Property(submenuVisibility),$SKINSHORTCUTS[submenuVisibility])</visible>
+                <visible>String.IsEqual(Container(301).ListItem.Property(id),$SKINSHORTCUTS[mainmenuid])</visible>
             </include>
         </controls>
     </submenuOther>
 
     <other include="vertical-info">
-        <condition tag="property" attribute="name|widgetPath" />
         <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[1]">1</property>
         <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[2]">2</property>
         <property name="mainmenuid" tag="property" attribute="name|id" value="$NUMBER[3]">3</property>
@@ -211,18 +142,7 @@
                 <param name="font" value="font_title" />
                 <param name="plotheight" value="160" />
                 <param name="titleheight" value="60" />
-                <param name="id" value="$PYTHON[int(mainmenuid)]3100" />
-                <skinshortcuts>visibility</skinshortcuts>
-            </include>
-        </controls>
-    </other>
-    <other include="vertical-info">
-        <controls>
-            <include content="Home_Vertical_Info">
-                <param name="font" value="font_title" />
-                <param name="plotheight" value="160" />
-                <param name="titleheight" value="60" />
-                <param name="id" value="993100" />
+                <param name="id" value="$PYTHON[int(mainmenuid)]3101" />
                 <skinshortcuts>visibility</skinshortcuts>
             </include>
         </controls>