The branch, gotham has been updated
       via  c0ca4c4851247f33ba24f0a403e7877b8594ef1c (commit)
      from  a4a0f642466edfee15d84a07de0b4ef8657eabe7 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/skins;a=commit;h=c0ca4c4851247f33ba24f0a403e7877b8594ef1c

commit c0ca4c4851247f33ba24f0a403e7877b8594ef1c
Author: ronie <ronie>
Date:   Fri Sep 26 17:00:53 2014 +0200

    skin.conq 1.0.31

diff --git a/skin.conq/16x9/DialogBusy.xml b/skin.conq/16x9/DialogBusy.xml
index 43e72f3..42541d1 100644
--- a/skin.conq/16x9/DialogBusy.xml
+++ b/skin.conq/16x9/DialogBusy.xml
@@ -1,25 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
        <!-- busydialog -->
-       <include>DialogZoomAnimation</include>
 
        <controls>
 
                <!-- Background -->
-               <include>DialogBackgroundImage</include>
+               <include>DialogFadeBackgroundImage</include>
 
                <!-- Main group -->
                <control type="group">
+                       <include>DialogZoomAnimation</include>
                        <centerleft>50%</centerleft>
-                       <top>310</top>
-                       <width>1200</width>
-                       <height>792</height>
+                       <centertop>50%</centertop>
+                       <width>680</width>
+                       <height>220</height>
+
+                       <!-- Background -->
+                       <control type="image">
+                               <centerleft>50%</centerleft>
+                               <width>680</width>
+                               <height>220</height>
+                               <texture 
border="20">dialogs/DialogBackground.png</texture>
+                       </control>
 
                        <!-- Heading -->
                        <control type="label">
-                               <left>0</left>
-                               <top>0</top>
-                               <width>1200</width>
+                               <centerleft>50%</centerleft>
+                               <top>40</top>
+                               <width>600</width>
                                <height>48</height>
                                <align>center</align>
                                <font>Font48</font>
@@ -28,11 +36,11 @@
                        </control>
 
                        <!-- Details -->
-                       <control type="textbox">
-                               <left>0</left>
-                               <top>86</top>
-                               <width>1200</width>
-                               <height>158</height>
+                       <control type="label">
+                               <centerleft>50%</centerleft>
+                               <top>96</top>
+                               <width>600</width>
+                               <height>42</height>
                                <align>center</align>
                                <font>Font42</font>
                                <textcolor>DialogColor2</textcolor>
@@ -41,19 +49,19 @@
 
                        <!-- Scroll -->
                        <control type="image">
-                               <left>514</left>
-                               <top>280</top>
+                               <centerleft>50%</centerleft>
+                               <top>152</top>
                                <width>176</width>
                                <height>20</height>
                                <texture border="1,12,1,1" 
colordiffuse="DialogOverlayColorNF">common/ScrollBackgroundHorizontal.png</texture>
                        </control>
                        <control type="image">
-                               <left>514</left>
-                               <top>280</top>
+                               <centerleft>50%</centerleft>
+                               <top>152</top>
                                <width>24</width>
                                <height>20</height>
                                <texture border="1,12,1,1" 
colordiffuse="DialogOverlayColorFO">common/ScrollbarGripHorizontalFO.png</texture>
-                               <animation effect="slide" start="0,0" 
end="152,0" time="800" loop="true" tween="cubic" easing="out" 
condition="true">Conditional</animation>
+                               <animation effect="slide" start="-76,0" 
end="76,0" time="800" loop="true" tween="cubic" easing="out" 
condition="true">Conditional</animation>
                        </control>
 
                </control>
diff --git a/skin.conq/16x9/DialogContextMenu.xml 
b/skin.conq/16x9/DialogContextMenu.xml
index f71dda5..9eb5295 100644
--- a/skin.conq/16x9/DialogContextMenu.xml
+++ b/skin.conq/16x9/DialogContextMenu.xml
@@ -2,22 +2,22 @@
 <window>
        <!-- contextmenu -->
        <defaultcontrol always="true">996</defaultcontrol>
-       <include>DialogZoomAnimation</include>
+       <coordinates>
+               <origin x="0" y="0"/>
+       </coordinates>
 
        <controls>
 
                <!-- Background -->
-               <include>DialogBackgroundImage</include>
+               <include>DialogFadeBackgroundImage</include>
 
-               <!-- Default grouplist -->
-               <control type="grouplist" id="996">
-                       <centerleft>50%</centerleft>
+               <!-- Dialog group -->
+               <control type="group">
+                       <include>DialogZoomAnimation</include>
                        <top>125</top>
-                       <width>1200</width>
+                       <centerleft>50%</centerleft>
+                       <width>440</width>
                        <height>825</height>
-                       <onup>noop</onup>
-                       <ondown>noop</ondown>
-                       <itemgap>0</itemgap>
                        <animation effect="slide" end="0,37.5" time="0" 
condition="!Control.IsVisible(1001)">Conditional</animation>
                        <animation effect="slide" end="0,37.5" time="0" 
condition="!Control.IsVisible(1002)">Conditional</animation>
                        <animation effect="slide" end="0,37.5" time="0" 
condition="!Control.IsVisible(1003)">Conditional</animation>
@@ -29,14 +29,34 @@
                        <animation effect="slide" end="0,37.5" time="0" 
condition="!Control.IsVisible(1009)">Conditional</animation>
                        <animation effect="slide" end="0,37.5" time="0" 
condition="!Control.IsVisible(1010)">Conditional</animation>
                        <animation effect="slide" end="0,37.5" time="0" 
condition="!Control.IsVisible(1011)">Conditional</animation>
-               </control>
 
-               <!-- Default button -->
-               <control type="button" id="1000">
-                       <width>1200</width>
-                       <height>75</height>
-                       <align>center</align>
-                       <font>Font36</font>
+                       <!-- Background -->
+                       <control type="image" id="999">
+                               <left>-20</left>
+                               <top>-20</top>
+                               <width>480</width>
+                               <height>865</height>
+                               <texture 
border="20">dialogs/DialogBackground.png</texture>
+                       </control>
+
+                       <!-- Default grouplist -->
+                       <control type="grouplist" id="996">
+                               <centerleft>50%</centerleft>
+                               <width>440</width>
+                               <height max="825">auto</height>
+                               <onup>noop</onup>
+                               <ondown>noop</ondown>
+                               <itemgap>0</itemgap>
+                       </control>
+
+                       <!-- Default button -->
+                       <control type="button" id="1000">
+                               <width>440</width>
+                               <height>75</height>
+                               <align>center</align>
+                               <font>Font36</font>
+                       </control>
+
                </control>
 
        </controls>
diff --git a/skin.conq/16x9/DialogOk.xml b/skin.conq/16x9/DialogOk.xml
index f2471de..cae663c 100644
--- a/skin.conq/16x9/DialogOk.xml
+++ b/skin.conq/16x9/DialogOk.xml
@@ -2,25 +2,33 @@
 <window>
        <!-- okdialog -->
        <defaultcontrol always="true">10</defaultcontrol>
-       <include>DialogZoomAnimation</include>
 
        <controls>
 
                <!-- Background -->
-               <include>DialogBackgroundImage</include>
+               <include>DialogFadeBackgroundImage</include>
 
                <!-- Main group -->
                <control type="group">
+                       <include>DialogZoomAnimation</include>
                        <centerleft>50%</centerleft>
-                       <top>310</top>
-                       <width>1200</width>
-                       <height>792</height>
+                       <centertop>50%</centertop>
+                       <width>680</width>
+                       <height>340</height>
+
+                       <!-- Background -->
+                       <control type="image">
+                               <centerleft>50%</centerleft>
+                               <width>680</width>
+                               <height>340</height>
+                               <texture 
border="20">dialogs/DialogBackground.png</texture>
+                       </control>
 
                        <!-- Heading -->
                        <control type="label" id="1">
-                               <left>0</left>
-                               <top>0</top>
-                               <width>1200</width>
+                               <centerleft>50%</centerleft>
+                               <top>40</top>
+                               <width>600</width>
                                <height>48</height>
                                <align>center</align>
                                <font>Font48</font>
@@ -29,9 +37,9 @@
 
                        <!-- Details -->
                        <control type="textbox" id="9">
-                               <left>0</left>
-                               <top>86</top>
-                               <width>1200</width>
+                               <centerleft>50%</centerleft>
+                               <top>96</top>
+                               <width>600</width>
                                <height>158</height>
                                <align>center</align>
                                <font>Font42</font>
@@ -41,9 +49,9 @@
 
                        <!-- OK -->
                        <control type="button" id="10">
-                               <left>0</left>
-                               <top>340</top>
-                               <width>1200</width>
+                               <centerleft>50%</centerleft>
+                               <top>262</top>
+                               <width>600</width>
                                <height>36</height>
                                <align>center</align>
                                <label>106</label>
diff --git a/skin.conq/16x9/DialogYesNo.xml b/skin.conq/16x9/DialogYesNo.xml
index a63d7a6..694a82b 100644
--- a/skin.conq/16x9/DialogYesNo.xml
+++ b/skin.conq/16x9/DialogYesNo.xml
@@ -2,25 +2,33 @@
 <window>
        <!-- yesnodialog -->
        <defaultcontrol always="true">10</defaultcontrol>
-       <include>DialogZoomAnimation</include>
 
        <controls>
 
                <!-- Background -->
-               <include>DialogBackgroundImage</include>
+               <include>DialogFadeBackgroundImage</include>
 
                <!-- Main group -->
                <control type="group">
+                       <include>DialogZoomAnimation</include>
                        <centerleft>50%</centerleft>
-                       <top>310</top>
-                       <width>1200</width>
-                       <height>792</height>
+                       <centertop>50%</centertop>
+                       <width>680</width>
+                       <height>340</height>
+
+                       <!-- Background -->
+                       <control type="image">
+                               <centerleft>50%</centerleft>
+                               <width>680</width>
+                               <height>340</height>
+                               <texture 
border="20">dialogs/DialogBackground.png</texture>
+                       </control>
 
                        <!-- Heading -->
                        <control type="label" id="1">
-                               <left>0</left>
-                               <top>0</top>
-                               <width>1200</width>
+                               <centerleft>50%</centerleft>
+                               <top>40</top>
+                               <width>600</width>
                                <height>48</height>
                                <align>center</align>
                                <font>Font48</font>
@@ -29,9 +37,9 @@
 
                        <!-- Details -->
                        <control type="textbox" id="9">
-                               <left>0</left>
-                               <top>86</top>
-                               <width>1200</width>
+                               <centerleft>50%</centerleft>
+                               <top>96</top>
+                               <width>600</width>
                                <height>158</height>
                                <align>center</align>
                                <font>Font42</font>
@@ -42,8 +50,8 @@
                        <!-- No -->
                        <control type="button" id="10">
                                <left>0</left>
-                               <top>340</top>
-                               <width>550</width>
+                               <top>262</top>
+                               <width>270</width>
                                <height>36</height>
                                <align>right</align>
                                <onleft>noop</onleft>
@@ -55,8 +63,8 @@
                        <!-- Yes -->
                        <control type="button" id="11">
                                <right>0</right>
-                               <top>340</top>
-                               <width>550</width>
+                               <top>262</top>
+                               <width>270</width>
                                <height>36</height>
                                <onleft>10</onleft>
                                <onright>noop</onright>
diff --git a/skin.conq/16x9/Include_Home_Default.xml 
b/skin.conq/16x9/Include_Home_Default.xml
index 834d5b4..1edcd18 100644
--- a/skin.conq/16x9/Include_Home_Default.xml
+++ b/skin.conq/16x9/Include_Home_Default.xml
@@ -10,7 +10,7 @@
                        <width>460</width>
                        <height>360</height>
                        <onup>9000</onup>
-                       <ondown>9001</ondown>
+                       <ondown>9000</ondown>
                        <onleft>noop</onleft>
                        <onright>9001</onright>
                        <focusposition>1</focusposition>
@@ -271,8 +271,9 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),VideoAddons)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -359,8 +360,9 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecentMovies)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -425,11 +427,13 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="video">plugin://service.library.data.provider?type=recentmovies&amp;reload=$INFO[Window.Property(recentmovies)]&amp;limit=12</content>
+                       <content>
+                               <include>RecentMovies</include>
+                       </content>
 
                </control>
 
-               <!-- Random Movies sub menu -->
+               <!-- Recommended Movies sub menu -->
                <control type="list" id="9002">
                        <left>2605</left>
                        <top>688</top>
@@ -443,10 +447,11 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
-                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)</visible>
+                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
                        <animation effect="slide" start="0,0" end="-1000,0" 
time="0" 
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
@@ -509,11 +514,13 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="video">plugin://service.library.data.provider?type=randommovies&amp;reload=$INFO[Window.Property(randommovies)]&amp;limit=12</content>
+                       <content>
+                               <include>RecommendedMovies</include>
+                       </content>
 
                </control>
 
-               <!-- Recommended Movies sub menu -->
+               <!-- Random Movies sub menu -->
                <control type="list" id="9002">
                        <left>2605</left>
                        <top>688</top>
@@ -527,10 +534,11 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
-                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)</visible>
+                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
                        <animation effect="slide" start="0,0" end="-1000,0" 
time="0" 
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
@@ -593,7 +601,9 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="video">plugin://service.library.data.provider?type=recommendedmovies&amp;reload=$INFO[Window.Property(recommendedmovies)]&amp;limit=12</content>
+                       <content>
+                               <include>RandomMovies</include>
+                       </content>
 
                </control>
 
@@ -611,8 +621,9 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecentEpisodes)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -630,7 +641,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -651,7 +662,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -662,7 +673,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -677,11 +688,13 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="video">plugin://service.library.data.provider?type=recentepisodes&amp;reload=$INFO[Window.Property(recentepisodes)]&amp;limit=12</content>
+                       <content>
+                               <include>RecentEpisodes</include>
+                       </content>
 
                </control>
 
-               <!-- Random episodes -->
+               <!-- Recommended episodes -->
                <control type="list" id="9002">
                        <left>2605</left>
                        <top>688</top>
@@ -695,10 +708,11 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
-                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomEpisodes)</visible>
+                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedEpisodes)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
                        <animation effect="slide" start="0,0" end="-1000,0" 
time="0" 
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
@@ -714,7 +728,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -735,7 +749,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -746,7 +760,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -761,11 +775,13 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="video">plugin://service.library.data.provider?type=randomepisodes&amp;reload=$INFO[Window.Property(randomepisodes)]&amp;limit=12</content>
+                       <content>
+                               <include>RecommendedEpisodes</include>
+                       </content>
 
                </control>
 
-               <!-- Recommended episodes -->
+               <!-- Random episodes -->
                <control type="list" id="9002">
                        <left>2605</left>
                        <top>688</top>
@@ -779,10 +795,11 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
-                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedEpisodes)</visible>
+                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomEpisodes)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
                        <animation effect="slide" start="0,0" end="-1000,0" 
time="0" 
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
@@ -798,7 +815,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -819,7 +836,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -830,7 +847,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -845,7 +862,9 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="video">plugin://service.library.data.provider?type=recommendedepisodes&amp;reload=$INFO[Window.Property(recommendedepisodes)]&amp;limit=12</content>
+                       <content>
+                               <include>RandomEpisodes</include>
+                       </content>
 
                </control>
 
@@ -863,8 +882,9 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecentAlbums)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -929,11 +949,13 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="music">plugin://service.library.data.provider?type=recentalbums&amp;reload=$INFO[Window.Property(recentalbums)]&amp;limit=12</content>
+                       <content>
+                               <include>RecentAlbums</include>
+                       </content>
 
                </control>
 
-               <!-- Random Albums -->
+               <!-- Recommended Albums -->
                <control type="list" id="9002">
                        <left>2605</left>
                        <top>778</top>
@@ -947,10 +969,11 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
-                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums)</visible>
+                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
                        <animation effect="slide" start="0,0" end="-1000,0" 
time="0" 
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
@@ -1013,11 +1036,13 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="music">plugin://service.library.data.provider?type=randomalbums&amp;reload=$INFO[Window.Property(randomalbums)]&amp;limit=12</content>
+                       <content>
+                               <include>RandomAlbums</include>
+                       </content>
 
                </control>
 
-               <!-- Recommended Albums -->
+               <!-- Random Albums -->
                <control type="list" id="9002">
                        <left>2605</left>
                        <top>778</top>
@@ -1031,10 +1056,11 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
-                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums)</visible>
+                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
                        <animation effect="slide" start="0,0" end="-1000,0" 
time="0" 
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
@@ -1097,7 +1123,9 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="music">plugin://service.library.data.provider?type=recommendedalbums&amp;reload=$INFO[Window.Property(recommendedalbums)]&amp;limit=12</content>
+                       <content>
+                               <include>RecommendedAlbums</include>
+                       </content>
 
                </control>
 
@@ -1115,8 +1143,9 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -1199,8 +1228,9 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -1283,8 +1313,9 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),favourites)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -1428,8 +1459,9 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -1514,8 +1546,9 @@
                        <ondown>9000</ondown>
                        <onleft>9000</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),PVR)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
diff --git a/skin.conq/16x9/Include_Home_Horizontal.xml 
b/skin.conq/16x9/Include_Home_Horizontal.xml
index 2ed27a1..8c91b85 100644
--- a/skin.conq/16x9/Include_Home_Horizontal.xml
+++ b/skin.conq/16x9/Include_Home_Horizontal.xml
@@ -114,8 +114,24 @@
                        <font>Font33</font>
                        <align>center</align>
                        <textcolor>$VAR[SubMenuColor]</textcolor>
+                       <label>$INFO[Container(9002).ListItem.Label]</label>
+                       <visible>Control.HasFocus(9002)</visible>
+                       <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
+                       <animation effect="fade" start="0" end="100" time="200" 
delay="100">Visible</animation>
+                       <animation effect="slide" start="0,0" end="0,90" 
time="0" 
condition="StringCompare(Container(9000).ListItem.Property(Widget),VideoAddons) 
| StringCompare(Container(9000).ListItem.Property(Widget),RecentAlbums) | 
StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums) | 
StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums) | 
StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons) | 
StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons) | 
StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons) | 
StringCompare(Container(9000).ListItem.Property(Widget),favourites) | 
StringCompare(Container(9000).ListItem.Property(Widget),PVR)">conditional</animation>
+               </control>
+
+               <!-- Sub menu label -->
+               <control type="label">
+                       <top>636</top>
+                       <left>120</left>
+                       <width>1680</width>
+                       <height>33</height>
+                       <font>Font33</font>
+                       <align>center</align>
+                       <textcolor>$VAR[SubMenuColor]</textcolor>
                        <label>$VAR[SubMenuHeading]</label>
-                       <visible>!Skin.HasSetting(HideSubmenuHeading)</visible>
+                       <visible>!Control.HasFocus(9002)</visible>
                        <visible>!Container(9000).OnNext + 
!Container(9000).OnPrevious</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100">Visible</animation>
@@ -279,8 +295,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),VideoAddons)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -365,9 +382,10 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecentMovies)</visible>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
@@ -433,11 +451,13 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="video">plugin://service.library.data.provider?type=recentmovies&amp;reload=$INFO[Window.Property(recentmovies)]&amp;limit=12</content>
+                       <content>
+                               <include>RecentMovies</include>
+                       </content>
 
                </control>
 
-               <!-- Random Movies sub menu -->
+               <!-- Recommended Movies sub menu -->
                <control type="list" id="9002">
                        <left>-1894</left>
                        <top>688</top>
@@ -447,9 +467,10 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
-                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)</visible>
+                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)</visible>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
@@ -515,11 +536,13 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="video">plugin://service.library.data.provider?type=randommovies&amp;reload=$INFO[Window.Property(randommovies)]&amp;limit=12</content>
+                       <content>
+                               <include>RecommendedMovies</include>
+                       </content>
 
                </control>
 
-               <!-- Recommended Movies sub menu -->
+               <!-- Random Movies sub menu -->
                <control type="list" id="9002">
                        <left>-1894</left>
                        <top>688</top>
@@ -529,9 +552,10 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
-                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)</visible>
+                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)</visible>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
@@ -597,7 +621,9 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-                       <content 
target="video">plugin://service.library.data.provider?type=recommendedmovies&amp;reload=$INFO[Window.Property(recommendedmovies)]&amp;limit=12</content>
+                       <content>
+                               <include>RandomMovies</include>
+                       </content>
 
                </control>
 
@@ -611,8 +637,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecentEpisodes)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -632,7 +659,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -653,7 +680,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -664,7 +691,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -679,7 +706,9 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-               <content 
target="video">plugin://service.library.data.provider?type=recentepisodes&amp;reload=$INFO[Window.Property(recentepisodes)]&amp;limit=12</content>
+                       <content>
+                               <include>RecentEpisodes</include>
+                       </content>
 
                </control>
 
@@ -693,8 +722,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedEpisodes)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -714,7 +744,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -735,7 +765,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -746,7 +776,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -761,7 +791,9 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-               <content 
target="video">plugin://service.library.data.provider?type=recommendedepisodes&amp;reload=$INFO[Window.Property(recommendedepisodes)]&amp;limit=12</content>
+                       <content>
+                               <include>RecommendedEpisodes</include>
+                       </content>
 
                </control>
 
@@ -775,8 +807,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomEpisodes)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -796,7 +829,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -817,7 +850,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture colordiffuse="88f1f1f1" 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -828,7 +861,7 @@
                                        <top>0</top>
                                        <width>183</width>
                                        <height>306</height>
-                                       <texture 
background="true">$INFO[ListItem.Art(tvshow.poster)]</texture>
+                                       <texture 
background="true">$INFO[ListItem.Icon]</texture>
                                        <aspectratio 
align="center">scale</aspectratio>
                                        <bordertexture 
border="1,1,1,36">views/DropShadowSmall.png</bordertexture>
                                        <bordersize>0,0,0,33</bordersize>
@@ -843,7 +876,9 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-               <content 
target="video">plugin://service.library.data.provider?type=randomepisodes&amp;reload=$INFO[Window.Property(randomepisodes)]&amp;limit=12</content>
+                       <content>
+                               <include>RandomEpisodes</include>
+                       </content>
 
                </control>
 
@@ -857,8 +892,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecentAlbums)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -925,11 +961,13 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-               <content 
target="music">plugin://service.library.data.provider?type=recentalbums&amp;reload=$INFO[Window.Property(recentalbums)]&amp;limit=12</content>
+                       <content>
+                               <include>RecentAlbums</include>
+                       </content>
 
                </control>
 
-               <!-- Random Albums -->
+               <!-- Recommended Albums -->
                <control type="list" id="9002">
                        <left>-1894</left>
                        <top>778</top>
@@ -939,10 +977,11 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
-                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums)</visible>
+                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
                        <animation effect="slide" start="0,0" end="2749,0" 
time="0" 
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
@@ -1007,11 +1046,13 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-               <content 
target="music">plugin://service.library.data.provider?type=randomalbums&amp;reload=$INFO[Window.Property(randomalbums)]&amp;limit=12</content>
+                       <content>
+                               <include>RandomAlbums</include>
+                       </content>
 
                </control>
 
-               <!-- Recommended Albums -->
+               <!-- Random Albums -->
                <control type="list" id="9002">
                        <left>-1894</left>
                        <top>778</top>
@@ -1021,10 +1062,11 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
-                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums)</visible>
+                       
<visible>StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
                        <animation effect="fade" start="0" end="100" time="200" 
delay="100" >Visible</animation>
                        <animation effect="slide" start="0,0" end="2749,0" 
time="0" 
condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
@@ -1089,7 +1131,9 @@
                                        
<visible>Skin.HasSetting(Overlays)</visible>
                                </control>
                        </focusedlayout>
-               <content 
target="music">plugin://service.library.data.provider?type=recommendedalbums&amp;reload=$INFO[Window.Property(recommendedalbums)]&amp;limit=12</content>
+                       <content>
+                               <include>RecommendedAlbums</include>
+                       </content>
 
                </control>
 
@@ -1103,8 +1147,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -1185,8 +1230,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -1267,8 +1313,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),Favourites)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -1410,8 +1457,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -1492,8 +1540,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),Playlist)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -1574,8 +1623,9 @@
                        <ondown>noop</ondown>
                        <onleft>noop</onleft>
                        <onright>noop</onright>
-                       <orientation>horizontal</orientation>
                        <viewtype label="">list</viewtype>
+                       <orientation>horizontal</orientation>
+                       <defaultcontrol always="true">0</defaultcontrol>
                        <scrolltime tween="sine" easing="out">240</scrolltime>
                        
<visible>StringCompare(Container(9000).ListItem.Property(Widget),PVR)</visible>
                        <animation effect="fade" start="100" end="0" 
time="0">Hidden</animation>
@@ -1632,4 +1682,4 @@
 
        </include>
 
-</includes>
\ No newline at end of file
+</includes>
diff --git a/skin.conq/16x9/Includes.xml b/skin.conq/16x9/Includes.xml
index c08bad8..f0a8ebe 100644
--- a/skin.conq/16x9/Includes.xml
+++ b/skin.conq/16x9/Includes.xml
@@ -3,6 +3,7 @@
        <include file="Defaults.xml" />
        <include file="Include_Home_Default.xml" />
        <include file="Include_Home_Horizontal.xml" />
+       <include file="Includes_Widgets.xml" />
        <include file="script-skinshortcuts-includes.xml"/>
        <include file="Viewtype50.xml" />
        <include file="Viewtype51.xml" />
@@ -74,6 +75,16 @@
                </control>
        </include>
 
+       <!-- Dialog fade background image -->
+       <include name="DialogFadeBackgroundImage">
+               <control type="image">
+                       <include>FullscreenDimensions</include>
+                       <texture 
colordiffuse="44000000">dialogs/DialogTextBackground.png</texture>
+                       <animation effect="fade" start="0" end="100" 
time="200">WindowOpen</animation>
+                       <animation effect="fade" start="100" end="0" 
time="200">WindowClose</animation>
+               </control>
+       </include>
+
        <!-- Options background image -->
        <include name="OptionsBackgroundImage">
                <control type="image">
diff --git a/skin.conq/16x9/MyWeather.xml b/skin.conq/16x9/MyWeather.xml
index 46d5db7..4205c05 100644
--- a/skin.conq/16x9/MyWeather.xml
+++ b/skin.conq/16x9/MyWeather.xml
@@ -23,7 +23,7 @@
                        <left>20</left>
                        <top>20</top>
                        <width>1880</width>
-                       <height>714</height>
+                       <height>688</height>
                        <texture 
border="0,0,0,40">common/CurveHorz.png</texture>
                        <visible>Skin.HasSetting(ShowCurve)</visible>
                </control>
@@ -37,7 +37,7 @@
 
                        <!-- View -->
                        <control type="list" id="50">
-                               <left>140</left>
+                               <left>120</left>
                                <top>288</top>
                                <width>1680</width>
                                <height>400</height>
@@ -52,11 +52,11 @@
                                <animation effect="slide" start="0,0" 
end="406,0" time="0" 
condition="StringCompare(Container(50).NumItems,4)">conditional</animation>
                                <animation effect="slide" start="0,0" 
end="203,0" time="0" 
condition="StringCompare(Container(50).NumItems,5)">conditional</animation>
 
-                               <itemlayout width="260" height="400">
+                               <itemlayout width="280" height="400">
                                        <control type="label">
                                                <top>2</top>
-                                               <left>130</left>
-                                               <width>260</width>
+                                               <left>140</left>
+                                               <width>280</width>
                                                <height>42</height>
                                                <font>Font42</font>
                                                <align>center</align>
@@ -65,7 +65,7 @@
                                                
<label>$INFO[ListItem.Label]</label>
                                        </control>
                                        <control type="image">
-                                               <left>30</left>
+                                               <left>40</left>
                                                <top>80</top>
                                                <width>200</width>
                                                <height>200</height>
@@ -73,9 +73,9 @@
                                                <aspectratio align="center" 
aligny="bottom">keep</aspectratio>
                                        </control>
                                        <control type="label">
-                                               <left>130</left>
+                                               <left>140</left>
                                                <top>320</top>
-                                               <width>260</width>
+                                               <width>280</width>
                                                <height>36</height>
                                                <font>Font36</font>
                                                <align>center</align>
@@ -84,11 +84,11 @@
                                        </control>
                                </itemlayout>
 
-                               <focusedlayout width="360" height="439">
+                               <focusedlayout width="280" height="400">
                                        <control type="label">
                                                <top>2</top>
-                                               <left>170</left>
-                                               <width>340</width>
+                                               <left>140</left>
+                                               <width>280</width>
                                                <height>42</height>
                                                <font>Font42</font>
                                                <align>center</align>
@@ -97,23 +97,27 @@
                                                
<shadowcolor>TextColor4</shadowcolor>
                                        </control>
                                        <control type="image">
-                                               <top>40</top>
-                                               <width>340</width>
-                                               <height>340</height>
+                                               <left>40</left>
+                                               <top>80</top>
+                                               <width>200</width>
+                                               <height>200</height>
                                                <texture 
background="true">$INFO[ListItem.Icon]</texture>
                                                <aspectratio align="center" 
aligny="bottom">keep</aspectratio>
                                        </control>
+                                       <control type="label">
+                                               <left>140</left>
+                                               <top>320</top>
+                                               <width>280</width>
+                                               <height>36</height>
+                                               <font>Font36</font>
+                                               <align>center</align>
+                                               
<textcolor>TextColor2</textcolor>
+                                               
<label>$INFO[ListItem.Label2]</label>
+                                       </control>
                                </focusedlayout>
                                <content>
                                        <item>
                                                <onclick>noop</onclick>
-                                               <label>33006</label>
-                                               
<label2>$INFO[Window(Weather).Property(Day0.LowTemp)]$INFO[System.TemperatureUnits]
 / 
$INFO[Window(Weather).Property(Day0.HighTemp)]$INFO[System.TemperatureUnits]</label2>
-                                               
<icon>$INFO[Window(Weather).Property(Day0.OutlookIcon)]</icon>
-                                               
<visible>!IsEmpty(Window(Weather).Property(Day0.OutlookIcon))</visible>
-                                       </item>
-                                       <item>
-                                               <onclick>noop</onclick>
                                                <label>$VAR[Day1]</label>
                                                
<label2>$INFO[Window(Weather).Property(Day1.LowTemp)]$INFO[System.TemperatureUnits]
 / 
$INFO[Window(Weather).Property(Day1.HighTemp)]$INFO[System.TemperatureUnits]</label2>
                                                
<icon>$INFO[Window(Weather).Property(Day1.OutlookIcon)]</icon>
@@ -147,14 +151,31 @@
                                                
<icon>$INFO[Window(Weather).Property(Day5.OutlookIcon)]</icon>
                                                
<visible>!IsEmpty(Window(Weather).Property(Day5.OutlookIcon))</visible>
                                        </item>
+                                       <item>
+                                               <onclick>noop</onclick>
+                                               <label>$VAR[Day6]</label>
+                                               
<label2>$INFO[Window(Weather).Property(Day6.LowTemp)]$INFO[System.TemperatureUnits]
 / 
$INFO[Window(Weather).Property(Day6.HighTemp)]$INFO[System.TemperatureUnits]</label2>
+                                               
<icon>$INFO[Window(Weather).Property(Day6.OutlookIcon)]</icon>
+                                               
<visible>!IsEmpty(Window(Weather).Property(Day6.OutlookIcon))</visible>
+                                       </item>
                                </content>
 
                        </control>
 
+                       <!-- Current icon -->
+                       <control type="image">
+                               <left>120</left>
+                               <bottom>120</bottom>
+                               <width>220</width>
+                               <height>220</height>
+                               <texture 
background="true">$INFO[Window(Weather).Property(Day0.OutlookIcon)]</texture>
+                               <aspectratio align="center" 
aligny="bottom">keep</aspectratio>
+                       </control>
+
                        <!-- Weather Info -->
                        <control type="group">
-                               <left>120</left>
-                               <top>458</top>
+                               <left>420</left>
+                               <top>438</top>
                                <control type="label">
                                        <left>0</left>
                                        <top>314</top>
diff --git a/skin.conq/16x9/Pointer.xml b/skin.conq/16x9/Pointer.xml
index 2e0d2e6..53723c9 100644
--- a/skin.conq/16x9/Pointer.xml
+++ b/skin.conq/16x9/Pointer.xml
@@ -10,6 +10,7 @@
                        <width>200</width>
                        <height>50</height>
                        <texture>mouse.png</texture>
+                       <visible>!Skin.HasSetting(HideMouse)</visible>
                </control>
 
                <!-- Pointer focus -->
@@ -17,6 +18,7 @@
                        <width>200</width>
                        <height>50</height>
                        <texture>mouse.png</texture>
+                       <visible>!Skin.HasSetting(HideMouse)</visible>
                </control>
 
                <!-- Pointer drag -->
@@ -24,6 +26,7 @@
                        <width>200</width>
                        <height>50</height>
                        <texture>mouse.png</texture>
+                       <visible>!Skin.HasSetting(HideMouse)</visible>
                </control>
 
                <!-- Pointer click -->
@@ -31,6 +34,7 @@
                        <width>200</width>
                        <height>50</height>
                        <texture>mouse.png</texture>
+                       <visible>!Skin.HasSetting(HideMouse)</visible>
                </control>
 
        </controls>
diff --git a/skin.conq/16x9/SkinSettings.xml b/skin.conq/16x9/SkinSettings.xml
index 4b78149..93a31fb 100644
--- a/skin.conq/16x9/SkinSettings.xml
+++ b/skin.conq/16x9/SkinSettings.xml
@@ -585,7 +585,7 @@
                                        <onup>101</onup>
                                        <textwidth>1120</textwidth>
                                        <label>31064</label>
-                                       
<onclick>Skin.SetFile(CustomBackground,,special://skin/extras/backgrounds/)</onclick>
+                                       
<onclick>Skin.SetImage(CustomBackgroundImage)</onclick>
                                        
<visible>ControlGroup(9).HasFocus(11)</visible>
                                </control>
                                <!-- Background video -->
@@ -651,6 +651,16 @@
                                        
<selected>Skin.HasSetting(ShowCurve)</selected>
                                        
<visible>ControlGroup(9).HasFocus(12)</visible>
                                </control>
+                               <!-- Hide 'Mouse' warning -->
+                               <control type="radiobutton" id="1008">
+                                       <width>1200</width>
+                                       <height>66</height>
+                                       <textwidth>1120</textwidth>
+                                       <label>31065</label>
+                                       
<onclick>Skin.ToggleSetting(HideMouse)</onclick>
+                                       
<selected>Skin.HasSetting(HideMouse)</selected>
+                                       
<visible>ControlGroup(9).HasFocus(12)</visible>
+                               </control>
                                <!-- Enable Debug Grid -->
                                <control type="radiobutton" id="1302">
                                        <width>1200</width>
diff --git a/skin.conq/16x9/Variables.xml b/skin.conq/16x9/Variables.xml
index be89008..87c07c8 100644
--- a/skin.conq/16x9/Variables.xml
+++ b/skin.conq/16x9/Variables.xml
@@ -42,32 +42,26 @@
        </variable>
 
        <variable name="BackgroundImage">
-               <value 
condition="!IsEmpty(Skin.String(CustomBackground))">$INFO[Skin.String(CustomBackground)]</value>
+               <value 
condition="!IsEmpty(Skin.String(CustomBackgroundImage))">$INFO[Skin.String(CustomBackgroundImage)]</value>
                <value>special://skin/extras/backgrounds/blue.jpg</value>
        </variable>
 
        <variable name="SubMenuHeading">
-               <value condition="Control.HasFocus(9002) + 
!IsEmpty(Container(9002).ListItem.Episode) + 
IntegerGreaterThan(Container(9002).ListItem.Season,9) + 
IntegerGreaterThan(Container(9002).ListItem.Episode,9) + 
!SubString(Container(9002).ListItem.Episode,s)">$INFO[Container(9002).ListItem.TVShowTitle]$INFO[Container(9002).ListItem.Season,
 - S]$INFO[Container(9002).ListItem.Episode,E]</value>
-               <value condition="Control.HasFocus(9002) + 
!IsEmpty(Container(9002).ListItem.Episode) + 
!IntegerGreaterThan(Container(9002).ListItem.Season,9) + 
IntegerGreaterThan(Container(9002).ListItem.Episode,9) + 
!SubString(Container(9002).ListItem.Episode,s)">$INFO[Container(9002).ListItem.TVShowTitle]$INFO[Container(9002).ListItem.Season,
 - S0]$INFO[Container(9002).ListItem.Episode,E]</value>
-               <value condition="Control.HasFocus(9002) + 
!IsEmpty(Container(9002).ListItem.Episode) + 
IntegerGreaterThan(Container(9002).ListItem.Season,9) + 
!IntegerGreaterThan(Container(9002).ListItem.Episode,9) + 
!SubString(Container(9002).ListItem.Episode,s)">$INFO[Container(9002).ListItem.TVShowTitle]$INFO[Container(9002).ListItem.Season,
 - S]$INFO[Container(9002).ListItem.Episode,E0]</value>
-               <value condition="Control.HasFocus(9002) + 
!IsEmpty(Container(9002).ListItem.Episode) + 
!SubString(Container(9002).ListItem.Episode,s)">$INFO[Container(9002).ListItem.TVShowTitle]$INFO[Container(9002).ListItem.Season,
 - S0]$INFO[Container(9002).ListItem.Episode,E0]</value>
-               <value condition="Control.HasFocus(9002) + 
!IsEmpty(Container(9002).ListItem.Episode)">$INFO[Container(9002).ListItem.TVShowTitle]$INFO[Container(9002).ListItem.Episode,
 - ]</value>
-               <value condition="Control.HasFocus(9002) + 
!IsEmpty(Container(9002).ListItem.Artist)">$INFO[Container(9002).ListItem.Label]$INFO[Container(9002).ListItem.Artist,
 - ]</value>
-               <value condition="Control.HasFocus(9002) + 
!IsEmpty(Container(9002).ListItem.Year)">$INFO[Container(9002).ListItem.Label]$INFO[Container(9002).ListItem.Year,
 (,)]</value>
-               <value 
condition="Control.HasFocus(9002)">$INFO[Container(9002).ListItem.Label]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),VideoAddons) 
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[1037]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentMovies)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31031]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31032]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31054]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentEpisodes)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31035]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedEpisodes)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31036]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomEpisodes)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31055]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentAlbums)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31038]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31039]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[31056]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons) 
+ !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[1038]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[1039]</value>
-               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons)
 + !IsEmpty(Container(9002).ListItem.Label)">$LOCALIZE[1043]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),VideoAddons) 
+ !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[1037]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentMovies)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31031]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedMovies)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31032]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomMovies)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31054]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentEpisodes)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31035]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedEpisodes)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31036]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomEpisodes)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31055]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecentAlbums)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31038]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RecommendedAlbums)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31039]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),RandomAlbums)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[31056]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),MusicAddons) 
+ !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[1038]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),PictureAddons)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[1039]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),ProgramAddons)
 + !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[1043]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),Favourites) 
+ !IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(HideSubmenuHeading)">$LOCALIZE[1036]</value>
+               <value 
condition="StringCompare(Container(9000).ListItem.Property(Widget),Playlist) + 
!IsEmpty(Container(9002).ListItem.Label) + 
!Skin.HasSetting(Hide_Widget_Headings)">$INFO[Container(9002).ListItem.Label]</value>
        </variable>
 
        <variable name="SubMenuColor">
diff --git a/skin.conq/16x9/script-skinshortcuts.xml 
b/skin.conq/16x9/script-skinshortcuts.xml
index 03c81af..b02ab87 100644
--- a/skin.conq/16x9/script-skinshortcuts.xml
+++ b/skin.conq/16x9/script-skinshortcuts.xml
@@ -147,7 +147,7 @@
                        <control type="button" id="405">
                                <width>1200</width>
                                <label>$ADDON[script.skinshortcuts 
32072]</label>
-                               
<visible>StringCompare(Window.Property(groupname),mainmenu) + 
Skin.HasSetting(HomeHorizontal)</visible>
+                               
<visible>StringCompare(Window.Property(groupname),mainmenu)</visible>
                        </control>
 
                        <!-- Edit widget -->
@@ -188,7 +188,7 @@
 
                        <!-- OK Button -->
                        <control type="button" id="10">
-                               <width>400</width>
+                               <width>200</width>
                                <label>186</label>
                                <onback 
condition="StringCompare(Window.Property(groupname),mainmenu)">RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=9000&amp;levels=0)</onback>
                                <onclick 
condition="StringCompare(Window.Property(groupname),mainmenu)">RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=9000&amp;levels=0)</onclick>
@@ -201,6 +201,13 @@
                                <label>$ADDON[script.skinshortcuts 
32028]</label>
                        </control>
 
+                       <!-- Reset all -->
+                       <control type="button" id="999">
+                               <width>400</width>
+                               
<onclick>RunScript(script.skinshortcuts,type=resetall)</onclick>
+                               <label>$ADDON[script.skinshortcuts 
32037]</label>
+                       </control>
+
                </control>
 
        </controls>
diff --git a/skin.conq/addon.xml b/skin.conq/addon.xml
index 973d293..c4ef5a0 100644
--- a/skin.conq/addon.xml
+++ b/skin.conq/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
        id="skin.conq"
-       version="1.0.3"
+       version="1.0.31"
        name="Conq"
        provider-name="Hitcher">
        <requires>
diff --git a/skin.conq/changelog.txt b/skin.conq/changelog.txt
index 33e5563..ab0f464 100644
--- a/skin.conq/changelog.txt
+++ b/skin.conq/changelog.txt
@@ -1,3 +1,15 @@
+[B]1.0.4[/B]
+
+- Updated weather screen
+- Changed Movie, Episode, and Album widgets
+- Added 'Reset all' button to Shortcuts Menu
+- Added hide mouse warning options
+- Re-designed some dialogs
+
+[B]1.0.31[/B]
+
+- Fixed another background problem
+
 [B]1.0.3[/B]
 
 - Added 'Arial' font option
diff --git a/skin.conq/language/English/strings.po 
b/skin.conq/language/English/strings.po
index 0184779..52854a2 100644
--- a/skin.conq/language/English/strings.po
+++ b/skin.conq/language/English/strings.po
@@ -236,4 +236,8 @@ msgstr ""
 
 msgctxt "#31064"
 msgid "Custom background image"
+msgstr ""
+
+msgctxt "#31065"
+msgid "Hide 'Mouse' warning"
 msgstr ""
\ No newline at end of file
diff --git a/skin.conq/shortcuts/overrides.xml 
b/skin.conq/shortcuts/overrides.xml
index 94cac30..3de4cfc 100644
--- a/skin.conq/shortcuts/overrides.xml
+++ b/skin.conq/shortcuts/overrides.xml
@@ -14,7 +14,7 @@
        <!-- Recent episodes -->
        <widget label="Recent episodes">RecentEpisodes</widget>
        <widgetdefault labelID="tvshows">RecentEpisodes</widgetdefault>
-       <!-- Recommended Recommended movies -->
+       <!-- Recommended Recommended episodes -->
        <widget label="Recommended episodes">RecommendedEpisodes</widget>
        <!-- Random episodes -->
        <widget label="Random episodes">RandomEpisodes</widget>

-----------------------------------------------------------------------

Summary of changes:
 skin.conq/16x9/DialogBusy.xml              |   44 ++-
 skin.conq/16x9/DialogContextMenu.xml       |   52 ++-
 skin.conq/16x9/DialogOk.xml                |   36 +-
 skin.conq/16x9/DialogYesNo.xml             |   38 +-
 skin.conq/16x9/Include_Home_Default.xml    |  125 ++++--
 skin.conq/16x9/Include_Home_Horizontal.xml |  138 ++++--
 skin.conq/16x9/Includes.xml                |   11 +
 skin.conq/16x9/Includes_Widgets.xml        |  669 ++++++++++++++++++++++++++++
 skin.conq/16x9/MyWeather.xml               |   67 ++-
 skin.conq/16x9/Pointer.xml                 |    4 +
 skin.conq/16x9/SkinSettings.xml            |   12 +-
 skin.conq/16x9/Variables.xml               |   38 +-
 skin.conq/16x9/script-skinshortcuts.xml    |   11 +-
 skin.conq/addon.xml                        |    2 +-
 skin.conq/changelog.txt                    |   12 +
 skin.conq/language/English/strings.po      |    4 +
 skin.conq/media/home/DefaultAlbum.png      |  Bin 0 -> 4985 bytes
 skin.conq/media/home/DefaultEpisode.png    |  Bin 0 -> 6570 bytes
 skin.conq/media/home/DefaultMovie.png      |  Bin 0 -> 6237 bytes
 skin.conq/shortcuts/overrides.xml          |    2 +-
 20 files changed, 1062 insertions(+), 203 deletions(-)
 create mode 100644 skin.conq/16x9/Includes_Widgets.xml
 create mode 100644 skin.conq/media/home/DefaultAlbum.png
 create mode 100644 skin.conq/media/home/DefaultEpisode.png
 create mode 100644 skin.conq/media/home/DefaultMovie.png


hooks/post-receive
-- 
Skins

------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to