Changed: [Confluence] "Movies" and "TV Shows" are now enabled by default on home if you have the media content and recently added only shows if those buttons are focused (not videos anymore)

4 files changed, 254 insertions, 340 deletions

diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index 26f1db3372..2f7658db40 100644
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -583,14 +583,14 @@
 						<onclick>ActivateWindow(Videos,MovieTitles,return)</onclick>
 						<icon>-</icon>
 						<thumb>-</thumb>
-						<visible>Skin.HasSetting(HomeMenuNoMoviesButton) + Library.HasContent(Movies)</visible>
+						<visible>!Skin.HasSetting(HomeMenuNoMoviesButton) + Library.HasContent(Movies)</visible>
 					</item>
 					<item id="11">
 						<label>20343</label>
 						<onclick>ActivateWindow(Videos,TVShowTitles,return)</onclick>
 						<icon>-</icon>
 						<thumb>-</thumb>
-						<visible>Skin.HasSetting(HomeMenuNoTVShowsButton) + Library.HasContent(TVShows)</visible>
+						<visible>!Skin.HasSetting(HomeMenuNoTVShowsButton) + Library.HasContent(TVShows)</visible>
 					</item>
 					<item id="3">
 						<label>2</label>
diff --git a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
index f004bedfd1..6b201fed87 100644
--- a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
+++ b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
@@ -9,13 +9,13 @@
 			<include>ButtonHomeSubCommonValues</include>
 			<label>342</label>
 			<onclick>ActivateWindow(Videos,MovieTitles,return)</onclick>
-			<visible>Library.HasContent(Movies) + !Skin.HasSetting(HomeMenuNoMoviesButton)</visible>
+			<visible>Library.HasContent(Movies) + Skin.HasSetting(HomeMenuNoMoviesButton)</visible>
 		</control>
 		<control type="button" id="90103">
 			<include>ButtonHomeSubCommonValues</include>
 			<label>20343</label>
 			<onclick>ActivateWindow(Videos,TvShowTitles,return)</onclick>
-			<visible>Library.HasContent(TVShows) + !Skin.HasSetting(HomeMenuNoTVShowsButton)</visible>
+			<visible>Library.HasContent(TVShows) + Skin.HasSetting(HomeMenuNoTVShowsButton)</visible>
 		</control>
 		<control type="button" id="90104">
 			<include>ButtonHomeSubCommonValues</include>
diff --git a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
index f9b51c8998..2774541c4e 100644
--- a/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
+++ b/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
@@ -7,91 +7,11 @@
 			<include>VisibleFadeEffect</include>
 			<animation effect="fade" time="300" delay="1000">WindowOpen</animation>
 			<animation effect="fade" time="200">WindowClose</animation>
-<!-- Ones to show if TVShows or Movies button is Disabled in home -->
-			<control type="group">
-				<posx>740</posx>
-				<posy>30</posy>
-				<visible>Library.HasContent(Movies)</visible>
-				<visible>Container(9000).Hasfocus(2) + !Skin.HasSetting(HomeMenuNoMoviesButton) + !Skin.HasSetting(HomeMenuNoTVShowsButton)</visible>
-				<include>VisibleFadeEffect</include>
-				<control type="label">
-					<description>Title label</description>
-					<posx>0</posx>
-					<posy>220</posy>
-					<height>20</height>
-					<width>540</width>
-					<label>31323</label>
-					<align>center</align>
-					<aligny>center</aligny>
-					<font>font12_title</font>
-					<textcolor>white</textcolor>
-					<shadowcolor>black</shadowcolor>
-					<animation effect="slide" start="0,0" end="-180,0" time="300" condition="Control.HasFocus(8000)">Conditional</animation>
-					<animation effect="fade" start="100" end="0" time="300" condition="Control.HasFocus(8001)">Conditional</animation>
-				</control>
-				<control type="list" id="8000">
-					<animation effect="slide" start="0,0" end="-360,0" time="300" condition="Control.HasFocus(8000)">Conditional</animation>
-					<animation effect="slide" start="0,0" end="360,0" time="300" condition="Control.HasFocus(8001)">Conditional</animation>
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>900</width>
-					<height>220</height>
-					<onleft>SetFocus(8001,3)</onleft>
-					<onright>SetFocus(8001,3)</onright>
-					<onup>20</onup>
-					<ondown>600</ondown>
-					<viewtype label="535">list</viewtype>
-					<pagecontrol>-</pagecontrol>
-					<scrolltime>200</scrolltime>
-					<orientation>Horizontal</orientation>
-					<include>RecentlyAddedMovieContents</include>
-				</control>
-			</control>
-			<control type="group">
-				<posx>0</posx>
-				<posy>30</posy>
-				<visible>Library.HasContent(TVShows)</visible>
-				<visible>Container(9000).Hasfocus(2) + !Skin.HasSetting(HomeMenuNoMoviesButton) + !Skin.HasSetting(HomeMenuNoTVShowsButton)</visible>
-				<include>VisibleFadeEffect</include>
-				<control type="label">
-					<description>Title label</description>
-					<posx>0</posx>
-					<posy>220</posy>
-					<height>20</height>
-					<width>480</width>
-					<label>31324</label>
-					<align>center</align>
-					<aligny>center</aligny>
-					<font>font12_title</font>
-					<textcolor>white</textcolor>
-					<shadowcolor>black</shadowcolor>
-					<animation effect="fade" start="100" end="0" time="300" condition="Control.HasFocus(8000)">Conditional</animation>
-					<animation effect="slide" start="0,0" end="240,0" time="300" condition="Control.HasFocus(8001)">Conditional</animation>
-				</control>
-				<control type="list" id="8001">
-					<animation effect="slide" start="0,0" end="-240,0" time="300" condition="Control.HasFocus(8000)">Conditional</animation>
-					<animation effect="slide" start="0,0" end="480,0" time="300" condition="Control.HasFocus(8001)">Conditional</animation>
-					<posx>-480</posx>
-					<posy>0</posy>
-					<width>960</width>
-					<height>240</height>
-					<onleft>SetFocus(8000,0)</onleft>
-					<onright>SetFocus(8000,0)</onright>
-					<onup>20</onup>
-					<ondown>600</ondown>
-					<viewtype label="535">list</viewtype>
-					<pagecontrol>-</pagecontrol>
-					<scrolltime>0</scrolltime>
-					<orientation>Horizontal</orientation>
-					<include>RecentlyAddedTVShowContents</include>
-				</control>
-			</control>
-<!-- Ones to show if TVShows or Movies button is enabled in home -->
 			<control type="group">
 				<posx>190</posx>
 				<posy>30</posy>
 				<visible>Library.HasContent(Movies)</visible>
-				<visible>Container(9000).Hasfocus(10) | [[Container(9000).Hasfocus(2) + !Skin.HasSetting(HomeMenuNoMoviesButton)] + Skin.HasSetting(HomeMenuNoTVShowsButton)]</visible>
+				<visible>Container(9000).Hasfocus(10)</visible>
 				<include>VisibleFadeEffect</include>
 				<control type="label">
 					<description>Title label</description>
@@ -119,14 +39,125 @@
 					<pagecontrol>-</pagecontrol>
 					<scrolltime>200</scrolltime>
 					<orientation>Horizontal</orientation>
-					<include>RecentlyAddedMovieContents</include>
+					<itemlayout height="220" width="180">
+						<control type="image">
+							<description>background</description>
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>180</width>
+							<height>220</height>
+							<texture border="15">RecentAddedBack.png</texture>
+						</control>
+						<control type="image">
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>160</width>
+							<height>170</height>
+							<texture background="true">$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordersize>5</bordersize>
+						</control>
+						<control type="label">
+							<posx>90</posx>
+							<posy>185</posy>
+							<width>150</width>
+							<height>20</height>
+							<font>font12</font>
+							<textcolor>white</textcolor>
+							<shadowcolor>black</shadowcolor>
+							<selectedcolor>selected</selectedcolor>
+							<align>center</align>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label]</label>
+						</control>
+					</itemlayout>
+					<focusedlayout height="220" width="180">
+						<control type="image">
+							<description>background</description>
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>180</width>
+							<height>220</height>
+							<texture border="15">RecentAddedBack.png</texture>
+						</control>
+						<control type="image">
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>160</width>
+							<height>170</height>
+							<texture background="true">$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">folder-focus.png</bordertexture>
+							<bordersize>5</bordersize>
+							<visible>Control.HasFocus(8000)</visible>
+						</control>
+						<control type="image">
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>160</width>
+							<height>170</height>
+							<texture>$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordersize>5</bordersize>
+							<visible>!Control.HasFocus(8000)</visible>
+						</control>
+						<control type="label">
+							<posx>90</posx>
+							<posy>185</posy>
+							<width>150</width>
+							<height>20</height>
+							<font>font12</font>
+							<textcolor>white</textcolor>
+							<shadowcolor>black</shadowcolor>
+							<selectedcolor>selected</selectedcolor>
+							<align>center</align>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label]</label>
+						</control>
+					</focusedlayout>
+					<content>
+						<item id="1">
+							<label>$INFO[Window.Property(LatestMovie.1.Title)]</label>
+							<label2></label2>
+							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.1.Path)])</onclick>
+							<icon>$INFO[Window.Property(LatestMovie.1.Thumb)]</icon>
+							<thumb>-</thumb>
+						</item>
+						<item id="2">
+							<label>$INFO[Window.Property(LatestMovie.2.Title)]</label>
+							<label2></label2>
+							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.2.Path)])</onclick>
+							<icon>$INFO[Window.Property(LatestMovie.2.Thumb)]</icon>
+							<thumb>-</thumb>
+						</item>
+						<item id="3">
+							<label>$INFO[Window.Property(LatestMovie.3.Title)]</label>
+							<label2></label2>
+							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.3.Path)])</onclick>
+							<icon>$INFO[Window.Property(LatestMovie.3.Thumb)]</icon>
+							<thumb>-</thumb>
+						</item>
+						<item id="4">
+							<label>$INFO[Window.Property(LatestMovie.4.Title)]</label>
+							<label2></label2>
+							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.4.Path)])</onclick>
+							<icon>$INFO[Window.Property(LatestMovie.4.Thumb)]</icon>
+							<thumb>-</thumb>
+						</item>
+						<item id="5">
+							<label>$INFO[Window.Property(LatestMovie.5.Title)]</label>
+							<label2></label2>
+							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.5.Path)])</onclick>
+							<icon>$INFO[Window.Property(LatestMovie.5.Thumb)]</icon>
+							<thumb>-</thumb>
+						</item>
+					</content>
 				</control>
 			</control>
 			<control type="group">
 				<posx>0</posx>
 				<posy>30</posy>
 				<visible>Library.HasContent(TVShows)</visible>
-				<visible>Container(9000).Hasfocus(11) | [[Container(9000).Hasfocus(2) + !Skin.HasSetting(HomeMenuNoTVShowsButton)] + Skin.HasSetting(HomeMenuNoMoviesButton)]</visible>
+				<visible>Container(9000).Hasfocus(11)</visible>
 				<include>VisibleFadeEffect</include>
 				<control type="label">
 					<description>Title label</description>
@@ -154,259 +185,142 @@
 					<pagecontrol>-</pagecontrol>
 					<scrolltime>0</scrolltime>
 					<orientation>Horizontal</orientation>
-					<include>RecentlyAddedTVShowContents</include>
+					<itemlayout height="220" width="240">
+						<control type="image">
+							<description>background</description>
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>240</width>
+							<height>220</height>
+							<texture border="15">RecentAddedBack.png</texture>
+						</control>
+						<control type="image">
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>220</width>
+							<height>155</height>
+							<aspectratio>scale</aspectratio>
+							<texture background="true">$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordersize>5</bordersize>
+						</control>
+						<control type="label">
+							<posx>120</posx>
+							<posy>168</posy>
+							<width>200</width>
+							<height>20</height>
+							<font>font10</font>
+							<textcolor>grey2</textcolor>
+							<shadowcolor>black</shadowcolor>
+							<selectedcolor>selected</selectedcolor>
+							<align>center</align>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label2]</label>
+						</control>
+						<control type="label">
+							<posx>120</posx>
+							<posy>185</posy>
+							<width>200</width>
+							<height>20</height>
+							<font>font12</font>
+							<textcolor>white</textcolor>
+							<shadowcolor>black</shadowcolor>
+							<selectedcolor>selected</selectedcolor>
+							<align>center</align>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label]</label>
+						</control>
+					</itemlayout>
+					<focusedlayout height="220" width="240">
+						<control type="image">
+							<description>background</description>
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>240</width>
+							<height>220</height>
+							<texture border="15">RecentAddedBack.png</texture>
+						</control>
+						<control type="image">
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>220</width>
+							<height>155</height>
+							<aspectratio>scale</aspectratio>
+							<texture background="true">$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">folder-focus.png</bordertexture>
+							<bordersize>5</bordersize>
+							<visible>Control.HasFocus(8001)</visible>
+						</control>
+						<control type="image">
+							<posx>10</posx>
+							<posy>10</posy>
+							<width>220</width>
+							<height>155</height>
+							<aspectratio>scale</aspectratio>
+							<texture>$INFO[ListItem.Icon]</texture>
+							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordersize>5</bordersize>
+							<visible>!Control.HasFocus(8001)</visible>
+						</control>
+						<control type="label">
+							<posx>120</posx>
+							<posy>168</posy>
+							<width>200</width>
+							<height>20</height>
+							<font>font10</font>
+							<textcolor>grey2</textcolor>
+							<shadowcolor>black</shadowcolor>
+							<selectedcolor>selected</selectedcolor>
+							<align>center</align>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label2]</label>
+						</control>
+						<control type="label">
+							<posx>120</posx>
+							<posy>185</posy>
+							<width>200</width>
+							<height>20</height>
+							<font>font12</font>
+							<textcolor>white</textcolor>
+							<shadowcolor>black</shadowcolor>
+							<selectedcolor>selected</selectedcolor>
+							<align>center</align>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label]</label>
+						</control>
+					</focusedlayout>
+					<content>
+						<item id="4">
+							<label>$INFO[Window.Property(LatestEpisode.4.EpisodeTitle)]</label>
+							<label2>$INFO[Window.Property(LatestEpisode.4.ShowTitle)] - $INFO[Window.Property(LatestEpisode.4.EpisodeNo)]</label2>
+							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.4.Path)])</onclick>
+							<icon>-</icon>
+							<thumb>$INFO[Window.Property(LatestEpisode.4.Thumb)]</thumb>
+						</item>
+						<item id="3">
+							<label>$INFO[Window.Property(LatestEpisode.3.EpisodeTitle)]</label>
+							<label2>$INFO[Window.Property(LatestEpisode.3.ShowTitle)] - $INFO[Window.Property(LatestEpisode.3.EpisodeNo)]</label2>
+							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.3.Path)])</onclick>
+							<icon>-</icon>
+							<thumb>$INFO[Window.Property(LatestEpisode.3.Thumb)]</thumb>
+						</item>
+						<item id="2">
+							<label>$INFO[Window.Property(LatestEpisode.2.EpisodeTitle)]</label>
+							<label2>$INFO[Window.Property(LatestEpisode.2.ShowTitle)] - $INFO[Window.Property(LatestEpisode.2.EpisodeNo)]</label2>
+							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.2.Path)])</onclick>
+							<icon>-</icon>
+							<thumb>$INFO[Window.Property(LatestEpisode.2.Thumb)]</thumb>
+						</item>
+						<item id="1">
+							<label>$INFO[Window.Property(LatestEpisode.1.EpisodeTitle)]</label>
+							<label2>$INFO[Window.Property(LatestEpisode.1.ShowTitle)] - $INFO[Window.Property(LatestEpisode.1.EpisodeNo)]</label2>
+							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.1.Path)])</onclick>
+							<icon>-</icon>
+							<thumb>$INFO[Window.Property(LatestEpisode.1.Thumb)]</thumb>
+						</item>
+					</content>
 				</control>
 			</control>
 		</control>
 	</include>
-	<include name="RecentlyAddedMovieContents">
-		<itemlayout height="220" width="180">
-			<control type="image">
-				<description>background</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>180</width>
-				<height>220</height>
-				<texture border="15">RecentAddedBack.png</texture>
-			</control>
-			<control type="image">
-				<posx>10</posx>
-				<posy>10</posy>
-				<width>160</width>
-				<height>170</height>
-				<texture background="true">$INFO[ListItem.Icon]</texture>
-				<bordertexture border="5">button-nofocus.png</bordertexture>
-				<bordersize>5</bordersize>
-			</control>
-			<control type="label">
-				<posx>90</posx>
-				<posy>185</posy>
-				<width>150</width>
-				<height>20</height>
-				<font>font12</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<selectedcolor>selected</selectedcolor>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
-			</control>
-		</itemlayout>
-		<focusedlayout height="220" width="180">
-			<control type="image">
-				<description>background</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>180</width>
-				<height>220</height>
-				<texture border="15">RecentAddedBack.png</texture>
-			</control>
-			<control type="image">
-				<posx>10</posx>
-				<posy>10</posy>
-				<width>160</width>
-				<height>170</height>
-				<texture background="true">$INFO[ListItem.Icon]</texture>
-				<bordertexture border="5">folder-focus.png</bordertexture>
-				<bordersize>5</bordersize>
-				<visible>Control.HasFocus(8000)</visible>
-			</control>
-			<control type="image">
-				<posx>10</posx>
-				<posy>10</posy>
-				<width>160</width>
-				<height>170</height>
-				<texture>$INFO[ListItem.Icon]</texture>
-				<bordertexture border="5">button-nofocus.png</bordertexture>
-				<bordersize>5</bordersize>
-				<visible>!Control.HasFocus(8000)</visible>
-			</control>
-			<control type="label">
-				<posx>90</posx>
-				<posy>185</posy>
-				<width>150</width>
-				<height>20</height>
-				<font>font12</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<selectedcolor>selected</selectedcolor>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
-			</control>
-		</focusedlayout>
-		<content>
-			<item id="1">
-				<label>$INFO[Window.Property(LatestMovie.1.Title)]</label>
-				<label2></label2>
-				<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.1.Path)])</onclick>
-				<icon>$INFO[Window.Property(LatestMovie.1.Thumb)]</icon>
-				<thumb>-</thumb>
-			</item>
-			<item id="2">
-				<label>$INFO[Window.Property(LatestMovie.2.Title)]</label>
-				<label2></label2>
-				<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.2.Path)])</onclick>
-				<icon>$INFO[Window.Property(LatestMovie.2.Thumb)]</icon>
-				<thumb>-</thumb>
-			</item>
-			<item id="3">
-				<label>$INFO[Window.Property(LatestMovie.3.Title)]</label>
-				<label2></label2>
-				<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.3.Path)])</onclick>
-				<icon>$INFO[Window.Property(LatestMovie.3.Thumb)]</icon>
-				<thumb>-</thumb>
-			</item>
-			<item id="4">
-				<label>$INFO[Window.Property(LatestMovie.4.Title)]</label>
-				<label2></label2>
-				<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.4.Path)])</onclick>
-				<icon>$INFO[Window.Property(LatestMovie.4.Thumb)]</icon>
-				<thumb>-</thumb>
-			</item>
-			<item id="5">
-				<label>$INFO[Window.Property(LatestMovie.5.Title)]</label>
-				<label2></label2>
-				<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.5.Path)])</onclick>
-				<icon>$INFO[Window.Property(LatestMovie.5.Thumb)]</icon>
-				<thumb>-</thumb>
-			</item>
-		</content>
-	</include>
-	<include name="RecentlyAddedTVShowContents">
-		<itemlayout height="220" width="240">
-			<control type="image">
-				<description>background</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>240</width>
-				<height>220</height>
-				<texture border="15">RecentAddedBack.png</texture>
-			</control>
-			<control type="image">
-				<posx>10</posx>
-				<posy>10</posy>
-				<width>220</width>
-				<height>155</height>
-				<aspectratio>scale</aspectratio>
-				<texture background="true">$INFO[ListItem.Icon]</texture>
-				<bordertexture border="5">button-nofocus.png</bordertexture>
-				<bordersize>5</bordersize>
-			</control>
-			<control type="label">
-				<posx>120</posx>
-				<posy>168</posy>
-				<width>200</width>
-				<height>20</height>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<selectedcolor>selected</selectedcolor>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label2]</label>
-			</control>
-			<control type="label">
-				<posx>120</posx>
-				<posy>185</posy>
-				<width>200</width>
-				<height>20</height>
-				<font>font12</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<selectedcolor>selected</selectedcolor>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
-			</control>
-		</itemlayout>
-		<focusedlayout height="220" width="240">
-			<control type="image">
-				<description>background</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>240</width>
-				<height>220</height>
-				<texture border="15">RecentAddedBack.png</texture>
-			</control>
-			<control type="image">
-				<posx>10</posx>
-				<posy>10</posy>
-				<width>220</width>
-				<height>155</height>
-				<aspectratio>scale</aspectratio>
-				<texture background="true">$INFO[ListItem.Icon]</texture>
-				<bordertexture border="5">folder-focus.png</bordertexture>
-				<bordersize>5</bordersize>
-				<visible>Control.HasFocus(8001)</visible>
-			</control>
-			<control type="image">
-				<posx>10</posx>
-				<posy>10</posy>
-				<width>220</width>
-				<height>155</height>
-				<aspectratio>scale</aspectratio>
-				<texture>$INFO[ListItem.Icon]</texture>
-				<bordertexture border="5">button-nofocus.png</bordertexture>
-				<bordersize>5</bordersize>
-				<visible>!Control.HasFocus(8001)</visible>
-			</control>
-			<control type="label">
-				<posx>120</posx>
-				<posy>168</posy>
-				<width>200</width>
-				<height>20</height>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<selectedcolor>selected</selectedcolor>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label2]</label>
-			</control>
-			<control type="label">
-				<posx>120</posx>
-				<posy>185</posy>
-				<width>200</width>
-				<height>20</height>
-				<font>font12</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<selectedcolor>selected</selectedcolor>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
-			</control>
-		</focusedlayout>
-		<content>
-			<item id="4">
-				<label>$INFO[Window.Property(LatestEpisode.4.EpisodeTitle)]</label>
-				<label2>$INFO[Window.Property(LatestEpisode.4.ShowTitle)] - $INFO[Window.Property(LatestEpisode.4.EpisodeNo)]</label2>
-				<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.4.Path)])</onclick>
-				<icon>-</icon>
-				<thumb>$INFO[Window.Property(LatestEpisode.4.Thumb)]</thumb>
-			</item>
-			<item id="3">
-				<label>$INFO[Window.Property(LatestEpisode.3.EpisodeTitle)]</label>
-				<label2>$INFO[Window.Property(LatestEpisode.3.ShowTitle)] - $INFO[Window.Property(LatestEpisode.3.EpisodeNo)]</label2>
-				<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.3.Path)])</onclick>
-				<icon>-</icon>
-				<thumb>$INFO[Window.Property(LatestEpisode.3.Thumb)]</thumb>
-			</item>
-			<item id="2">
-				<label>$INFO[Window.Property(LatestEpisode.2.EpisodeTitle)]</label>
-				<label2>$INFO[Window.Property(LatestEpisode.2.ShowTitle)] - $INFO[Window.Property(LatestEpisode.2.EpisodeNo)]</label2>
-				<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.2.Path)])</onclick>
-				<icon>-</icon>
-				<thumb>$INFO[Window.Property(LatestEpisode.2.Thumb)]</thumb>
-			</item>
-			<item id="1">
-				<label>$INFO[Window.Property(LatestEpisode.1.EpisodeTitle)]</label>
-				<label2>$INFO[Window.Property(LatestEpisode.1.ShowTitle)] - $INFO[Window.Property(LatestEpisode.1.EpisodeNo)]</label2>
-				<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.1.Path)])</onclick>
-				<icon>-</icon>
-				<thumb>$INFO[Window.Property(LatestEpisode.1.Thumb)]</thumb>
-			</item>
-		</content>
-	</include>
 </includes>
\ No newline at end of file
diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
index d87624a930..3aaccb1843 100644
--- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
+++ b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
@@ -506,7 +506,7 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[20342] [COLOR=grey3] ($LOCALIZE[20314])[/COLOR]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoMoviesButton)</onclick>
-						<selected>!Skin.HasSetting(HomeMenuNoMoviesButton)</selected>
+						<selected>Skin.HasSetting(HomeMenuNoMoviesButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
 						<enable>Library.HasContent(Movies)</enable>
@@ -520,7 +520,7 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[20343] [COLOR=grey3] ($LOCALIZE[20314])[/COLOR]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoTVShowsButton)</onclick>
-						<selected>!Skin.HasSetting(HomeMenuNoTVShowsButton)</selected>
+						<selected>Skin.HasSetting(HomeMenuNoTVShowsButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
 						<enable>Library.HasContent(TVShows)</enable>