[Estuary] misc fixes and tweaks

19 files changed, 228 insertions, 111 deletions

diff --git a/addons/skin.estuary/1080i/Custom_1109_TopBarOverlay.xml b/addons/skin.estuary/1080i/Custom_1109_TopBarOverlay.xml
index 937f01bfe7..5f57170391 100644
--- a/addons/skin.estuary/1080i/Custom_1109_TopBarOverlay.xml
+++ b/addons/skin.estuary/1080i/Custom_1109_TopBarOverlay.xml
@@ -40,7 +40,7 @@
 				<left>85</left>
 				<shadowcolor>text_shadow</shadowcolor>
 				<height>100</height>
-				<width>auto</width>
+				<width>1400</width>
 			</control>
 			<control type="group">
 				<visible>!Window.IsVisible(extendedprogressdialog)</visible>
diff --git a/addons/skin.estuary/1080i/DialogFavourites.xml b/addons/skin.estuary/1080i/DialogFavourites.xml
index 0f12dc2d40..60507e93ba 100644
--- a/addons/skin.estuary/1080i/DialogFavourites.xml
+++ b/addons/skin.estuary/1080i/DialogFavourites.xml
@@ -48,7 +48,7 @@
 					<width>320</width>
 					<height>320</height>
 					<aspectratio>scale</aspectratio>
-					<texture border="4" fallback="DefaultAddon.png">$INFO[ListItem.Art(thumb)]</texture>
+					<texture border="4" fallback="DefaultFavourites.png">$INFO[ListItem.Art(thumb)]</texture>
 					<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
 					<bordersize>4</bordersize>
 				</control>
@@ -77,7 +77,7 @@
 					<width>320</width>
 					<height>320</height>
 					<aspectratio>scale</aspectratio>
-					<texture border="4" fallback="DefaultAddon.png">$INFO[ListItem.Art(thumb)]</texture>
+					<texture border="4" fallback="DefaultFavourites.png">$INFO[ListItem.Art(thumb)]</texture>
 					<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
 					<bordersize>4</bordersize>
 				</control>
diff --git a/addons/skin.estuary/1080i/Includes.xml b/addons/skin.estuary/1080i/Includes.xml
index 33d05a8bb2..4dc43ed594 100644
--- a/addons/skin.estuary/1080i/Includes.xml
+++ b/addons/skin.estuary/1080i/Includes.xml
@@ -551,40 +551,47 @@
 		</definition>
 	</include>
 	<include name="AddonLauncherPanel">
-		<control type="panel" id="$PARAM[container_id]">
-			<left>520</left>
-			<top>175</top>
-			<width>1360</width>
-			<height>720</height>
-			<onleft>9000</onleft>
-			<onright>531</onright>
-			<include>Visible_Right_Delayed</include>
-			<visible>$PARAM[visible]</visible>
-			<onup>$PARAM[container_id]</onup>
-			<ondown>$PARAM[container_id]</ondown>
-			<preloaditems>1</preloaditems>
-			<pagecontrol>531</pagecontrol>
-			<scrolltime tween="cubic" easing="out">500</scrolltime>
-			<itemlayout height="360" width="320">
-				<include>InfoWallMusicLayout</include>
-			</itemlayout>
-			<focusedlayout height="360" width="320">
-				<control type="group">
-					<animation effect="zoom" start="100" end="105" time="200" tween="sine" easing="inout" center="160,180">Focus</animation>
-					<animation effect="zoom" start="105" end="100" time="200" tween="sine" easing="inout" center="160,180">UnFocus</animation>
-					<include>InfoWallMusicLayout</include>
-					<control type="image">
-						<left>15</left>
-						<top>5</top>
-						<width>288</width>
-						<height>348</height>
-						<texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
-						<animation effect="fade" start="100" end="0" time="200">Unfocus</animation>
+		<param name="fallback_image">DefaultFolder.png</param>
+		<definition>
+			<control type="panel" id="$PARAM[container_id]">
+				<left>520</left>
+				<top>175</top>
+				<width>1360</width>
+				<height>720</height>
+				<onleft>9000</onleft>
+				<onright>531</onright>
+				<include>Visible_Right_Delayed</include>
+				<visible>$PARAM[visible]</visible>
+				<onup>$PARAM[container_id]</onup>
+				<ondown>$PARAM[container_id]</ondown>
+				<preloaditems>1</preloaditems>
+				<pagecontrol>531</pagecontrol>
+				<scrolltime tween="cubic" easing="out">500</scrolltime>
+				<itemlayout height="360" width="320">
+					<include content="InfoWallMusicLayout">
+						<param name="fallback_image" value="DefaultAddon.png" />
+					</include>
+				</itemlayout>
+				<focusedlayout height="360" width="320">
+					<control type="group">
+						<animation effect="zoom" start="100" end="105" time="200" tween="sine" easing="inout" center="160,180">Focus</animation>
+						<animation effect="zoom" start="105" end="100" time="200" tween="sine" easing="inout" center="160,180">UnFocus</animation>
+						<include content="InfoWallMusicLayout">
+							<param name="fallback_image" value="DefaultAddon.png" />
+						</include>
+						<control type="image">
+							<left>15</left>
+							<top>5</top>
+							<width>288</width>
+							<height>348</height>
+							<texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
+							<animation effect="fade" start="100" end="0" time="200">Unfocus</animation>
+						</control>
 					</control>
-				</control>
-			</focusedlayout>
-			<content sortby="lastused" sortorder="descending" target="$PARAM[container_target]">$PARAM[container_path]</content>
-		</control>
+				</focusedlayout>
+				<content sortby="lastused" sortorder="descending" target="$PARAM[container_target]">$PARAM[container_path]</content>
+			</control>
+		</definition>
 	</include>
 	<include name="LeftAlignedInfo">
 		<param name="id">33333</param>
diff --git a/addons/skin.estuary/1080i/Includes_Home.xml b/addons/skin.estuary/1080i/Includes_Home.xml
index 0a174fdfb6..8b9f8280d7 100644
--- a/addons/skin.estuary/1080i/Includes_Home.xml
+++ b/addons/skin.estuary/1080i/Includes_Home.xml
@@ -197,6 +197,18 @@
 							<bordertexture border="20">overlays/shadow.png</bordertexture>
 							<bordersize>20</bordersize>
 						</control>
+						<control type="textbox">
+							<left>20</left>
+							<top>210</top>
+							<width>200</width>
+							<height>100</height>
+							<label>$INFO[ListItem.Label]</label>
+							<font>font12_title</font>
+							<shadowcolor>text_shadow</shadowcolor>
+							<align>center</align>
+							<aligny>center</aligny>
+							<visible>String.IsEmpty(ListItem.Art(poster))</visible>
+						</control>
 					</control>
 				</itemlayout>
 				<focusedlayout width="277" height="400">
@@ -217,6 +229,20 @@
 							<bordertexture border="20">overlays/shadow.png</bordertexture>
 							<bordersize>20</bordersize>
 						</control>
+						<control type="textbox">
+							<left>20</left>
+							<top>210</top>
+							<width>200</width>
+							<height>100</height>
+							<label>$INFO[ListItem.Label]</label>
+							<font>font12_title</font>
+							<shadowcolor>text_shadow</shadowcolor>
+							<align>center</align>
+							<aligny>center</aligny>
+							<visible>String.IsEmpty(ListItem.Art(poster))</visible>
+							<animation effect="fade" start="0" end="100" time="200" reversible="true">Unfocus</animation>
+							<animation effect="fade" start="100" end="0" time="0" reversible="true">Focus</animation>
+						</control>
 						<control type="group">
 							<left>20</left>
 							<top>20</top>
@@ -886,7 +912,7 @@
 							<left>42</left>
 							<width>260</width>
 							<height>200</height>
-							<texture fallback="DefaultTVShowsSquare.png">$PARAM[icon]</texture>
+							<texture fallback="DefaultTVShows.png">$PARAM[icon]</texture>
 							<aspectratio>keep</aspectratio>
 						</control>
 						<control type="textbox">
@@ -938,7 +964,7 @@
 								<left>42</left>
 								<width>260</width>
 								<height>200</height>
-								<texture fallback="DefaultTVShowsSquare.png">$PARAM[icon]</texture>
+								<texture fallback="DefaultTVShows.png">$PARAM[icon]</texture>
 								<aspectratio>keep</aspectratio>
 							</control>
 							<control type="textbox">
@@ -1021,7 +1047,7 @@
 							<left>42</left>
 							<width>260</width>
 							<height>200</height>
-							<texture fallback="DefaultTVShowsSquare.png">$PARAM[icon]</texture>
+							<texture fallback="DefaultTVShows.png">$PARAM[icon]</texture>
 							<aspectratio>keep</aspectratio>
 						</control>
 						<control type="textbox">
@@ -1073,7 +1099,7 @@
 								<left>42</left>
 								<width>260</width>
 								<height>200</height>
-								<texture fallback="DefaultTVShowsSquare.png">$PARAM[icon]</texture>
+								<texture fallback="DefaultTVShows.png">$PARAM[icon]</texture>
 								<aspectratio>keep</aspectratio>
 							</control>
 							<control type="textbox">
@@ -1348,27 +1374,6 @@
 			</include>
 		</content>
 	</include>
-	<!-- <include content="WeatherDailyItem">
-	     <item id="$PARAM[item_index]">
-	     <label>$INFO[Window(weather).Property(Daily.$PARAM[item_index].LongDay)]</label>
-	     <label2>$INFO[Window(weather).Property(Daily.$PARAM[item_index].LongDate)]</label2>
-	     <property name="Humidity">$INFO[Window(weather).Property(Daily.$PARAM[item_index].Humidity)]</property>
-	     <property name="Pressure">$INFO[Window(weather).Property(Daily.$PARAM[item_index].Pressure)]</property>
-	     <property name="DewPoint">$INFO[Window(weather).Property(Daily.$PARAM[item_index].DewPoint)]</property>
-	     <property name="FeelsLike">$INFO[Window(weather).Property(Daily.$PARAM[item_index].FeelsLike)]</property>
-	     <property name="Rain">$INFO[Window(weather).Property(Daily.$PARAM[item_index].Rain)]</property>
-	     <property name="Snow">$INFO[Window(weather).Property(Daily.$PARAM[item_index].Snow)]</property>
-	     <property name="TempMorn">$INFO[Window(weather).Property(Daily.$PARAM[item_index].TempMorn)]</property>
-	     <property name="TempEve">$INFO[Window(weather).Property(Daily.$PARAM[item_index].TempEve)]</property>
-	     <property name="TempNight">$INFO[Window(weather).Property(Daily.$PARAM[item_index].TempNight)]</property>
-	     <property name="WindSpeed">$INFO[Window(weather).Property(Daily.$PARAM[item_index].WindSpeed)]</property>
-	     <property name="WindGust">$INFO[Window(weather).Property(Daily.$PARAM[item_index].WindGust)]</property>
-	     <property name="WindDirection">$INFO[Window(weather).Property(Daily.$PARAM[item_index].WindDirection)]</property>
-	     <property name="Precipitation">$INFO[Window(weather).Property(Daily.$PARAM[item_index].Precipitation)]</property>
-	     <onclick>SetProperty(FocusedItem,$PARAM[item_index])</onclick>
-	     <icon>$INFO[Window(weather).Property(Daily.$PARAM[item_index].OutlookIcon)]</icon>
-	     </item>
-	     </include> -->
 	<include name="WeatherHourlyItem">
 		<item>
 			<label>$INFO[Window(weather).Property(Hourly.$PARAM[item_index].Time)]</label>
diff --git a/addons/skin.estuary/1080i/MyPVRChannels.xml b/addons/skin.estuary/1080i/MyPVRChannels.xml
index 39403f28ba..b2d88d3571 100644
--- a/addons/skin.estuary/1080i/MyPVRChannels.xml
+++ b/addons/skin.estuary/1080i/MyPVRChannels.xml
@@ -337,7 +337,9 @@
 				<param name="breadcrumbs_label" value="$VAR[BreadcrumbsPVRChannelsVar]" />
 				<param name="breadcrumbs_icon" value="icons/settings/tvremote.png" />
 			</include>
-			<include>BottomBar</include>
+			<include content="BottomBar">
+				<param name="info_visible" value="true" />
+			</include>
 		</control>
 		<control type="label" id="29">
 			<font></font>
diff --git a/addons/skin.estuary/1080i/MyPVRGuide.xml b/addons/skin.estuary/1080i/MyPVRGuide.xml
index a69e300477..862393e23c 100644
--- a/addons/skin.estuary/1080i/MyPVRGuide.xml
+++ b/addons/skin.estuary/1080i/MyPVRGuide.xml
@@ -225,6 +225,7 @@
 			</include>
 			<include content="BottomBar">
 				<param name="PageLabel" value="$INFO[Container.NumItems,$LOCALIZE[19019]: ]" />
+				<param name="info_visible" value="true" />
 			</include>
 		</control>
 		<control type="label" id="29">
diff --git a/addons/skin.estuary/1080i/MyPVRRecordings.xml b/addons/skin.estuary/1080i/MyPVRRecordings.xml
index 06d90d0e92..61cbac0cf8 100644
--- a/addons/skin.estuary/1080i/MyPVRRecordings.xml
+++ b/addons/skin.estuary/1080i/MyPVRRecordings.xml
@@ -276,7 +276,9 @@
 				<font></font>
 				<include>HiddenObject</include>
 			</control>
-			<include>BottomBar</include>
+			<include content="BottomBar">
+				<param name="info_visible" value="true" />
+			</include>
 		</control>
 	</controls>
 </window>
diff --git a/addons/skin.estuary/1080i/MyPVRSearch.xml b/addons/skin.estuary/1080i/MyPVRSearch.xml
index f3339b8ed0..f8fde2d20c 100644
--- a/addons/skin.estuary/1080i/MyPVRSearch.xml
+++ b/addons/skin.estuary/1080i/MyPVRSearch.xml
@@ -184,7 +184,9 @@
 				<param name="breadcrumbs_label" value="$VAR[BreadcrumbsPVRSearchVar]" />
 				<param name="breadcrumbs_icon" value="icons/settings/tvguide.png" />
 			</include>
-			<include>BottomBar</include>
+			<include content="BottomBar">
+				<param name="info_visible" value="true" />
+			</include>
 		</control>
 	</controls>
 </window>
diff --git a/addons/skin.estuary/1080i/MyPVRTimers.xml b/addons/skin.estuary/1080i/MyPVRTimers.xml
index 4400eccfd0..0b9cd4d7d6 100644
--- a/addons/skin.estuary/1080i/MyPVRTimers.xml
+++ b/addons/skin.estuary/1080i/MyPVRTimers.xml
@@ -188,7 +188,9 @@
 			<param name="breadcrumbs_label" value="$VAR[BreadcrumbsPVRTimersVar]" />
 			<param name="breadcrumbs_icon" value="icons/settings/tvguide.png" />
 		</include>
-		<include>BottomBar</include>
+		<include content="BottomBar">
+			<param name="info_visible" value="true" />
+		</include>
 		<control type="label" id="29">
 			<font>-</font>
 			<include>HiddenObject</include>
diff --git a/addons/skin.estuary/1080i/Settings.xml b/addons/skin.estuary/1080i/Settings.xml
index 3cf35b33eb..7fb2fa2d05 100644
--- a/addons/skin.estuary/1080i/Settings.xml
+++ b/addons/skin.estuary/1080i/Settings.xml
@@ -3,6 +3,18 @@
 	<defaultcontrol always="true">9000</defaultcontrol>
 	<controls>
 		<include>DefaultBackground</include>
+		<control type="multiimage">
+			<depth>DepthBackground</depth>
+			<include>FullScreenDimensions</include>
+			<aspectratio>scale</aspectratio>
+			<fadetime>600</fadetime>
+			<animation effect="zoom" center="auto" end="102,102" time="0" condition="Integer.IsGreater(System.StereoscopicMode,0)">conditional</animation>
+			<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
+			<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
+			<animation effect="fade" time="400">VisibleChange</animation>
+			<imagepath background="true" colordiffuse="35FFFFFF">$INFO[Skin.String(HomeFanart.path)]settings$INFO[Skin.String(HomeFanart.ext)]</imagepath>
+			<visible>!Player.HasMedia</visible>
+		</control>
 		<control type="panel" id="9000">
 			<left>92</left>
 			<top>140</top>
diff --git a/addons/skin.estuary/1080i/SettingsCategory.xml b/addons/skin.estuary/1080i/SettingsCategory.xml
index 573331ca1d..fd0caf6499 100644
--- a/addons/skin.estuary/1080i/SettingsCategory.xml
+++ b/addons/skin.estuary/1080i/SettingsCategory.xml
@@ -3,6 +3,18 @@
 	<defaultcontrol>3</defaultcontrol>
 	<controls>
 		<include>DefaultBackground</include>
+		<control type="multiimage">
+			<depth>DepthBackground</depth>
+			<include>FullScreenDimensions</include>
+			<aspectratio>scale</aspectratio>
+			<fadetime>600</fadetime>
+			<animation effect="zoom" center="auto" end="102,102" time="0" condition="Integer.IsGreater(System.StereoscopicMode,0)">conditional</animation>
+			<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
+			<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
+			<animation effect="fade" time="400">VisibleChange</animation>
+			<imagepath background="true" colordiffuse="35FFFFFF">$INFO[Skin.String(HomeFanart.path)]settings$INFO[Skin.String(HomeFanart.ext)]</imagepath>
+			<visible>!Player.HasMedia</visible>
+		</control>
 		<control type="group">
 			<left>110</left>
 			<include>OpenClose_Left</include>
diff --git a/addons/skin.estuary/1080i/SettingsProfile.xml b/addons/skin.estuary/1080i/SettingsProfile.xml
index 16e825b82e..d641d4fe3f 100644
--- a/addons/skin.estuary/1080i/SettingsProfile.xml
+++ b/addons/skin.estuary/1080i/SettingsProfile.xml
@@ -4,6 +4,18 @@
 	<backgroundcolor>background</backgroundcolor>
 	<controls>
 		<include>DefaultBackground</include>
+		<control type="multiimage">
+			<depth>DepthBackground</depth>
+			<include>FullScreenDimensions</include>
+			<aspectratio>scale</aspectratio>
+			<fadetime>600</fadetime>
+			<animation effect="zoom" center="auto" end="102,102" time="0" condition="Integer.IsGreater(System.StereoscopicMode,0)">conditional</animation>
+			<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
+			<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
+			<animation effect="fade" time="400">VisibleChange</animation>
+			<imagepath background="true" colordiffuse="35FFFFFF">$INFO[Skin.String(HomeFanart.path)]settings$INFO[Skin.String(HomeFanart.ext)]</imagepath>
+			<visible>!Player.HasMedia</visible>
+		</control>
 		<control type="group">
 			<include>OpenClose_Left</include>
 			<control type="image">
diff --git a/addons/skin.estuary/1080i/SkinSettings.xml b/addons/skin.estuary/1080i/SkinSettings.xml
index 0d6906b718..aa6b28ed19 100644
--- a/addons/skin.estuary/1080i/SkinSettings.xml
+++ b/addons/skin.estuary/1080i/SkinSettings.xml
@@ -4,6 +4,18 @@
 	<backgroundcolor>background</backgroundcolor>
 	<controls>
 		<include>DefaultBackground</include>
+		<control type="multiimage">
+			<depth>DepthBackground</depth>
+			<include>FullScreenDimensions</include>
+			<aspectratio>scale</aspectratio>
+			<fadetime>600</fadetime>
+			<animation effect="zoom" center="auto" end="102,102" time="0" condition="Integer.IsGreater(System.StereoscopicMode,0)">conditional</animation>
+			<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
+			<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
+			<animation effect="fade" time="400">VisibleChange</animation>
+			<imagepath background="true" colordiffuse="35FFFFFF">$INFO[Skin.String(HomeFanart.path)]settings$INFO[Skin.String(HomeFanart.ext)]</imagepath>
+			<visible>!Player.HasMedia</visible>
+		</control>
 		<control type="group">
 			<left>110</left>
 			<include>OpenClose_Left</include>
@@ -121,6 +133,15 @@
 					<onclick condition="!System.HasAddon(script.image.resource.select)">InstallAddon(script.image.resource.select)</onclick>
 					<enable>!Skin.HasSetting(no_fanart)</enable>
 				</control>
+				<control type="button" id="609">
+					<label>$LOCALIZE[31062]</label>
+					<label2>$INFO[Skin.String(WeatherFanart.name)]</label2>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<onclick condition="System.HasAddon(script.image.resource.select)">RunScript(script.image.resource.select,property=WeatherFanart&amp;type=resource.images.weatherfanart)</onclick>
+					<onclick condition="!System.HasAddon(script.image.resource.select)">InstallAddon(script.image.resource.select)</onclick>
+					<enable>!Skin.HasSetting(no_fanart)</enable>
+				</control>
 				<control type="radiobutton" id="606">
 					<label>$LOCALIZE[31108]</label>
 					<width>1256</width>
diff --git a/addons/skin.estuary/1080i/Variables.xml b/addons/skin.estuary/1080i/Variables.xml
index 27b134edc2..e2cf985bbf 100644
--- a/addons/skin.estuary/1080i/Variables.xml
+++ b/addons/skin.estuary/1080i/Variables.xml
@@ -291,6 +291,11 @@
 		<value condition="!String.IsEmpty(Container(8500).ListItem.Art(fanart)) + Control.HasFocus(8500)">$INFO[Container(8500).ListItem.Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container(15100).ListItem.Property(FanartCode)) + Control.HasFocus(15100)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container(15100).ListItem.Property(FanartCode)]</value>
 		<value condition="!String.IsEmpty(Container(15200).ListItem.Property(FanartCode)) + Control.HasFocus(15200)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container(15200).ListItem.Property(FanartCode)]</value>
+		<value condition="Control.HasFocus(804)">$INFO[Skin.String(HomeFanart.path)]power$INFO[Skin.String(HomeFanart.ext)]</value>
+		<value condition="Control.HasFocus(802)">$INFO[Skin.String(HomeFanart.path)]settings$INFO[Skin.String(HomeFanart.ext)]</value>
+		<value condition="Control.HasFocus(803)">$INFO[Skin.String(HomeFanart.path)]favorites$INFO[Skin.String(HomeFanart.ext)]</value>
+		<value condition="Control.HasFocus(801)">$INFO[Skin.String(HomeFanart.path)]filemanager$INFO[Skin.String(HomeFanart.ext)]</value>
+		<value condition="Control.HasFocus(900)">$INFO[Skin.String(HomeFanart.path)]search$INFO[Skin.String(HomeFanart.ext)]</value>
 		<value condition="!String.IsEmpty(Skin.String(HomeFanart.path))">$INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)]</value>
 	</variable>
 	<variable name="MediaFanartVar">
@@ -303,8 +308,8 @@
 		<value>$INFO[ListItem.Art(fanart)]</value>
 	</variable>
 	<variable name="WeatherFanartVar">
-		<value condition="!String.IsEmpty(Window(weather).Property(current.fanartcode)) + Skin.HasSetting(WeatherFanart.multi)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Window(weather).Property(current.fanartcode)]</value>
-		<value>$INFO[Skin.String(WeatherFanart.path)]$INFO[Window(weather).Property(fanartcode)]$INFO[Skin.String(WeatherFanart.ext)]</value>
+		<value condition="!String.IsEmpty(Window(weather).Property(current.fanartcode)) + !String.IsEmpty(Skin.String(weatherfanart.path))">$INFO[Skin.String(weatherfanart.path)]$INFO[Window(Weather).Property(Current.FanartCode)]$INFO[Skin.String(weatherfanart.ext)]</value>
+		<value>$INFO[Skin.String(HomeFanart.path)]weather$INFO[Skin.String(HomeFanart.ext)]</value>
 	</variable>
 	<variable name="ListWatchedIconVar">
 		<value condition="ListItem.IsPlaying">overlays/watched/OverlayPlaying-List.png</value>
diff --git a/addons/skin.estuary/1080i/VideoOSD.xml b/addons/skin.estuary/1080i/VideoOSD.xml
index b8face2bc0..61976a5920 100644
--- a/addons/skin.estuary/1080i/VideoOSD.xml
+++ b/addons/skin.estuary/1080i/VideoOSD.xml
@@ -260,7 +260,7 @@
 						<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
 						<info>Player.Progress</info>
 						<action>seek</action>
-						<visible>!Control.HasFocus(87)</visible>
+						<visible>!Control.HasFocus(87) + Player.SeekEnabled</visible>
 					</control>
 					<control type="slider">
 						<left>30</left>
@@ -274,7 +274,7 @@
 						<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
 						<info>Player.Progress</info>
 						<action>seek</action>
-						<visible>Control.HasFocus(87)</visible>
+						<visible>Control.HasFocus(87) + Player.SeekEnabled</visible>
 					</control>
 				</control>
 			</control>
diff --git a/addons/skin.estuary/1080i/View_500_SmallThumb.xml b/addons/skin.estuary/1080i/View_500_SmallThumb.xml
index 9fccad55ad..3ef7615a86 100644
--- a/addons/skin.estuary/1080i/View_500_SmallThumb.xml
+++ b/addons/skin.estuary/1080i/View_500_SmallThumb.xml
@@ -326,14 +326,40 @@
 						</control>
 					</control>
 				</focusedlayout>
-				<itemlayout height="360" width="350" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos) | Container.Content(addons)">
-					<include>InfoWallMusicLayout</include>
+				<itemlayout height="360" width="350" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)">
+					<include content="InfoWallMusicLayout">
+						<param name="fallback_image" value="DefaultMusicSongs.png" />
+					</include>
 				</itemlayout>
-				<focusedlayout height="360" width="350" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos) | Container.Content(addons)">
+				<focusedlayout height="360" width="350" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)">
 					<control type="group">
 						<animation effect="zoom" start="100" end="105" time="200" tween="sine" easing="inout" center="160,180">Focus</animation>
 						<animation effect="zoom" start="105" end="100" time="200" tween="sine" easing="inout" center="160,180">UnFocus</animation>
-						<include>InfoWallMusicLayout</include>
+						<include content="InfoWallMusicLayout">
+							<param name="fallback_image" value="DefaultMusicSongs.png" />
+						</include>
+						<control type="image">
+							<left>15</left>
+							<top>5</top>
+							<width>288</width>
+							<height>348</height>
+							<texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
+							<animation effect="fade" start="100" end="0" time="200">Unfocus</animation>
+						</control>
+					</control>
+				</focusedlayout>
+				<itemlayout height="360" width="350" condition="Container.Content(addons)">
+					<include content="InfoWallMusicLayout">
+						<param name="fallback_image" value="DefaultAddon.png" />
+					</include>
+				</itemlayout>
+				<focusedlayout height="360" width="350" condition="Container.Content(addons)">
+					<control type="group">
+						<animation effect="zoom" start="100" end="105" time="200" tween="sine" easing="inout" center="160,180">Focus</animation>
+						<animation effect="zoom" start="105" end="100" time="200" tween="sine" easing="inout" center="160,180">UnFocus</animation>
+						<include content="InfoWallMusicLayout">
+							<param name="fallback_image" value="DefaultAddon.png" />
+						</include>
 						<control type="image">
 							<left>15</left>
 							<top>5</top>
diff --git a/addons/skin.estuary/1080i/View_54_InfoWall.xml b/addons/skin.estuary/1080i/View_54_InfoWall.xml
index d2cebdc26b..d41cf0e873 100644
--- a/addons/skin.estuary/1080i/View_54_InfoWall.xml
+++ b/addons/skin.estuary/1080i/View_54_InfoWall.xml
@@ -37,44 +37,47 @@
 		</control>
 	</include>
 	<include name="InfoWallMusicLayout">
-		<control type="image">
-			<top>-10</top>
-			<width>320</width>
-			<height>380</height>
-			<texture border="40">buttons/button-nofo.png</texture>
-		</control>
-		<control type="image">
-			<left>35</left>
-			<top>21</top>
-			<width>250</width>
-			<height>250</height>
-			<texture border="2" fallback="DefaultFolderSquare.png" background="true">$VAR[ShiftThumbVar]</texture>
-			<aspectratio>keep</aspectratio>
-			<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
-			<bordersize>4</bordersize>
-		</control>
-		<control type="image">
-			<left>20</left>
-			<top>278</top>
-			<width>278</width>
-			<height>70</height>
-			<texture>colors/black.png</texture>
-		</control>
-		<control type="textbox">
-			<left>28</left>
-			<top>278</top>
-			<width>262</width>
-			<height>70</height>
-			<font>font12</font>
-			<align>center</align>
-			<aligny>center</aligny>
-			<label>$INFO[ListItem.Year,[COLOR button_focus], - [/COLOR]]$INFO[ListItem.Label]</label>
-		</control>
-		<control type="group">
-			<left>230</left>
-			<top>28</top>
-			<include>UserRatingCircle</include>
-		</control>
+		<param name="fallback_image">DefaultFolder.png</param>
+		<definition>
+			<control type="image">
+				<top>-10</top>
+				<width>320</width>
+				<height>380</height>
+				<texture border="40">buttons/button-nofo.png</texture>
+			</control>
+			<control type="image">
+				<left>35</left>
+				<top>21</top>
+				<width>250</width>
+				<height>250</height>
+				<texture border="2" fallback="$PARAM[fallback_image]" background="true">$VAR[ShiftThumbVar]</texture>
+				<aspectratio>keep</aspectratio>
+				<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
+				<bordersize>4</bordersize>
+			</control>
+			<control type="image">
+				<left>20</left>
+				<top>278</top>
+				<width>278</width>
+				<height>70</height>
+				<texture>colors/black.png</texture>
+			</control>
+			<control type="textbox">
+				<left>28</left>
+				<top>278</top>
+				<width>262</width>
+				<height>70</height>
+				<font>font12</font>
+				<align>center</align>
+				<aligny>center</aligny>
+				<label>$INFO[ListItem.Year,[COLOR button_focus], - [/COLOR]]$INFO[ListItem.Label]</label>
+			</control>
+			<control type="group">
+				<left>230</left>
+				<top>28</top>
+				<include>UserRatingCircle</include>
+			</control>
+		</definition>
 	</include>
 	<include name="View_54_InfoWall">
 		<include content="UpDownArrows">
diff --git a/addons/skin.estuary/language/resource.language.en_gb/strings.po b/addons/skin.estuary/language/resource.language.en_gb/strings.po
index 33fb44b05e..9daded27e8 100644
--- a/addons/skin.estuary/language/resource.language.en_gb/strings.po
+++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po
@@ -329,6 +329,11 @@ msgctxt "#31061"
 msgid "Main menu items"
 msgstr ""
 
+#: /1080i/SkinSettings.xml
+msgctxt "#31062"
+msgid "Choose weather fanart pack"
+msgstr ""
+
 #: /1080i/Includes_MediaMenu.xml:74
 msgctxt "#31063"
 msgid "Sections"
diff --git a/addons/skin.estuary/media/DefaultFavourites.png b/addons/skin.estuary/media/DefaultFavourites.png
new file mode 100644
index 0000000000..d4d2e33f75
--- /dev/null
+++ b/addons/skin.estuary/media/DefaultFavourites.png