Changed: [Confluence] beginnings of a Horizontal Home Modification

1 files changed, 296 insertions, 296 deletions

diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index fb18f9f065..91ca078bf8 100644
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -13,6 +13,26 @@
 			<fadetime>1000</fadetime>
 		</control>
 		<include>CommonMediaPlayingBackground</include>
+		<control type="image">
+			<posx>0</posx>
+			<posy>90r</posy>
+			<width>1280</width>
+			<height>90</height>
+			<texture>floor.png</texture>
+			<animation effect="fade" time="250" condition="Window.Previous(Home)">WindowOpen</animation>
+			<animation effect="fade" time="250" condition="Window.Next(Home)">WindowClose</animation>
+		</control>
+		<control type="image">
+			<description>LOGO</description>
+			<posx>512</posx>
+			<posy>145r</posy>
+			<width>256</width>
+			<height>128</height>
+			<aspectratio aligny="bottom">keep</aspectratio>
+			<texture>xbmc-logo.png</texture>
+			<visible>!IntegerGreaterThan(Container(9002).NumItems,0)</visible>
+			<include>VisibleFadeEffect</include>
+		</control>
 		<!-- Music Info -->
 		<control type="group">
 			<posx>0</posx>
@@ -334,197 +354,114 @@
 		</control>
 		<include condition="Skin.HasSetting(homepageShowRecentlyAdded)">HomeRecentlyAddedInfo</include>
 		<control type="group">
-			<animation effect="slide" end="-450,0" time="500" tween="quadratic" easing="out">WindowClose</animation>
-			<animation effect="slide" start="-450,0" time="500" tween="quadratic" easing="out">WindowOpen</animation>
-			<control type="group">
-				<animation effect="slide" end="-228,0" time="300" tween="quadratic" easing="out">WindowClose</animation>
-				<control type="image">
-					<posx>379</posx>
-					<posy>0</posy>
-					<width>1</width>
-					<height>720</height>
-					<texture>HomeBladeSub_Part1.png</texture>
-					<animation effect="zoom" start="379,0,1,720" end="379,0,229,720" time="300" tween="quadratic" easing="out" condition="ControlGroup(9001).HasFocus | Control.HasFocus(9002)">Conditional</animation>
-				</control>
-				<control type="button" id="9002">
-					<posx>380</posx>
-					<posy>296</posy>
-					<width>42</width>
-					<height>128</height>
-					<font>-</font>
-					<texturefocus>HasSub.png</texturefocus>
-					<texturenofocus>HasSub.png</texturenofocus>
-					<visible>Container(9000).HasFocus(2) | Container(9000).HasFocus(3) | Container(9000).HasFocus(5) | Container(9000).HasFocus(7) | Container(9000).HasFocus(9) | [Container(9000).HasFocus(4) + [!IsEmpty(Skin.String(HomePictureButton1)) | !IsEmpty(Skin.String(HomePictureButton2)) | !IsEmpty(Skin.String(HomePictureButton3)) | !IsEmpty(Skin.String(HomePictureButton4)) | !IsEmpty(Skin.String(HomePictureButton5)) | !IsEmpty(Skin.String(HomePictureButton6))]] | [Container(9000).HasFocus(1) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]] | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)</visible>
-					<animation effect="slide" end="228,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9001).HasFocus | Control.HasFocus(9002)">Conditional</animation>
-					<include>VisibleFadeEffect</include>
-				</control>
-				<control type="image">
-					<posx>380</posx>
-					<posy>0</posy>
-					<width>12</width>
-					<height>720</height>
-					<texture>HomeBladeSub_Part2.png</texture>
-					<animation effect="slide" end="228,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9001).HasFocus | Control.HasFocus(9002)">Conditional</animation>
-				</control>
-			</control>
+			<posy>370</posy>
+			<animation effect="slide" start="0,0" end="0,-50"time="0" condition="!Skin.HasSetting(homepageShowRecentlyAdded)">conditional</animation>
 			<control type="group" id="9001">
-				<posx>170</posx>
-				<posy>0</posy>
-				<animation effect="fade" start="100" end="0" time="0" condition="![ControlGroup(9001).HasFocus | Control.HasFocus(9002)]">conditional</animation>
-				<animation effect="fade" start="0" end="100" delay="300" time="200" condition="ControlGroup(9001).HasFocus | Control.HasFocus(9002)">conditional</animation>
-				<animation effect="fade" start="100" end="0" time="0" condition="ControlGroup(9001).HasFocus | Control.HasFocus(9002)">WindowClose</animation>
-				<animation effect="slide" end="210,0" time="300" tween="quadratic" easing="out" condition="ControlGroup(9001).HasFocus | Control.HasFocus(9002)">conditional</animation>
+				<posx>0</posx>
+				<posy>70</posy>
 				<control type="grouplist" id="9010">
-					<posx>10</posx>
-					<posy>0</posy>
-					<width>240</width>
-					<height>720</height>
-					<align>center</align>
-					<onleft>9000</onleft>
-					<onright>Control.SetFocus(8000,0)</onright>
-					<onup>9010</onup>
-					<ondown>9010</ondown>
-					<itemgap>0</itemgap>
+					<include>HomeSubMenuCommonValues</include>
+					<onleft>9010</onleft>
+					<onright>9010</onright>
 					<visible>Container(9000).HasFocus(2)</visible>
 					<include>HomeSubMenuVideos</include> <!-- Buttons for the grouplist -->
 				</control>
 				<control type="grouplist" id="9011">
-					<posx>10</posx>
-					<posy>0</posy>
-					<width>240</width>
-					<height>720</height>
-					<align>center</align>
-					<onleft>9000</onleft>
-					<onright>9001</onright>
-					<onup>9011</onup>
-					<ondown>9011</ondown>
-					<itemgap>0</itemgap>
+					<include>HomeSubMenuCommonValues</include>
+					<onleft>9011</onleft>
+					<onright>9011</onright>
 					<visible>Container(9000).HasFocus(3)</visible>
 					<include>HomeSubMenuMusic</include> <!-- Buttons for the grouplist -->
 				</control>
-				<control type="grouplist" id="9013">
-					<posx>10</posx>
-					<posy>0</posy>
-					<width>240</width>
-					<height>720</height>
-					<align>center</align>
-					<onleft>9000</onleft>
-					<onright>9001</onright>
-					<onup>9015</onup>
-					<ondown>9015</ondown>
-					<itemgap>0</itemgap>
-					<visible>Container(9000).HasFocus(4) + [!IsEmpty(Skin.String(HomePictureButton1)) | !IsEmpty(Skin.String(HomePictureButton2)) | !IsEmpty(Skin.String(HomePictureButton3)) | !IsEmpty(Skin.String(HomePictureButton4)) | !IsEmpty(Skin.String(HomePictureButton5)) | !IsEmpty(Skin.String(HomePictureButton6))]</visible>
-					<include>HomeSubMenuPictures</include> <!-- Buttons for the grouplist -->
-				</control>
-				<control type="grouplist" id="9014">
-					<posx>10</posx>
-					<posy>0</posy>
-					<width>240</width>
-					<height>720</height>
-					<align>center</align>
-					<onleft>9000</onleft>
-					<onright>9001</onright>
-					<onup>9014</onup>
-					<ondown>9014</ondown>
-					<itemgap>0</itemgap>
+				<control type="grouplist" id="9012">
+					<include>HomeSubMenuCommonValues</include>
+					<onleft>9012</onleft>
+					<onright>9012</onright>
 					<visible>Container(9000).HasFocus(5)</visible>
 					<include>HomeSubMenuSystem</include> <!-- Buttons for the grouplist -->
 				</control>
-				<control type="grouplist" id="9015">
-					<posx>10</posx>
-					<posy>0</posy>
-					<width>240</width>
-					<height>720</height>
-					<align>center</align>
-					<onleft>9000</onleft>
-					<onright>9001</onright>
-					<onup>9015</onup>
-					<ondown>9015</ondown>
-					<itemgap>0</itemgap>
-					<visible>Container(9000).HasFocus(1) + [!IsEmpty(Skin.String(HomeProgramButton1)) | !IsEmpty(Skin.String(HomeProgramButton2)) | !IsEmpty(Skin.String(HomeProgramButton3)) | !IsEmpty(Skin.String(HomeProgramButton4)) | !IsEmpty(Skin.String(HomeProgramButton5)) | !IsEmpty(Skin.String(HomeProgramButton6))]</visible>
-					<include>HomeSubMenuPrograms</include> <!-- Buttons for the grouplist -->
-				</control>
-				<control type="grouplist" id="9016">
-					<posx>10</posx>
-					<posy>0</posy>
-					<width>240</width>
-					<height>720</height>
-					<align>center</align>
-					<onleft>9000</onleft>
-					<onright>Control.SetFocus(8000,0)</onright>
-					<onup>9016</onup>
-					<ondown>9016</ondown>
-					<itemgap>0</itemgap>
-					<visible>Container(9000).HasFocus(10)</visible>
-					<include>HomeSubMenuMovies</include> <!-- Buttons for the grouplist -->
-				</control>
-				<control type="grouplist" id="9017">
-					<posx>10</posx>
-					<posy>0</posy>
-					<width>240</width>
-					<height>720</height>
-					<align>center</align>
-					<onleft>9000</onleft>
-					<onright>Control.SetFocus(8001,0)</onright>
-					<onup>9017</onup>
-					<ondown>9017</ondown>
-					<itemgap>0</itemgap>
-					<visible>Container(9000).HasFocus(11)</visible>
-					<include>HomeSubMenuTVShows</include> <!-- Buttons for the grouplist -->
-				</control>
 			</control>
 			<control type="image">
-				<posx>-450</posx>
+				<posx>0</posx>
 				<posy>0</posy>
-				<width>846</width>
-				<height>720</height>
-				<colordiffuse>DAFFFFFF</colordiffuse>
-				<texture>HomeBlade_bottom.png</texture>
+				<width>1280</width>
+				<height>75</height>
+				<texture border="0,6,0,6">Homeback.png</texture>
+			</control>
+			<control type="image">
+				<posx>0</posx>
+				<posy>5</posy>
+				<width>1280</width>
+				<height>6</height>
+				<texture>HomeOverlay1.png</texture>
 			</control>
 			<control type="fixedlist" id="9000">
-				<hitrect x="50" y="50" w="330" h="620" />
-				<posx>-20</posx>
-				<posy>0</posy>
-				<width>400</width>
-				<height>720</height>
-				<onleft>10</onleft>
-				<onright>9001</onright>
+				<posx>-110</posx>
+				<posy>5</posy>
+				<width>1500</width>
+				<height>60</height>
+				<onleft>9000</onleft>
+				<onright>9000</onright>
 				<onup>9000</onup>
-				<ondown>9000</ondown>
+				<ondown>9001</ondown>
 				<pagecontrol>-</pagecontrol>
 				<scrolltime>300</scrolltime>
-				<focusposition>3</focusposition>
-				<movement>2</movement>
-				<animation effect="fade" start="0" end="100" time="200">Visible</animation>
-				<animation effect="fade" start="100" end="30" time="200" condition="Window.IsVisible(1113) | ControlGroup(9001).HasFocus | ControlGroup(10).HasFocus | Control.HasFocus(8000) | Control.HasFocus(8001) | Control.HasFocus(9002)">conditional</animation>
-				<itemlayout height="102" width="380">
+				<focusposition>2</focusposition>
+				<movement>1</movement>
+				<orientation>Horizontal</orientation>
+				<itemlayout height="60" width="300">
+					<control type="image">
+						<posx>0</posx>
+						<posy>4</posy>
+						<width>1</width>
+						<height>52</height>
+						<texture>HomeSeperator.png</texture>
+					</control>
+					<control type="image">
+						<posx>299</posx>
+						<posy>4</posy>
+						<width>1</width>
+						<height>52</height>
+						<texture>HomeSeperator.png</texture>
+					</control>
 					<control type="label">
-						<posx>380</posx>
+						<posx>150</posx>
 						<posy>0</posy>
-						<width>380</width>
-						<height>102</height>
+						<width>290</width>
+						<height>60</height>
 						<font>font50caps_title</font>
 						<textcolor>grey3</textcolor>
-						<align>right</align>
+						<align>center</align>
 						<aligny>center</aligny>
 						<label>$INFO[ListItem.Label]</label>
-						<animation effect="zoom" start="75" end="75" center="380,51" time="0" condition="true">Conditional</animation>
-						<animation effect="fade" start="100" end="30" time="200" condition="Window.IsVisible(1113) | ControlGroup(9001).HasFocus | ControlGroup(10).HasFocus | Control.HasFocus(9002)">conditional</animation>
 					</control>
 				</itemlayout>
-				<focusedlayout height="102" width="380">
+				<focusedlayout height="60" width="300">
+					<control type="image">
+						<posx>0</posx>
+						<posy>4</posy>
+						<width>1</width>
+						<height>52</height>
+						<texture>HomeSeperator.png</texture>
+					</control>
+					<control type="image">
+						<posx>299</posx>
+						<posy>4</posy>
+						<width>1</width>
+						<height>52</height>
+						<texture>HomeSeperator.png</texture>
+					</control>
 					<control type="label">
-						<posx>380</posx>
+						<posx>150</posx>
 						<posy>0</posy>
-						<width>380</width>
-						<height>102</height>
+						<width>290</width>
+						<height>60</height>
 						<font>font50caps_title</font>
 						<textcolor>white</textcolor>
-						<align>right</align>
+						<align>center</align>
 						<aligny>center</aligny>
-						<animation effect="zoom" start="75" end="100" center="380,51" time="200">Focus</animation>
-						<animation effect="zoom" start="100" end="75" center="380,51" time="200">UnFocus</animation>
 						<label>$INFO[ListItem.Label]</label>
+						<animation effect="fade" start="100" end="50" time="200" condition="!Control.HasFocus(9000)">conditional</animation>
 					</control>
 				</focusedlayout>
 				<content>
@@ -544,13 +481,6 @@
 						<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
 						<visible>Skin.HasSetting(ShowWeatherFanart) + !IsEmpty(Skin.String(WeatherFanartDir))</visible>
 					</item>
-					<item id="1">
-						<label>0</label>
-						<onclick>ActivateWindow(Programs,Addons,return)</onclick>
-						<icon>special://skin/backgrounds/programs.jpg</icon>
-						<thumb>$INFO[Skin.String(Home_Custom_Back_Programs_Folder)]</thumb>
-						<visible>!Skin.HasSetting(HomeMenuNoProgramsButton)</visible>
-					</item>
 					<item id="4">
 						<label>1</label>
 						<onclick>ActivateWindow(Pictures)</onclick>
@@ -563,28 +493,7 @@
 						<onclick>ActivateWindow(Videos)</onclick>
 						<icon>special://skin/backgrounds/videos.jpg</icon>
 						<thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb>
-						<visible>!Skin.HasSetting(HomeMenuNoVideosButton) + ![Skin.HasSetting(HomeMenuNoMoviesButton) + Skin.HasSetting(HomeMenuNoTVShowsButton)]</visible>
-					</item>
-					<item id="2">
-						<label>3</label>
-						<onclick>ActivateWindow(Videos,Files,return)</onclick>
-						<icon>special://skin/backgrounds/videos.jpg</icon>
-						<thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb>
-						<visible>!Skin.HasSetting(HomeMenuNoVideosButton) + [Skin.HasSetting(HomeMenuNoMoviesButton) + Skin.HasSetting(HomeMenuNoTVShowsButton)]</visible>
-					</item>
-					<item id="10">
-						<label>20342</label>
-						<onclick>ActivateWindow(Videos,MovieTitles,return)</onclick>
-						<icon>special://skin/backgrounds/videos.jpg</icon>
-						<thumb>$INFO[Skin.String(Home_Custom_Back_Movies_Folder)]</thumb>
-						<visible>Skin.HasSetting(HomeMenuNoMoviesButton) + Library.HasContent(Movies)</visible>
-					</item>
-					<item id="11">
-						<label>20343</label>
-						<onclick>ActivateWindow(Videos,TVShowTitles,return)</onclick>
-						<icon>special://skin/backgrounds/videos.jpg</icon>
-						<thumb>$INFO[Skin.String(Home_Custom_Back_TVShow_Folder)]</thumb>
-						<visible>Skin.HasSetting(HomeMenuNoTVShowsButton) + Library.HasContent(TVShows)</visible>
+						<visible>!Skin.HasSetting(HomeMenuNoVideosButton)</visible>
 					</item>
 					<item id="3">
 						<label>2</label>
@@ -593,6 +502,13 @@
 						<thumb>$INFO[Skin.String(Home_Custom_Back_Music_Folder)]</thumb>
 						<visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible>
 					</item>
+					<item id="1">
+						<label>0</label>
+						<onclick>ActivateWindow(Programs,Addons,return)</onclick>
+						<icon>special://skin/backgrounds/programs.jpg</icon>
+						<thumb>$INFO[Skin.String(Home_Custom_Back_Programs_Folder)]</thumb>
+						<visible>!Skin.HasSetting(HomeMenuNoProgramsButton)</visible>
+					</item>
 					<item id="5">
 						<label>13000</label>
 						<onclick>ActivateWindow(Settings)</onclick>
@@ -603,124 +519,216 @@
 			</control>
 			<control type="image">
 				<posx>0</posx>
-				<posy>-205</posy>
-				<width>385</width>
-				<height>1130</height>
-				<texture>HomeBlade_middle.png</texture>
-				<animation effect="slide" end="0,-204" time="300" condition="Container(9000).Row(1)">conditional</animation>
-				<animation effect="slide" end="0,-102" time="300" condition="Container(9000).Row(2)">conditional</animation>
-				<animation effect="slide" end="0,102" time="300" condition="Container(9000).Row(4)">conditional</animation>
-				<animation effect="slide" end="0,204" time="300" condition="Container(9000).Row(5)">conditional</animation>
-			</control>
-			<control type="image">
-				<posx>-450</posx>
-				<posy>0</posy>
-				<width>846</width>
-				<height>720</height>
-				<texture>HomeBlade_top.png</texture>
-			</control>
-			<control type="image">
-				<description>LOGO</description>
-				<posx>10</posx>
-				<posy>10</posy>
-				<width>140</width>
-				<height>40</height>
-				<texture>XBMC_Logo.png</texture>
-			</control>
-			<control type="image">
-				<description>LOGO Mirror</description>
-				<posx>10</posx>
-				<posy>42</posy>
-				<width>140</width>
-				<height>40</height>
-				<texture diffuse="diffuse_mirror2.png" flipy="true">XBMC_Logo.png</texture>
+				<posy>6</posy>
+				<width>128</width>
+				<height>50</height>
+				<texture>SideFade.png</texture>
 			</control>
 			<control type="image">
-				<posx>0</posx>
-				<posy>100r</posy>
-				<width>256</width>
-				<height>100</height>
-				<texture>HomeButtonsBack.png</texture>
+				<posx>128r</posx>
+				<posy>6</posy>
+				<width>128</width>
+				<height>60</height>
+				<texture flipx="true">SideFade.png</texture>
 			</control>
-			<control type="group" id="10">
-				<posx>15</posx>
-				<posy>55r</posy>
-				<control type="button" id="20">
-					<description>Power push button</description>
-					<posx>90</posx>
+		</control>
+		<control type="fixedlist" id="9002">
+			<posx>0</posx>
+			<posy>190r</posy>
+			<width>1280</width>
+			<height>200</height>
+			<onleft>9002</onleft>
+			<onright>9002</onright>
+			<onup>9001</onup>
+			<ondown>9000</ondown>
+			<pagecontrol>-</pagecontrol>
+			<scrolltime>300</scrolltime>
+			<focusposition>3</focusposition>
+			<movement>2</movement>
+			<orientation>Horizontal</orientation>
+			<itemlayout height="200" width="182">
+				<control type="image">
+					<posx>0</posx>
 					<posy>0</posy>
-					<width>43</width>
-					<height>43</height>
-					<label>31003</label>
-					<font>-</font>
-					<aligny>-</aligny>
-					<onclick>ActivateWindow(ShutdownMenu)</onclick>
-					<texturefocus>home-power-FO.png</texturefocus>
-					<texturenofocus>home-power.png</texturenofocus>
-					<onleft>21</onleft>
-					<onright>9000</onright>
-					<onup>9000</onup>
-					<ondown>9000</ondown>
-					<animation effect="slide" start="0,0" end="-45,0" time="0" condition="!System.HasMediaDVD">conditional</animation>
+					<width>180</width>
+					<height>120</height>
+					<aspectratio aligny="bottom">keep</aspectratio>
+					<bordertexture border="5">button-nofocus.png</bordertexture>
+					<bordersize>5</bordersize>
+					<texture background="true">$INFO[ListItem.Icon]</texture>
 				</control>
-				<control type="button" id="21">
-					<description>Favourites push button</description>
-					<posx>45</posx>
+				<control type="image">
+					<posx>5</posx>
+					<posy>120</posy>
+					<width>170</width>
+					<height>110</height>
+					<aspectratio aligny="top">keep</aspectratio>
+					<texture diffuse="diffuse_mirror2.png" flipy="true" background="true">$INFO[ListItem.Icon]</texture>
+				</control>
+				<control type="label">
+					<posx>91</posx>
+					<posy>125</posy>
+					<width>180</width>
+					<height>20</height>
+					<font>font12</font>
+					<textcolor>grey2</textcolor>
+					<align>center</align>
+					<aligny>center</aligny>
+					<label>$INFO[ListItem.Label]</label>
+				</control>
+			</itemlayout>
+			<focusedlayout height="200" width="182">
+				<control type="image">
+					<posx>0</posx>
 					<posy>0</posy>
-					<width>43</width>
-					<height>43</height>
-					<label>1036</label>
-					<font>-</font>
-					<aligny>-</aligny>
-					<onclick>ActivateWindow(Favourites)</onclick>
-					<texturefocus>home-favourites-FO.png</texturefocus>
-					<texturenofocus>home-favourites.png</texturenofocus>
-					<onleft>22</onleft>
-					<onright>20</onright>
-					<onup>9000</onup>
-					<ondown>9000</ondown>
-					<animation effect="slide" start="0,0" end="-45,0" time="0" condition="!System.HasMediaDVD">conditional</animation>
+					<width>180</width>
+					<height>120</height>
+					<aspectratio aligny="bottom">keep</aspectratio>
+					<bordertexture border="5">button-nofocus.png</bordertexture>
+					<bordersize>5</bordersize>
+					<texture background="true">$INFO[ListItem.Icon]</texture>
+					<visible>!Control.HasFocus(9002)</visible>
 				</control>
-				<control type="button" id="22">
-					<description>Play Disc Media push button</description>
+				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>43</width>
-					<height>43</height>
-					<label>16004</label>
-					<font>-</font>
-					<aligny>-</aligny>
-					<onclick>ActivateWindow(1113)</onclick>
-					<texturefocus>home-playmedia-FO.png</texturefocus>
-					<texturenofocus>home-playmedia.png</texturenofocus>
-					<onleft>9000</onleft>
-					<onright>21</onright>
-					<onup>9000</onup>
-					<ondown>9000</ondown>
-					<visible>System.HasMediaDVD</visible>
+					<width>180</width>
+					<height>120</height>
+					<aspectratio aligny="bottom">keep</aspectratio>
+					<bordertexture border="5">folder-focus.png</bordertexture>
+					<bordersize>5</bordersize>
+					<texture background="true">$INFO[ListItem.Icon]</texture>
+					<visible>Control.HasFocus(9002)</visible>
 				</control>
+				<control type="image">
+					<posx>5</posx>
+					<posy>120</posy>
+					<width>170</width>
+					<height>110</height>
+					<aspectratio aligny="top">keep</aspectratio>
+					<texture diffuse="diffuse_mirror2.png" flipy="true" background="true">$INFO[ListItem.Icon]</texture>
+				</control>
+				<control type="label">
+					<posx>91</posx>
+					<posy>125</posy>
+					<width>180</width>
+					<height>20</height>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+					<align>center</align>
+					<aligny>center</aligny>
+					<label>$INFO[ListItem.Label]</label>
+				</control>
+			</focusedlayout>
+			<content>
+				<item>
+					<label>$INFO[system.addontitle(Skin.String(HomeVideosButton1))]</label>
+					<onclick>RunAddon($INFO[Skin.String(HomeVideosButton1)])</onclick>
+					<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton1))]</icon>
+					<thumb>-</thumb>
+					<visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton1))</visible>
+				</item>
+				<item>
+					<label>$INFO[system.addontitle(Skin.String(HomeVideosButton2))]</label>
+					<onclick>RunAddon($INFO[Skin.String(HomeVideosButton2)])</onclick>
+					<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton2))]</icon>
+					<thumb>-</thumb>
+					<visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton2))</visible>
+				</item>
+				<item>
+					<label>$INFO[system.addontitle(Skin.String(HomeVideosButton3))]</label>
+					<onclick>RunAddon($INFO[Skin.String(HomeVideosButton3)])</onclick>
+					<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton3))]</icon>
+					<thumb>-</thumb>
+					<visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton3))</visible>
+				</item>
+				<item>
+					<label>$INFO[system.addontitle(Skin.String(HomeVideosButton4))]</label>
+					<onclick>RunAddon($INFO[Skin.String(HomeVideosButton4)])</onclick>
+					<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton4))]</icon>
+					<thumb>-</thumb>
+					<visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton4))</visible>
+				</item>
+				<item>
+					<label>$INFO[system.addontitle(Skin.String(HomeVideosButton5))]</label>
+					<onclick>RunAddon($INFO[Skin.String(HomeVideosButton5)])</onclick>
+					<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton5))]</icon>
+					<thumb>-</thumb>
+					<visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton5))</visible>
+				</item>
+			</content>
+		</control>
+		<control type="group" id="10">
+			<posx>15</posx>
+			<posy>55r</posy>
+			<visible>false</visible>
+			<control type="button" id="20">
+				<description>Power push button</description>
+				<posx>90</posx>
+				<posy>0</posy>
+				<width>43</width>
+				<height>43</height>
+				<label>31003</label>
+				<font>-</font>
+				<aligny>-</aligny>
+				<onclick>ActivateWindow(ShutdownMenu)</onclick>
+				<texturefocus>home-power-FO.png</texturefocus>
+				<texturenofocus>home-power.png</texturenofocus>
+				<onleft>21</onleft>
+				<onright>9000</onright>
+				<onup>9000</onup>
+				<ondown>9000</ondown>
+				<animation effect="slide" start="0,0" end="-45,0" time="0" condition="!System.HasMediaDVD">conditional</animation>
+			</control>
+			<control type="button" id="21">
+				<description>Favourites push button</description>
+				<posx>45</posx>
+				<posy>0</posy>
+				<width>43</width>
+				<height>43</height>
+				<label>1036</label>
+				<font>-</font>
+				<aligny>-</aligny>
+				<onclick>ActivateWindow(Favourites)</onclick>
+				<texturefocus>home-favourites-FO.png</texturefocus>
+				<texturenofocus>home-favourites.png</texturenofocus>
+				<onleft>22</onleft>
+				<onright>20</onright>
+				<onup>9000</onup>
+				<ondown>9000</ondown>
+				<animation effect="slide" start="0,0" end="-45,0" time="0" condition="!System.HasMediaDVD">conditional</animation>
+			</control>
+			<control type="button" id="22">
+				<description>Play Disc Media push button</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>43</width>
+				<height>43</height>
+				<label>16004</label>
+				<font>-</font>
+				<aligny>-</aligny>
+				<onclick>ActivateWindow(1113)</onclick>
+				<texturefocus>home-playmedia-FO.png</texturefocus>
+				<texturenofocus>home-playmedia.png</texturenofocus>
+				<onleft>9000</onleft>
+				<onright>21</onright>
+				<onup>9000</onup>
+				<ondown>9000</ondown>
+				<visible>System.HasMediaDVD</visible>
 			</control>
 		</control>
 		<control type="group">
-			<posx>420</posx>
-			<posy>35r</posy>
+			<posx>0</posx>
+			<posy>30r</posy>
 			<visible>system.getbool(lookandfeel.enablerssfeeds)</visible>
 			<animation effect="slide" end="0,35" time="300" tween="quadratic" easing="out">WindowClose</animation>
 			<animation effect="slide" start="0,35" time="300" tween="quadratic" easing="out">WindowOpen</animation>
-			<control type="image">
-				<description>RSS background</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>860</width>
-				<height>35</height>
-				<texture border="32,0,0,0">Rss_Back.png</texture>
-			</control>
 			<control type="rss">
 				<description>RSS feed</description>
-				<posx>35</posx>
-				<posy>6</posy>
-				<height>35</height>
-				<width>790</width>
+				<posx>0</posx>
+				<posy>0</posy>
+				<height>30</height>
+				<width>1245</width>
 				<font>font12</font>
 				<urlset>1</urlset>
 				<textcolor>blue</textcolor>
@@ -729,16 +737,8 @@
 			</control>
 			<control type="image">
 				<description>RSS background</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>100</width>
-				<height>35</height>
-				<texture border="32,0,0,0">Rss_Back_Overlay.png</texture>
-			</control>
-			<control type="image">
-				<description>RSS background</description>
-				<posx>832</posx>
-				<posy>8</posy>
+				<posx>1250</posx>
+				<posy>2</posy>
 				<width>24</width>
 				<height>24</height>
 				<texture>icon-rss.png</texture>