From f157ec35d66e3c9adce2408af61ae7f824701f5e Mon Sep 17 00:00:00 2001
From: phil65 <philipptemminghoff@gmx.de>
Date: Wed, 30 Nov 2016 17:12:40 +0100
Subject: [estuary] sync

---
 addons/skin.estuary/colors/brown.xml               |   6 +-
 addons/skin.estuary/colors/charcoal.xml            |   2 +-
 addons/skin.estuary/colors/chartreuse.xml          |   4 +-
 addons/skin.estuary/colors/defaults.xml            |   2 +-
 addons/skin.estuary/colors/gold.xml                |   4 +-
 addons/skin.estuary/colors/green.xml               |   2 +-
 addons/skin.estuary/colors/maroon.xml              |   4 +-
 addons/skin.estuary/colors/orange.xml              |   2 +-
 addons/skin.estuary/colors/rose.xml                |   2 +-
 addons/skin.estuary/colors/violet.xml              |   2 +-
 addons/skin.estuary/extras/backgrounds/primary.jpg | Bin 33514 -> 23660 bytes
 .../skin.estuary/extras/backgrounds/secondary1.png | Bin 23127 -> 41547 bytes
 .../skin.estuary/extras/backgrounds/secondary2.png | Bin 28608 -> 44928 bytes
 .../skin.estuary/extras/backgrounds/secondary3.png | Bin 24715 -> 51035 bytes
 .../skin.estuary/extras/backgrounds/secondary4.png | Bin 21614 -> 46234 bytes
 .../skin.estuary/extras/backgrounds/secondary5.png | Bin 23502 -> 57990 bytes
 .../skin.estuary/extras/backgrounds/secondary6.png | Bin 23365 -> 44539 bytes
 addons/skin.estuary/xml/DialogVideoInfo.xml        |  42 ++-
 addons/skin.estuary/xml/EventLog.xml               |  23 +-
 addons/skin.estuary/xml/Home.xml                   |  14 +-
 addons/skin.estuary/xml/Includes.xml               |  18 +-
 addons/skin.estuary/xml/Includes_Buttons.xml       |   2 +-
 addons/skin.estuary/xml/Includes_Home.xml          |  10 +-
 addons/skin.estuary/xml/Includes_MediaMenu.xml     |   1 -
 addons/skin.estuary/xml/LoginScreen.xml            |   6 +-
 addons/skin.estuary/xml/MyPVRChannels.xml          |  12 +-
 addons/skin.estuary/xml/MyPVRRecordings.xml        | 128 +++----
 addons/skin.estuary/xml/MyPVRSearch.xml            |   4 +-
 addons/skin.estuary/xml/MyPVRTimers.xml            |   8 +-
 addons/skin.estuary/xml/MyPlaylist.xml             |  38 +-
 addons/skin.estuary/xml/MyVideoNav.xml             |   5 +-
 addons/skin.estuary/xml/SettingsCategory.xml       |  10 +-
 addons/skin.estuary/xml/SkinSettings.xml           |   3 +-
 addons/skin.estuary/xml/Variables.xml              |   1 +
 addons/skin.estuary/xml/VideoOSD.xml               | 412 ++++++++++-----------
 addons/skin.estuary/xml/View_502_FanArt.xml        |   4 +-
 addons/skin.estuary/xml/View_50_List.xml           |   4 +-
 addons/skin.estuary/xml/View_54_InfoWall.xml       |  63 ++--
 38 files changed, 417 insertions(+), 421 deletions(-)

diff --git a/addons/skin.estuary/colors/brown.xml b/addons/skin.estuary/colors/brown.xml
index d130c256b8..61cba54dc8 100644
--- a/addons/skin.estuary/colors/brown.xml
+++ b/addons/skin.estuary/colors/brown.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FF795548</color>
-	<color name="secondary_background">668CAF00</color>
+	<color name="primary_background">FF674032</color>
+	<color name="secondary_background">80738627</color>
 	<color name="dialog_tint">FF282524</color>
-	<color name="button_focus">FF795548</color>
+	<color name="button_focus">FF83513F</color>
 	<color name="selected">FFFF4400</color>
 </colors>
\ No newline at end of file
diff --git a/addons/skin.estuary/colors/charcoal.xml b/addons/skin.estuary/colors/charcoal.xml
index 803190a78d..b7ddb3c362 100644
--- a/addons/skin.estuary/colors/charcoal.xml
+++ b/addons/skin.estuary/colors/charcoal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
 	<color name="primary_background">FF404040</color>
-	<color name="secondary_background">33A2A2A2</color>
+	<color name="secondary_background">CCA2A2A2</color>
 	<color name="dialog_tint">FF262626</color>
 	<color name="button_focus">FFA2A2A2</color>
 	<color name="selected">FF11E7B1</color>
diff --git a/addons/skin.estuary/colors/chartreuse.xml b/addons/skin.estuary/colors/chartreuse.xml
index 914edf0887..2c5da23356 100644
--- a/addons/skin.estuary/colors/chartreuse.xml
+++ b/addons/skin.estuary/colors/chartreuse.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FFACBC00</color>
-	<color name="secondary_background">703900B2</color>
+	<color name="primary_background">FF8EBD00</color>
+	<color name="secondary_background">70DF8020</color>
 	<color name="dialog_tint">FF222A22</color>
 	<color name="button_focus">FF5FCF00</color>
 	<color name="selected">FF24C6C9</color>
diff --git a/addons/skin.estuary/colors/defaults.xml b/addons/skin.estuary/colors/defaults.xml
index c4c67d4058..0c6bcd1afe 100644
--- a/addons/skin.estuary/colors/defaults.xml
+++ b/addons/skin.estuary/colors/defaults.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
 	<color name="primary_background">FF006699</color>
-	<color name="secondary_background">6600AFA7</color>
+	<color name="secondary_background">8024CA7A</color>
 	<color name="dialog_tint">FF22282A</color>
 	<color name="background">FF000000</color>
 	<color name="bg_image">FF909090</color>
diff --git a/addons/skin.estuary/colors/gold.xml b/addons/skin.estuary/colors/gold.xml
index 230a10f65e..4aa46f443b 100644
--- a/addons/skin.estuary/colors/gold.xml
+++ b/addons/skin.estuary/colors/gold.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FFC96603</color>
-	<color name="secondary_background">80FFFF00</color>
+	<color name="primary_background">FF974D02</color>
+	<color name="secondary_background">99CCCC00</color>
 	<color name="dialog_tint">FF2B2B22</color>
 	<color name="button_focus">FFCFA700</color>
 	<color name="selected">FF11E7B1</color>
diff --git a/addons/skin.estuary/colors/green.xml b/addons/skin.estuary/colors/green.xml
index abe037639d..b85fc17a7d 100644
--- a/addons/skin.estuary/colors/green.xml
+++ b/addons/skin.estuary/colors/green.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
 	<color name="primary_background">FF24CA7A</color>
-	<color name="secondary_background">FF006699</color>
+	<color name="secondary_background">FF004466</color>
 	<color name="dialog_tint">FF222A26</color>
 	<color name="button_focus">FF24CA7A</color>
 	<color name="selected">FF24C6C9</color>
diff --git a/addons/skin.estuary/colors/maroon.xml b/addons/skin.estuary/colors/maroon.xml
index 2bca128cdd..f0079b16a0 100644
--- a/addons/skin.estuary/colors/maroon.xml
+++ b/addons/skin.estuary/colors/maroon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FFC40300</color>
-	<color name="secondary_background">681480CC</color>
+	<color name="primary_background">FF7B0100</color>
+	<color name="secondary_background">4D1442CC</color>
 	<color name="dialog_tint">FF2C2121</color>
 	<color name="button_focus">FFC40300</color>
 	<color name="selected">FF24C6C9</color>
diff --git a/addons/skin.estuary/colors/orange.xml b/addons/skin.estuary/colors/orange.xml
index 0a949202e7..287b7ef79d 100644
--- a/addons/skin.estuary/colors/orange.xml
+++ b/addons/skin.estuary/colors/orange.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
 	<color name="primary_background">FFFF7200</color>
-	<color name="secondary_background">600099B2</color>
+	<color name="secondary_background">60B300B3</color>
 	<color name="dialog_tint">FF2A2622</color>
 	<color name="button_focus">FFFF9800</color>
 	<color name="selected">FFFFF100</color>
diff --git a/addons/skin.estuary/colors/rose.xml b/addons/skin.estuary/colors/rose.xml
index 84d1ed9bdd..60e13b552c 100644
--- a/addons/skin.estuary/colors/rose.xml
+++ b/addons/skin.estuary/colors/rose.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
 	<color name="primary_background">FFFF8EC4</color>
-	<color name="secondary_background">80CC3300</color>
+	<color name="secondary_background">80B30000</color>
 	<color name="dialog_tint">FF282427</color>
 	<color name="button_focus">FFFF8EC4</color>
 	<color name="selected">FF24C6C9</color>
diff --git a/addons/skin.estuary/colors/violet.xml b/addons/skin.estuary/colors/violet.xml
index 26d09d7113..7214edae4e 100644
--- a/addons/skin.estuary/colors/violet.xml
+++ b/addons/skin.estuary/colors/violet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <colors>
-	<color name="primary_background">FFC050FF</color>
+	<color name="primary_background">FFA200FF</color>
 	<color name="secondary_background">4DF6FF02</color>
 	<color name="dialog_tint">FF27222A</color>
 	<color name="button_focus">FFC050FF</color>
diff --git a/addons/skin.estuary/extras/backgrounds/primary.jpg b/addons/skin.estuary/extras/backgrounds/primary.jpg
index 33f4034a59..13c69ff3c2 100644
Binary files a/addons/skin.estuary/extras/backgrounds/primary.jpg and b/addons/skin.estuary/extras/backgrounds/primary.jpg differ
diff --git a/addons/skin.estuary/extras/backgrounds/secondary1.png b/addons/skin.estuary/extras/backgrounds/secondary1.png
index f8d0505b81..f7bf45e6d6 100644
Binary files a/addons/skin.estuary/extras/backgrounds/secondary1.png and b/addons/skin.estuary/extras/backgrounds/secondary1.png differ
diff --git a/addons/skin.estuary/extras/backgrounds/secondary2.png b/addons/skin.estuary/extras/backgrounds/secondary2.png
index 9aa79a0de0..795e6900b9 100644
Binary files a/addons/skin.estuary/extras/backgrounds/secondary2.png and b/addons/skin.estuary/extras/backgrounds/secondary2.png differ
diff --git a/addons/skin.estuary/extras/backgrounds/secondary3.png b/addons/skin.estuary/extras/backgrounds/secondary3.png
index 115979ae33..ea1cf60bb7 100644
Binary files a/addons/skin.estuary/extras/backgrounds/secondary3.png and b/addons/skin.estuary/extras/backgrounds/secondary3.png differ
diff --git a/addons/skin.estuary/extras/backgrounds/secondary4.png b/addons/skin.estuary/extras/backgrounds/secondary4.png
index adb1e43834..9f6b637af3 100644
Binary files a/addons/skin.estuary/extras/backgrounds/secondary4.png and b/addons/skin.estuary/extras/backgrounds/secondary4.png differ
diff --git a/addons/skin.estuary/extras/backgrounds/secondary5.png b/addons/skin.estuary/extras/backgrounds/secondary5.png
index 3f4b377bb2..e7a3c0ac40 100644
Binary files a/addons/skin.estuary/extras/backgrounds/secondary5.png and b/addons/skin.estuary/extras/backgrounds/secondary5.png differ
diff --git a/addons/skin.estuary/extras/backgrounds/secondary6.png b/addons/skin.estuary/extras/backgrounds/secondary6.png
index 159cd0f446..54aa4e8cc5 100644
Binary files a/addons/skin.estuary/extras/backgrounds/secondary6.png and b/addons/skin.estuary/extras/backgrounds/secondary6.png differ
diff --git a/addons/skin.estuary/xml/DialogVideoInfo.xml b/addons/skin.estuary/xml/DialogVideoInfo.xml
index 467df2b99c..d5dc88b057 100644
--- a/addons/skin.estuary/xml/DialogVideoInfo.xml
+++ b/addons/skin.estuary/xml/DialogVideoInfo.xml
@@ -214,24 +214,25 @@
 						<param name="visible" value="!String.IsEmpty(ListItem.Status)" />
 					</include>
 				</control>
-				<control type="image">
-					<left>0</left>
-					<top>164</top>
-					<width>1245</width>
-					<height>328</height>
-					<texture border="21">dialogs/dialog-bg.png</texture>
-					<visible>Integer.IsEqual(Container(50).NumItems,0) + String.IsEmpty(ListItem.Art(tvshow.banner)) + String.IsEmpty(ListItem.Art(banner))</visible>
-				</control>
-				<control type="textbox">
-					<left>17</left>
-					<top>185</top>
-					<width>1210</width>
-					<height>283</height>
-					<align>center</align>
-					<aligny>center</aligny>
-					<font>font36_title</font>
-					<label>$LOCALIZE[31079]</label>
+				<control type="group">
 					<visible>Integer.IsEqual(Container(50).NumItems,0) + String.IsEmpty(ListItem.Art(tvshow.banner)) + String.IsEmpty(ListItem.Art(banner))</visible>
+					<control type="image">
+						<left>0</left>
+						<top>164</top>
+						<width>1245</width>
+						<height>328</height>
+						<texture border="21">dialogs/dialog-bg.png</texture>
+					</control>
+					<control type="textbox">
+						<left>17</left>
+						<top>185</top>
+						<width>1210</width>
+						<height>283</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<font>font36_title</font>
+						<label>$LOCALIZE[31079]</label>
+					</control>
 				</control>
 				<control type="image">
 					<left>77</left>
@@ -494,14 +495,15 @@
 				</include>
 			</control>
 			<control type="label">
-				<right>100</right>
+				<right>80</right>
 				<top>970</top>
 				<align>right</align>
 				<width>1400</width>
 				<height>44</height>
 				<font>font20_title</font>
-				<textcolor>77FFFFFF</textcolor>
+				<textcolor>99FFFFFF</textcolor>
 				<shadowcolor>text_shadow</shadowcolor>
+				<haspath>true</haspath>
 				<label>$INFO[ListItem.FileNameANdPath]</label>
 				<visible>Control.HasFocus(6)</visible>
 				<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
@@ -557,7 +559,7 @@
 				</control>
 				<control type="label">
 					<left>74</left>
-					<width>500</width>
+					<width>800</width>
 					<height>44</height>
 					<shadowcolor>text_shadow</shadowcolor>
 					<label>$LOCALIZE[31126]</label>
diff --git a/addons/skin.estuary/xml/EventLog.xml b/addons/skin.estuary/xml/EventLog.xml
index ee2a127f12..ee9d3ab574 100644
--- a/addons/skin.estuary/xml/EventLog.xml
+++ b/addons/skin.estuary/xml/EventLog.xml
@@ -23,7 +23,7 @@
 					<ondown>50</ondown>
 					<viewtype label="535">list</viewtype>
 					<pagecontrol>60</pagecontrol>
-					<scrolltime>200</scrolltime>
+					<scrolltime tween="cubic" easing="out">500</scrolltime>
 					<itemlayout height="141" width="eventloglist_width">
 						<control type="image">
 							<left>10</left>
@@ -50,7 +50,8 @@
 							<right>20</right>
 							<height>60</height>
 							<aligny>top</aligny>
-							<label>[COLOR grey]$INFO[ListItem.Property(Event.Description)][/COLOR]</label>
+							<textcolor>grey</textcolor>
+							<label>$INFO[ListItem.Property(Event.Description)]</label>
 						</control>
 						<control type="label">
 							<left>0</left>
@@ -96,7 +97,7 @@
 							<right>20</right>
 							<height>60</height>
 							<aligny>top</aligny>
-							<label>[COLOR grey]$INFO[ListItem.Property(Event.Description)][/COLOR]</label>
+							<label>$INFO[ListItem.Property(Event.Description)]</label>
 						</control>
 						<control type="label">
 							<left>0</left>
@@ -120,7 +121,7 @@
 					<orientation>vertical</orientation>
 					<itemgap>-8.5</itemgap>
 					<left>0</left>
-					<top>162</top>
+					<top>120</top>
 					<onup>9000</onup>
 					<ondown>9000</ondown>
 					<onleft>50</onleft>
@@ -136,7 +137,6 @@
 						<texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
 						<alttexturenofocus></alttexturenofocus>
 						<alttexturefocus colordiffuse="button_focus">lists/focus.png</alttexturefocus>
-						<textwidth>300</textwidth>
 						<textoffsety>35</textoffsety>
 						<label>$LOCALIZE[31032]: $LOCALIZE[584]</label>
 						<altlabel>$LOCALIZE[31032]: $LOCALIZE[585]</altlabel>
@@ -160,12 +160,17 @@
 						<param name="onclick" value="" />
 						<param name="label" value="$LOCALIZE[192]" />
 					</include>
+					<include content="PlaylistWindowButton">
+						<param name="control_id" value="501" />
+						<param name="onclick" value="ActivateWindow(systemsettings,logging)" />
+						<param name="label" value="$LOCALIZE[5]" />
+					</include>
 				</control>
 				<control type="image">
-					<left>40</left>
-					<bottom>100</bottom>
-					<width>340</width>
-					<height>360</height>
+					<left>70</left>
+					<bottom>90</bottom>
+					<width>300</width>
+					<height>300</height>
 					<fadetime>300</fadetime>
 					<aspectratio aligny="bottom">keep</aspectratio>
 					<texture fallback="DefaultVideo.png">$INFO[ListItem.Icon]</texture>
diff --git a/addons/skin.estuary/xml/Home.xml b/addons/skin.estuary/xml/Home.xml
index 30757bcfb4..d691b70982 100644
--- a/addons/skin.estuary/xml/Home.xml
+++ b/addons/skin.estuary/xml/Home.xml
@@ -359,14 +359,14 @@
 						<include>WidgetGroupListCommon</include>
 						<control type="grouplist" id="12855">
 							<height>390</height>
-							<left>25</left>
+							<left>0</left>
+							<right>0</right>
 							<top>36</top>
 							<orientation>horizontal</orientation>
 							<visible>PVR.IsRecordingTV | PVR.HasNonRecordingTVTimer</visible>
-							<align>right</align>
-							<width>1280</width>
+							<align>center</align>
 							<control type="group">
-								<width>620</width>
+								<width>680</width>
 								<visible>PVR.IsRecordingTV</visible>
 								<include content="PVRWidget">
 									<param name="icon" value="$INFO[PVR.TVNowRecordingChannelIcon]" />
@@ -376,8 +376,8 @@
 								</include>
 							</control>
 							<control type="group">
+								<width>680</width>
 								<visible>PVR.HasNonRecordingTVTimer</visible>
-								<width>620</width>
 								<include content="PVRWidget">
 									<param name="icon" value="$INFO[PVR.TVNextRecordingChannelIcon]" />
 									<param name="header" value="$LOCALIZE[19157]" />
@@ -522,8 +522,8 @@
 							<control type="group">
 								<depth>DepthContentPopout</depth>
 								<top>130</top>
-								<animation effect="zoom" start="100" end="105" time="200" tween="sine" easing="inout" center="170,320">Focus</animation>
-								<animation effect="zoom" start="105" end="100" time="200" tween="sine" easing="inout" center="170,320">UnFocus</animation>
+								<animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="170,320">Focus</animation>
+								<animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="170,320">UnFocus</animation>
 								<include content="InfoWallMusicLayout">
 									<param name="fallback_image" value="DefaultFavourites.png" />
 									<param name="focused" value="true" />
diff --git a/addons/skin.estuary/xml/Includes.xml b/addons/skin.estuary/xml/Includes.xml
index 29ba0b9686..4d4bc29e51 100644
--- a/addons/skin.estuary/xml/Includes.xml
+++ b/addons/skin.estuary/xml/Includes.xml
@@ -333,7 +333,7 @@
 				<left>0</left>
 				<width>40</width>
 				<height>40</height>
-				<texture colordiffuse="grey">$PARAM[icon]</texture>
+				<texture colordiffuse="white">$PARAM[icon]</texture>
 			</control>
 			<control type="label">
 				<left>50</left>
@@ -370,6 +370,14 @@
 			<itemgap>28</itemgap>
 			<width>1900</width>
 			<usecontrolcoords>true</usecontrolcoords>
+			<control type="group">
+				<width>150</width>
+				<top>-5</top>
+				<visible>String.IsEqual(ListItem.DBtype,tvshow)</visible>
+				<include content="MediaFlag">
+					<param name="texture" value="$INFO[ListItem.Studio,resource://resource.images.studios.white/,.png]" />
+				</include>
+			</control>
 			<control type="group">
 				<top>10</top>
 				<width>200</width>
@@ -379,14 +387,6 @@
 					<param name="label" value="$INFO[ListItem.Premiered]" />
 				</include>
 			</control>
-			<control type="group">
-				<width>150</width>
-				<top>-5</top>
-				<visible>String.IsEqual(ListItem.DBtype,tvshow)</visible>
-				<include content="MediaFlag">
-					<param name="texture" value="$INFO[ListItem.Studio,resource://resource.images.studios.white/,.png]" />
-				</include>
-			</control>
 			<control type="group">
 				<width>115</width>
 				<visible>!String.IsEmpty(ListItem.Duration)</visible>
diff --git a/addons/skin.estuary/xml/Includes_Buttons.xml b/addons/skin.estuary/xml/Includes_Buttons.xml
index 05945ad3e2..b91606ece9 100644
--- a/addons/skin.estuary/xml/Includes_Buttons.xml
+++ b/addons/skin.estuary/xml/Includes_Buttons.xml
@@ -130,9 +130,9 @@
 				<texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
 				<texturenofocus />
 				<textoffsetx>40</textoffsetx>
-				<textwidth>300</textwidth>
 				<textoffsety>35</textoffsety>
 				<label>$PARAM[label]</label>
+				<onclick>$PARAM[onclick]</onclick>
 				<selectedcolor>white</selectedcolor>
 			</control>
 		</definition>
diff --git a/addons/skin.estuary/xml/Includes_Home.xml b/addons/skin.estuary/xml/Includes_Home.xml
index d367203c82..0306b94918 100644
--- a/addons/skin.estuary/xml/Includes_Home.xml
+++ b/addons/skin.estuary/xml/Includes_Home.xml
@@ -68,7 +68,7 @@
 			</include>
 			<control type="panel" id="$PARAM[list_id]">
 				<left>0</left>
-				<top>120</top>
+				<top>115</top>
 				<visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
 				<right>0</right>
 				<height>500</height>
@@ -77,7 +77,7 @@
 				</include>
 				<itemlayout width="310" height="486">
 					<control type="group">
-						<left>70</left>
+						<left>68</left>
 						<top>10</top>
 						<include content="InfoWallMovieLayout">
 							<param name="focused" value="false" />
@@ -87,7 +87,7 @@
 				<focusedlayout width="310" height="486">
 					<control type="group">
 						<depth>DepthContentPopout</depth>
-						<left>70</left>
+						<left>68</left>
 						<top>10</top>
 						<animation type="Focus">
 							<effect type="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="230,130" />
@@ -184,7 +184,7 @@
 			</include>
 			<control type="panel" id="$PARAM[list_id]">
 				<left>0</left>
-				<top>120</top>
+				<top>105</top>
 				<right>0</right>
 				<height>410</height>
 				<include content="WidgetListCommon">
@@ -295,7 +295,7 @@
 			</include>
 			<control type="panel" id="$PARAM[list_id]">
 				<left>0</left>
-				<top>120</top>
+				<top>110</top>
 				<right>0</right>
 				<height>290</height>
 				<include content="WidgetListCommon">
diff --git a/addons/skin.estuary/xml/Includes_MediaMenu.xml b/addons/skin.estuary/xml/Includes_MediaMenu.xml
index c17b2353c9..158bf2bee3 100644
--- a/addons/skin.estuary/xml/Includes_MediaMenu.xml
+++ b/addons/skin.estuary/xml/Includes_MediaMenu.xml
@@ -6,7 +6,6 @@
 		<top>0</top>
 		<height>80</height>
 		<radioposx>370</radioposx>
-		<textwidth>320</textwidth>
 		<aligny>center</aligny>
 		<invalidcolor>invalid</invalidcolor>
 		<texturefocus colordiffuse="button_focus">lists/focus.png</texturefocus>
diff --git a/addons/skin.estuary/xml/LoginScreen.xml b/addons/skin.estuary/xml/LoginScreen.xml
index 9ad3db8fe1..e9c3622321 100644
--- a/addons/skin.estuary/xml/LoginScreen.xml
+++ b/addons/skin.estuary/xml/LoginScreen.xml
@@ -56,9 +56,9 @@
 			</include>
 			<control type="fixedlist" id="52">
 				<left>0</left>
-				<top>0</top>
+				<top>list_y_offset</top>
 				<width>775</width>
-				<height>100%</height>
+				<bottom>list_y_offset</bottom>
 				<onleft>20</onleft>
 				<onright>20</onright>
 				<focusposition>1</focusposition>
@@ -66,7 +66,7 @@
 				<onup>52</onup>
 				<ondown>52</ondown>
 				<pagecontrol>60</pagecontrol>
-				<scrolltime>200</scrolltime>
+				<scrolltime tween="cubic" easing="out">500</scrolltime>
 				<itemlayout height="130" width="775">
 					<control type="image">
 						<left>10</left>
diff --git a/addons/skin.estuary/xml/MyPVRChannels.xml b/addons/skin.estuary/xml/MyPVRChannels.xml
index f14beca053..716f3a53c4 100644
--- a/addons/skin.estuary/xml/MyPVRChannels.xml
+++ b/addons/skin.estuary/xml/MyPVRChannels.xml
@@ -12,9 +12,9 @@
 				<include>OpenClose_Left</include>
 				<control type="fixedlist" id="50">
 					<left>0</left>
-					<top>0</top>
+					<top>list_y_offset</top>
 					<right>918</right>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<movement>3</movement>
 					<focusposition>5</focusposition>
 					<scrolltime tween="cubic" easing="out">500</scrolltime>
@@ -155,9 +155,9 @@
 				</control>
 				<control type="fixedlist" id="51">
 					<left>0</left>
-					<top>0</top>
+					<top>list_y_offset</top>
 					<right>920</right>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<movement>4</movement>
 					<focusposition>6</focusposition>
 					<scrolltime tween="cubic" easing="out">500</scrolltime>
@@ -289,9 +289,9 @@
 				</include>
 				<control type="scrollbar" id="60">
 					<left>-48</left>
-					<top>0</top>
+					<top>list_y_offset</top>
 					<width>12</width>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<onleft>50</onleft>
 					<onright>50</onright>
 					<orientation>vertical</orientation>
diff --git a/addons/skin.estuary/xml/MyPVRRecordings.xml b/addons/skin.estuary/xml/MyPVRRecordings.xml
index 0fb40f6560..1ab021d3be 100644
--- a/addons/skin.estuary/xml/MyPVRRecordings.xml
+++ b/addons/skin.estuary/xml/MyPVRRecordings.xml
@@ -12,9 +12,9 @@
 				<include>OpenClose_Left</include>
 				<control type="fixedlist" id="50">
 					<left>0</left>
-					<top>0</top>
+					<top>list_y_offset</top>
 					<right>778</right>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<onleft>9000</onleft>
 					<onright>73</onright>
 					<onup>50</onup>
@@ -24,68 +24,68 @@
 					<pagecontrol>73</pagecontrol>
 					<scrolltime>200</scrolltime>
 					<focusedlayout height="80" width="tvrecordings_width">
-							<control type="image">
-								<left>0</left>
-								<top>0</top>
-								<right>0</right>
-								<height>80</height>
-								<texture colordiffuse="button_focus">lists/focus.png</texture>
-								<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(50)">Conditional</animation>
-							</control>
-							<control type="image">
-								<left>21</left>
-								<top>30</top>
-								<width>32</width>
-								<height>32</height>
-								<texture colordiffuse="white">$VAR[ListWatchedIconVar]</texture>
-								<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
-							</control>
-							<control type="label">
-								<left>75</left>
-								<top>0</top>
-								<height>80</height>
-								<right>30</right>
-								<aligny>center</aligny>
-								<scroll>true</scroll>
-								<label>$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
-							</control>
-							<control type="label">
-								<left>15</left>
-								<top>0</top>
-								<height>80</height>
-								<right>20</right>
-								<align>right</align>
-								<aligny>center</aligny>
-								<label>$INFO[ListItem.Label2]</label>
-							</control>
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<right>0</right>
+							<height>80</height>
+							<texture colordiffuse="button_focus">lists/focus.png</texture>
+							<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(50)">Conditional</animation>
+						</control>
+						<control type="image">
+							<left>21</left>
+							<top>30</top>
+							<width>32</width>
+							<height>32</height>
+							<texture colordiffuse="white">$VAR[ListWatchedIconVar]</texture>
+							<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
+						</control>
+						<control type="label">
+							<left>75</left>
+							<top>0</top>
+							<height>80</height>
+							<right>30</right>
+							<aligny>center</aligny>
+							<scroll>true</scroll>
+							<label>$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
+						</control>
+						<control type="label">
+							<left>15</left>
+							<top>0</top>
+							<height>80</height>
+							<right>20</right>
+							<align>right</align>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label2]</label>
+						</control>
 					</focusedlayout>
 					<itemlayout height="80" width="tvrecordings_width">
-							<control type="image">
-								<left>21</left>
-								<top>30</top>
-								<width>32</width>
-								<height>32</height>
-								<texture>$VAR[ListWatchedIconVar]</texture>
-							</control>
-							<control type="label">
-								<left>75</left>
-								<top>0</top>
-								<height>80</height>
-								<right>30</right>
-								<aligny>center</aligny>
-								<label>$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
-							</control>
-							<control type="label">
-								<left>15</left>
-								<top>0</top>
-								<height>80</height>
-								<right>20</right>
-								<align>right</align>
-								<aligny>center</aligny>
-								<label>$INFO[ListItem.Label2]</label>
-								<textcolor>grey</textcolor>
-								<shadowcolor>text_shadow</shadowcolor>
-							</control>
+						<control type="image">
+							<left>21</left>
+							<top>30</top>
+							<width>32</width>
+							<height>32</height>
+							<texture>$VAR[ListWatchedIconVar]</texture>
+						</control>
+						<control type="label">
+							<left>75</left>
+							<top>0</top>
+							<height>80</height>
+							<right>30</right>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
+						</control>
+						<control type="label">
+							<left>15</left>
+							<top>0</top>
+							<height>80</height>
+							<right>20</right>
+							<align>right</align>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label2]</label>
+							<textcolor>grey</textcolor>
+							<shadowcolor>text_shadow</shadowcolor>
+						</control>
 					</itemlayout>
 				</control>
 			</control>
@@ -102,9 +102,9 @@
 				</include>
 				<control type="scrollbar" id="73">
 					<left>-40</left>
-					<top>0</top>
+					<top>list_y_offset</top>
 					<width>12</width>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<onleft>50</onleft>
 					<onright>50</onright>
 					<orientation>vertical</orientation>
diff --git a/addons/skin.estuary/xml/MyPVRSearch.xml b/addons/skin.estuary/xml/MyPVRSearch.xml
index cdd3563479..a09a9385fc 100644
--- a/addons/skin.estuary/xml/MyPVRSearch.xml
+++ b/addons/skin.estuary/xml/MyPVRSearch.xml
@@ -14,9 +14,9 @@
 				<include>Visible_Left</include>
 				<control type="fixedlist" id="50">
 					<left>0</left>
-					<top>0</top>
+					<top>list_y_offset</top>
 					<right>918</right>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<onup>50</onup>
 					<ondown>50</ondown>
 					<onleft>9000</onleft>
diff --git a/addons/skin.estuary/xml/MyPVRTimers.xml b/addons/skin.estuary/xml/MyPVRTimers.xml
index a76f35f8ea..58c7d01295 100644
--- a/addons/skin.estuary/xml/MyPVRTimers.xml
+++ b/addons/skin.estuary/xml/MyPVRTimers.xml
@@ -11,9 +11,9 @@
 				<include>OpenClose_Left</include>
 				<control type="fixedlist" id="50">
 					<left>0</left>
-					<top>0</top>
+					<top>list_y_offset</top>
 					<right>860</right>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<onup>50</onup>
 					<ondown>50</ondown>
 					<onleft>9000</onleft>
@@ -149,9 +149,9 @@
 				</include>
 				<control type="scrollbar" id="73">
 					<left>-50</left>
-					<top>0</top>
+					<top>list_y_offset</top>
 					<width>12</width>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<onleft>50</onleft>
 					<onright>50</onright>
 					<orientation>vertical</orientation>
diff --git a/addons/skin.estuary/xml/MyPlaylist.xml b/addons/skin.estuary/xml/MyPlaylist.xml
index fd8b3ac1f6..16592dda46 100644
--- a/addons/skin.estuary/xml/MyPlaylist.xml
+++ b/addons/skin.estuary/xml/MyPlaylist.xml
@@ -11,31 +11,31 @@
 				<include>OpenClose_Left</include>
 				<control type="fixedlist" id="50">
 					<left>402</left>
-					<top>3</top>
+					<top>list_y_offset</top>
 					<right>594</right>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<scrolltime tween="cubic" easing="out">500</scrolltime>
 					<orientation>vertical</orientation>
 					<onleft>700</onleft>
 					<onright>60</onright>
-					<movement>3</movement>
-					<focusposition>4</focusposition>
+					<movement>5</movement>
+					<focusposition>6</focusposition>
 					<onup>50</onup>
 					<ondown>50</ondown>
 					<pagecontrol>60</pagecontrol>
 					<viewtype label="List">list</viewtype>
 					<preloaditems>1</preloaditems>
-					<focusedlayout height="80" width="playlistlist_width">
+					<focusedlayout height="list_item_height" width="playlistlist_width">
 						<control type="image">
 							<left>0</left>
 							<right>0</right>
-							<height>80</height>
+							<bottom>0</bottom>
 							<texture colordiffuse="button_focus">lists/focus.png</texture>
 							<visible>Control.HasFocus(50)</visible>
 						</control>
 						<control type="label">
 							<left>30</left>
-							<height>80</height>
+							<bottom>0</bottom>
 							<right>30</right>
 							<aligny>center</aligny>
 							<font>font12</font>
@@ -44,7 +44,7 @@
 						</control>
 						<control type="label">
 							<left>30</left>
-							<height>80</height>
+							<bottom>0</bottom>
 							<right>30</right>
 							<align>right</align>
 							<aligny>center</aligny>
@@ -53,10 +53,10 @@
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
 					</focusedlayout>
-					<itemlayout height="80" width="playlistlist_width">
+					<itemlayout height="list_item_height" width="playlistlist_width">
 						<control type="label">
 							<left>30</left>
-							<height>80</height>
+							<bottom>0</bottom>
 							<right>30</right>
 							<aligny>center</aligny>
 							<font>font12</font>
@@ -65,7 +65,7 @@
 						</control>
 						<control type="label">
 							<left>30</left>
-							<height>80</height>
+							<bottom>0</bottom>
 							<right>30</right>
 							<align>right</align>
 							<aligny>center</aligny>
@@ -83,16 +83,16 @@
 					</include>
 					<control type="grouplist" id="700">
 						<orientation>vertical</orientation>
-						<itemgap>-9</itemgap>
+						<itemgap>0</itemgap>
 						<left>0</left>
-						<top>165</top>
+						<top>120</top>
 						<onup>700</onup>
 						<ondown>700</ondown>
 						<onleft>50</onleft>
 						<onright>50</onright>
-						<width>400</width>
+						<width>402</width>
 						<control type="radiobutton" id="20">
-							<width>467</width>
+							<width>402</width>
 							<height>110</height>
 							<align>left</align>
 							<aligny>top</aligny>
@@ -106,17 +106,17 @@
 						<include content="PlaylistWindowButton">
 							<param name="control_id" value="26" />
 							<param name="label" value="" />
-							<param name="width" value="400" />
+							<param name="width" value="402" />
 						</include>
 						<include content="PlaylistWindowButton">
 							<param name="control_id" value="21" />
 							<param name="label" value="$LOCALIZE[190]" />
-							<param name="width" value="400" />
+							<param name="width" value="402" />
 						</include>
 						<include content="PlaylistWindowButton">
 							<param name="control_id" value="22" />
 							<param name="label" value="$LOCALIZE[192]" />
-							<param name="width" value="400" />
+							<param name="width" value="402" />
 						</include>
 					</control>
 				</control>
@@ -144,9 +144,11 @@
 		</control>
 		<include content="TopBar" condition="Window.IsActive(videoplaylist)">
 			<param name="breadcrumbs_label" value="$LOCALIZE[31065]" />
+			<param name="sublabel">$INFO[Container.TotalTime,, - ] $INFO[Playlist.Position(video),, / ]$INFO[Playlist.Length(video)]</param>
 		</include>
 		<include content="TopBar" condition="Window.IsActive(musicplaylist)">
 			<param name="breadcrumbs_label" value="$LOCALIZE[31066]" />
+			<param name="sublabel">$INFO[Container.TotalTime,, - ] $INFO[Playlist.Position(music),, / ]$INFO[Playlist.Length(music)]</param>
 		</include>
 		<include>BottomBar</include>
 		<control type="group">
diff --git a/addons/skin.estuary/xml/MyVideoNav.xml b/addons/skin.estuary/xml/MyVideoNav.xml
index 19e7e7a14a..cbfe038673 100644
--- a/addons/skin.estuary/xml/MyVideoNav.xml
+++ b/addons/skin.estuary/xml/MyVideoNav.xml
@@ -21,8 +21,7 @@
 				<depth>DepthContentPanel</depth>
 				<include>OpenClose_Left</include>
 				<visible>Control.IsVisible(55)</visible>
-<!-- 				<visible>Container.Content(artists) | Container.Content(albums) | Container.Content(addons) | Container.Content(files) | Container.Content(mixed) | Container.Content(musicvideos) | Container.Content(videos) | Container.Content() | Container.Content(episodes)</visible>
- -->				<include>Visible_Left</include>
+				<include>Visible_Left</include>
 				<include>ListThumbInfoPanel</include>
 			</control>
 			<control type="group">
@@ -44,8 +43,6 @@
 						<height>110</height>
 						<font>font36_title</font>
 						<label>$INFO[ListItem.Label]</label>
-						<!-- 					<visible>ListItem.IsCollection</visible>
-						 -->
 					</control>
 					<control type="textbox">
 						<left>30</left>
diff --git a/addons/skin.estuary/xml/SettingsCategory.xml b/addons/skin.estuary/xml/SettingsCategory.xml
index a2af3a5798..a5498a347c 100644
--- a/addons/skin.estuary/xml/SettingsCategory.xml
+++ b/addons/skin.estuary/xml/SettingsCategory.xml
@@ -110,15 +110,15 @@
 				<texturenofocus />
 			</control>
 			<control type="radiobutton" id="20">
-				<width>400</width>
-				<left>30</left>
-				<bottom>68</bottom>
-				<height>120</height>
+				<width>470</width>
+				<left>0</left>
+				<bottom>110</bottom>
+				<height>90</height>
 				<aligny>center</aligny>
 				<onclick>SettingsLevelChange</onclick>
 				<textoffsetx>100</textoffsetx>
 				<textoffsety>0</textoffsety>
-				<texturefocus border="40" colordiffuse="button_focus">buttons/button-fo.png</texturefocus>
+				<texturefocus colordiffuse="button_focus">colors/white.png</texturefocus>
 				<texturenofocus />
 				<radioposx>40</radioposx>
 				<radioposy>0</radioposy>
diff --git a/addons/skin.estuary/xml/SkinSettings.xml b/addons/skin.estuary/xml/SkinSettings.xml
index e79bf8430c..07083bc378 100644
--- a/addons/skin.estuary/xml/SkinSettings.xml
+++ b/addons/skin.estuary/xml/SkinSettings.xml
@@ -82,7 +82,8 @@
 					<label2>$INFO[Skin.String(background_overlay),$LOCALIZE[467] ]</label2>
 					<include>DefaultSettingButton</include>
 					<onclick condition="String.IsEqual(Skin.String(background_overlay),1)">Skin.SetString(background_overlay,2)</onclick>
-					<onclick condition="String.IsEqual(Skin.String(background_overlay),6)">Skin.SetString(background_overlay,1)</onclick>
+					<onclick condition="String.IsEqual(Skin.String(background_overlay),7)">Skin.SetString(background_overlay,1)</onclick>
+					<onclick condition="String.IsEqual(Skin.String(background_overlay),6)">Skin.SetString(background_overlay,7)</onclick>
 					<onclick condition="String.IsEqual(Skin.String(background_overlay),5)">Skin.SetString(background_overlay,6)</onclick>
 					<onclick condition="String.IsEqual(Skin.String(background_overlay),4)">Skin.SetString(background_overlay,5)</onclick>
 					<onclick condition="String.IsEqual(Skin.String(background_overlay),3)">Skin.SetString(background_overlay,4)</onclick>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index bbafceb579..342750708e 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -27,6 +27,7 @@
 		<value>[COLOR grey]0[/COLOR]</value>
 	</variable>
 	<variable name="MusicInfoTextboxVar">
+		<value condition="String.IsEqual(ListItem.DbType,song) + !String.IsEmpty(ListItem.ContributorAndRole)">$INFO[ListItem.ContributorAndRole,[B]$LOCALIZE[31128][/B][CR][COLOR=white],[/COLOR]]</value>
 		<value condition="String.IsEqual(ListItem.DbType,song)">$INFO[ListItem.Comment,[B]$LOCALIZE[569][/B][CR][COLOR=white],[/COLOR]]</value>
 		<value condition="String.IsEqual(ListItem.DbType,album)">$INFO[ListItem.Property(Album_Description),[COLOR=white],[/COLOR]]</value>
 		<value condition="String.IsEqual(ListItem.DbType,artist)">$INFO[ListItem.Property(Artist_Description),[COLOR=white],[/COLOR]]</value>
diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml
index 4cd9052067..d2c578550f 100644
--- a/addons/skin.estuary/xml/VideoOSD.xml
+++ b/addons/skin.estuary/xml/VideoOSD.xml
@@ -17,221 +17,217 @@
 			<onclick>Action(close)</onclick>
 		</control>
 		<control type="group">
-			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(playerprocessinfo)]</visible>
+			<bottom>0</bottom>
+			<height>180</height>
+			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(fullscreeninfo) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(osdvideosettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(playerprocessinfo) | Window.IsVisible(osdcmssettings) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible>
 			<animation effect="fade" time="200">VisibleChange</animation>
-			<control type="group">
-				<bottom>0</bottom>
-				<height>180</height>
-				<visible>!Window.IsVisible(fullscreeninfo) + !Window.IsActive(osdaudiosettings) + !Window.IsActive(osdvideosettings) + !Window.IsActive(osdcmssettings) + !Window.IsActive(PVROSDChannels) + !Window.IsActive(PVROSDGuide)</visible>
-				<animation effect="fade" time="200">VisibleChange</animation>
-				<control type="label">
-					<right>30</right>
-					<top>0</top>
-					<align>right</align>
-					<textoffsetx>20</textoffsetx>
-					<aligny>center</aligny>
-					<width>1000</width>
-					<height>60</height>
-					<label>$VAR[VideoOSDHelpTextVar]</label>
-					<visible>!Player.ShowInfo</visible>
-				</control>
-				<control type="group" id="200">
-					<control type="grouplist" id="201">
-						<left>20</left>
-						<top>90</top>
-						<width>100%</width>
-						<height>135</height>
-						<itemgap>20</itemgap>
-						<scrolltime tween="sine">200</scrolltime>
-						<orientation>horizontal</orientation>
-						<onup condition="Player.SeekEnabled">87</onup>
-						<ondown>noop</ondown>
-						<onleft>70043</onleft>
-						<onright>70011</onright>
-						<control type="radiobutton" id="600">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/previous.png"/>
-							</include>
-							<onclick>PlayerControl(Previous)</onclick>
-							<visible>!VideoPlayer.Content(livetv)</visible>
-						</control>
-						<control type="radiobutton" id="602">
-							<textureradioonfocus colordiffuse="white">osd/fullscreen/buttons/play.png</textureradioonfocus>
-							<textureradioonnofocus>osd/fullscreen/buttons/play.png</textureradioonnofocus>
-							<textureradioofffocus colordiffuse="white">osd/fullscreen/buttons/pause.png</textureradioofffocus>
-							<textureradiooffnofocus>osd/fullscreen/buttons/pause.png</textureradiooffnofocus>
-							<texturefocus colordiffuse="button_focus">osd/fullscreen/buttons/button-fo.png</texturefocus>
-							<width>76</width>
-							<animation center="38,38" effect="zoom" end="100" reversible="false" start="95" time="480" tween="back">Focus</animation>
-							<height>76</height>
-							<radiowidth>74</radiowidth>
-							<radioheight>74</radioheight>
-							<font></font>
-							<texturenofocus />
-							<radioposx>1</radioposx>
-							<radioposy>0</radioposy>
-							<selected>Player.Paused</selected>
-							<onclick>PlayerControl(Play)</onclick>
-							<visible>Player.PauseEnabled</visible>
-						</control>
-						<control type="radiobutton" id="603">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/stop.png"/>
-							</include>
-							<onclick>PlayerControl(Stop)</onclick>
-						</control>
-						<control type="radiobutton" id="605">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/next.png"/>
-							</include>
-							<onclick>PlayerControl(Next)</onclick>
-							<visible>!VideoPlayer.Content(livetv) + [Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1)]</visible>
-						</control>
-						<control type="radiobutton" id="804">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/home.png"/>
-							</include>
-							<onclick>PlayerControl(ShowVideoMenu)</onclick>
-							<visible>VideoPlayer.HasMenu</visible>
-						</control>
-						<control type="radiobutton" id="606">
-							<textureradioonfocus colordiffuse="white">osd/fullscreen/buttons/record-white.png</textureradioonfocus>
-							<textureradioonnofocus>osd/fullscreen/buttons/record-white.png</textureradioonnofocus>
-							<textureradioofffocus colordiffuse="white">osd/fullscreen/buttons/record.png</textureradioofffocus>
-							<textureradiooffnofocus>osd/fullscreen/buttons/record.png</textureradiooffnofocus>
-							<texturefocus colordiffuse="button_focus">osd/fullscreen/buttons/button-fo.png</texturefocus>
-							<width>76</width>
-							<animation center="38,38" effect="zoom" end="100" reversible="false" start="95" time="480" tween="back">Focus</animation>
-							<height>76</height>
-							<radiowidth>74</radiowidth>
-							<radioheight>74</radioheight>
-							<font></font>
-							<texturenofocus />
-							<radioposx>1</radioposx>
-							<radioposy>0</radioposy>
-							<selected>!Player.Recording</selected>
-							<onclick>PlayerControl(Record)</onclick>
-							<visible>Player.CanRecord</visible>
-							<visible>VideoPlayer.Content(livetv)</visible>
-						</control>
+			<control type="label">
+				<right>30</right>
+				<top>0</top>
+				<align>right</align>
+				<textoffsetx>20</textoffsetx>
+				<aligny>center</aligny>
+				<width>1000</width>
+				<height>60</height>
+				<label>$VAR[VideoOSDHelpTextVar]</label>
+				<visible>!Player.ShowInfo</visible>
+			</control>
+			<control type="group" id="200">
+				<control type="grouplist" id="201">
+					<left>20</left>
+					<top>90</top>
+					<width>100%</width>
+					<height>135</height>
+					<itemgap>20</itemgap>
+					<scrolltime tween="sine">200</scrolltime>
+					<orientation>horizontal</orientation>
+					<onup>87</onup>
+					<ondown>noop</ondown>
+					<onleft>70043</onleft>
+					<onright>70011</onright>
+					<control type="radiobutton" id="600">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/previous.png"/>
+						</include>
+						<onclick>PlayerControl(Previous)</onclick>
+						<visible>!VideoPlayer.Content(livetv)</visible>
+					</control>
+					<control type="radiobutton" id="602">
+						<textureradioonfocus colordiffuse="white">osd/fullscreen/buttons/play.png</textureradioonfocus>
+						<textureradioonnofocus>osd/fullscreen/buttons/play.png</textureradioonnofocus>
+						<textureradioofffocus colordiffuse="white">osd/fullscreen/buttons/pause.png</textureradioofffocus>
+						<textureradiooffnofocus>osd/fullscreen/buttons/pause.png</textureradiooffnofocus>
+						<texturefocus colordiffuse="button_focus">osd/fullscreen/buttons/button-fo.png</texturefocus>
+						<width>76</width>
+						<animation center="38,38" effect="zoom" end="100" reversible="false" start="95" time="480" tween="back">Focus</animation>
+						<height>76</height>
+						<radiowidth>74</radiowidth>
+						<radioheight>74</radioheight>
+						<font></font>
+						<texturenofocus />
+						<radioposx>1</radioposx>
+						<radioposy>0</radioposy>
+						<selected>Player.Paused</selected>
+						<onclick>PlayerControl(Play)</onclick>
+						<visible>Player.PauseEnabled</visible>
+					</control>
+					<control type="radiobutton" id="603">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/stop.png"/>
+						</include>
+						<onclick>PlayerControl(Stop)</onclick>
 					</control>
-					<control type="grouplist" id="202">
-						<right>50</right>
-						<top>90</top>
-						<width>1800</width>
-						<height>135</height>
-						<align>right</align>
-						<itemgap>20</itemgap>
-						<scrolltime tween="sine">200</scrolltime>
-						<orientation>horizontal</orientation>
-						<onup condition="Player.SeekEnabled">87</onup>
-						<ondown condition="Control.HasFocus(70043)">11104</ondown>
-						<ondown condition="Control.HasFocus(704)">12104</ondown>
-						<ondown condition="Control.HasFocus(255)">13103</ondown>
-						<onleft>606</onleft>
-						<onright>600</onright>
-						<control type="radiobutton" id="70011">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/information.png"/>
-							</include>
-							<onclick>Action(Close)</onclick>
-							<onclick>ActivateWindow(fullscreeninfo)</onclick>
-						</control>
-						<control type="radiobutton" id="70040">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/channels.png"/>
-							</include>
-							<onclick>Dialog.Close(VideoOSD)</onclick>
-							<onclick>ActivateWindow(PVROSDChannels)</onclick>
-							<visible>VideoPlayer.Content(livetv)</visible>
-						</control>
-						<control type="radiobutton" id="70041">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/guide.png"/>
-							</include>
-							<onclick>Dialog.Close(VideoOSD)</onclick>
-							<onclick>ActivateWindow(PVROSDGuide)</onclick>
-							<visible>VideoPlayer.Content(livetv)</visible>
-						</control>
-						<control type="radiobutton" id="700">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/bookmarks.png"/>
-							</include>
-							<onclick>ActivateWindow(videobookmarks)</onclick>
-							<visible>!VideoPlayer.Content(livetv)</visible>
-						</control>
-						<control type="radiobutton" id="703">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/teletext.png"/>
-							</include>
-							<onclick>Dialog.Close(VideoOSD)</onclick>
-							<onclick>ActivateWindow(Teletext)</onclick>
-							<visible>VideoPlayer.Content(livetv)</visible>
-						</control>
-						<control type="radiobutton" id="704">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/settings-subtitle.png"/>
-							</include>
-							<onclick>SetProperty(settingslist_content,subtitle,home)</onclick>
-							<onclick>SetProperty(settingslist_header,$LOCALIZE[24012],home)</onclick>
-							<onclick>ActivateWindow(1101)</onclick>
-							<visible>!VideoPlayer.Content(LiveTV) | VideoPlayer.HasSubtitles</visible>
-						</control>
-						<control type="radiobutton" id="255">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/stereoscopic.png"/>
-							</include>
-							<visible>VideoPlayer.IsStereoscopic</visible>
-							<onclick>SetProperty(settingslist_content,3d,home)</onclick>
-							<onclick>SetProperty(settingslist_header,$LOCALIZE[36501],home)</onclick>
-							<onclick>ActivateWindow(1101)</onclick>
-						</control>
-						<control type="radiobutton" id="70043">
-							<include content="OSDButton">
-								<param name="texture" value="osd/fullscreen/buttons/settings.png"/>
-							</include>
-							<onclick>SetProperty(settingslist_content,osd,home)</onclick>
-							<onclick>SetProperty(settingslist_header,$LOCALIZE[5],home)</onclick>
-							<onclick>ActivateWindow(1101)</onclick>
-						</control>
+					<control type="radiobutton" id="605">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/next.png"/>
+						</include>
+						<onclick>PlayerControl(Next)</onclick>
+						<visible>!VideoPlayer.Content(livetv) + [Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1)]</visible>
+					</control>
+					<control type="radiobutton" id="804">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/home.png"/>
+						</include>
+						<onclick>PlayerControl(ShowVideoMenu)</onclick>
+						<visible>VideoPlayer.HasMenu</visible>
+					</control>
+					<control type="radiobutton" id="606">
+						<textureradioonfocus colordiffuse="white">osd/fullscreen/buttons/record-white.png</textureradioonfocus>
+						<textureradioonnofocus>osd/fullscreen/buttons/record-white.png</textureradioonnofocus>
+						<textureradioofffocus colordiffuse="white">osd/fullscreen/buttons/record.png</textureradioofffocus>
+						<textureradiooffnofocus>osd/fullscreen/buttons/record.png</textureradiooffnofocus>
+						<texturefocus colordiffuse="button_focus">osd/fullscreen/buttons/button-fo.png</texturefocus>
+						<width>76</width>
+						<animation center="38,38" effect="zoom" end="100" reversible="false" start="95" time="480" tween="back">Focus</animation>
+						<height>76</height>
+						<radiowidth>74</radiowidth>
+						<radioheight>74</radioheight>
+						<font></font>
+						<texturenofocus />
+						<radioposx>1</radioposx>
+						<radioposy>0</radioposy>
+						<selected>!Player.Recording</selected>
+						<onclick>PlayerControl(Record)</onclick>
+						<visible>Player.CanRecord</visible>
+						<visible>VideoPlayer.Content(livetv)</visible>
 					</control>
 				</control>
-				<control type="group" id="6000">
-					<top>60</top>
-					<control type="button" id="87">
-						<include>HiddenObject</include>
-						<onup>200</onup>
-						<onunfocus condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onunfocus>
-						<ondown>200</ondown>
-						<onright>StepForward</onright>
-						<onleft>StepBack</onleft>
-						<visible>Player.SeekEnabled</visible>
-						<onclick condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onclick>
+				<control type="grouplist" id="202">
+					<right>50</right>
+					<top>90</top>
+					<width>1800</width>
+					<height>135</height>
+					<align>right</align>
+					<itemgap>20</itemgap>
+					<scrolltime tween="sine">200</scrolltime>
+					<orientation>horizontal</orientation>
+					<onup>87</onup>
+					<ondown condition="Control.HasFocus(70043)">11104</ondown>
+					<ondown condition="Control.HasFocus(704)">12104</ondown>
+					<ondown condition="Control.HasFocus(255)">13103</ondown>
+					<onleft>606</onleft>
+					<onright>600</onright>
+					<control type="radiobutton" id="70011">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/information.png"/>
+						</include>
+						<onclick>Action(Close)</onclick>
+						<onclick>ActivateWindow(fullscreeninfo)</onclick>
+					</control>
+					<control type="radiobutton" id="70040">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/channels.png"/>
+						</include>
+						<onclick>Dialog.Close(VideoOSD)</onclick>
+						<onclick>ActivateWindow(PVROSDChannels)</onclick>
+						<visible>VideoPlayer.Content(livetv)</visible>
 					</control>
-					<control type="slider">
-						<top>-5</top>
-						<left>0</left>
-						<width>100%</width>
-						<height>25</height>
-						<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
-						<textureslidernib>osd/progress/nub_leftright.png</textureslidernib>
-						<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
-						<info>Player.Progress</info>
-						<action>seek</action>
-						<visible>!Control.HasFocus(87) + Player.SeekEnabled</visible>
+					<control type="radiobutton" id="70041">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/guide.png"/>
+						</include>
+						<onclick>Dialog.Close(VideoOSD)</onclick>
+						<onclick>ActivateWindow(PVROSDGuide)</onclick>
+						<visible>VideoPlayer.Content(livetv)</visible>
 					</control>
-					<control type="slider">
-						<top>-5</top>
-						<left>0</left>
-						<width>100%</width>
-						<height>25</height>
-						<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
-						<textureslidernib colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernib>
-						<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
-						<info>Player.Progress</info>
-						<action>seek</action>
-						<visible>Control.HasFocus(87) + Player.SeekEnabled</visible>
+					<control type="radiobutton" id="700">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/bookmarks.png"/>
+						</include>
+						<onclick>ActivateWindow(videobookmarks)</onclick>
+						<visible>!VideoPlayer.Content(livetv)</visible>
 					</control>
+					<control type="radiobutton" id="703">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/teletext.png"/>
+						</include>
+						<onclick>Dialog.Close(VideoOSD)</onclick>
+						<onclick>ActivateWindow(Teletext)</onclick>
+						<visible>VideoPlayer.Content(livetv)</visible>
+					</control>
+					<control type="radiobutton" id="704">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/settings-subtitle.png"/>
+						</include>
+						<onclick>SetProperty(settingslist_content,subtitle,home)</onclick>
+						<onclick>SetProperty(settingslist_header,$LOCALIZE[24012],home)</onclick>
+						<onclick>ActivateWindow(1101)</onclick>
+						<visible>!VideoPlayer.Content(LiveTV) | VideoPlayer.HasSubtitles</visible>
+					</control>
+					<control type="radiobutton" id="255">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/stereoscopic.png"/>
+						</include>
+						<visible>VideoPlayer.IsStereoscopic</visible>
+						<onclick>SetProperty(settingslist_content,3d,home)</onclick>
+						<onclick>SetProperty(settingslist_header,$LOCALIZE[36501],home)</onclick>
+						<onclick>ActivateWindow(1101)</onclick>
+					</control>
+					<control type="radiobutton" id="70043">
+						<include content="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/settings.png"/>
+						</include>
+						<onclick>SetProperty(settingslist_content,osd,home)</onclick>
+						<onclick>SetProperty(settingslist_header,$LOCALIZE[5],home)</onclick>
+						<onclick>ActivateWindow(1101)</onclick>
+					</control>
+				</control>
+			</control>
+			<control type="group" id="6000">
+				<top>60</top>
+				<visible>Player.SeekEnabled</visible>
+				<control type="button" id="87">
+					<include>HiddenObject</include>
+					<onup>200</onup>
+					<onunfocus condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onunfocus>
+					<ondown>200</ondown>
+					<onright>StepForward</onright>
+					<onleft>StepBack</onleft>
+					<onclick condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onclick>
+				</control>
+				<control type="slider">
+					<top>-5</top>
+					<left>0</left>
+					<width>100%</width>
+					<height>25</height>
+					<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+					<textureslidernib>osd/progress/nub_leftright.png</textureslidernib>
+					<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
+					<info>Player.Progress</info>
+					<action>seek</action>
+					<visible>!Control.HasFocus(87)</visible>
+				</control>
+				<control type="slider">
+					<top>-5</top>
+					<left>0</left>
+					<width>100%</width>
+					<height>25</height>
+					<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+					<textureslidernib colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernib>
+					<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
+					<info>Player.Progress</info>
+					<action>seek</action>
+					<visible>Control.HasFocus(87)</visible>
 				</control>
 			</control>
 		</control>
diff --git a/addons/skin.estuary/xml/View_502_FanArt.xml b/addons/skin.estuary/xml/View_502_FanArt.xml
index ecbc503645..4938f10c15 100644
--- a/addons/skin.estuary/xml/View_502_FanArt.xml
+++ b/addons/skin.estuary/xml/View_502_FanArt.xml
@@ -49,9 +49,9 @@
 				</control>
 				<control type="scrollbar" id="502600">
 					<left>20</left>
-					<top>0</top>
+					<top>list_y_offset</top>
 					<width>12</width>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<onleft>502</onleft>
 					<onright>502</onright>
 					<orientation>vertical</orientation>
diff --git a/addons/skin.estuary/xml/View_50_List.xml b/addons/skin.estuary/xml/View_50_List.xml
index b3c064972f..086db0f827 100644
--- a/addons/skin.estuary/xml/View_50_List.xml
+++ b/addons/skin.estuary/xml/View_50_List.xml
@@ -23,9 +23,9 @@
 					</include>
 					<control type="scrollbar" id="50600">
 						<left>20</left>
-						<top>0</top>
+						<top>list_y_offset</top>
 						<width>12</width>
-						<height>100%</height>
+						<bottom>list_y_offset</bottom>
 						<onleft>50</onleft>
 						<onright>50</onright>
 						<orientation>vertical</orientation>
diff --git a/addons/skin.estuary/xml/View_54_InfoWall.xml b/addons/skin.estuary/xml/View_54_InfoWall.xml
index ae6272f3e1..b4533c6b66 100644
--- a/addons/skin.estuary/xml/View_54_InfoWall.xml
+++ b/addons/skin.estuary/xml/View_54_InfoWall.xml
@@ -74,7 +74,7 @@
 				<top>0</top>
 				<width>316</width>
 				<height>316</height>
-				<texture border="2" fallback="$PARAM[fallback_image]" background="true">$VAR[InfoWallThumbVar]</texture>
+				<texture fallback="$PARAM[fallback_image]" background="true">$VAR[InfoWallThumbVar]</texture>
 				<aspectratio>keep</aspectratio>
 				<bordersize>20</bordersize>
 			</control>
@@ -113,7 +113,7 @@
 				</control>
 			</control>
 			<control type="group">
-				<left>145</left>
+				<left>133</left>
 				<top>2</top>
 				<include>UserRatingCircle</include>
 			</control>
@@ -150,7 +150,7 @@
 				<top>10</top>
 				<width>316</width>
 				<height>218</height>
-				<texture border="2" fallback="$PARAM[fallback_image]" background="true">$VAR[InfoWallThumbVar]</texture>
+				<texture fallback="$PARAM[fallback_image]" background="true">$VAR[InfoWallThumbVar]</texture>
 				<aspectratio>scale</aspectratio>
 				<bordersize>20</bordersize>
 			</control>
@@ -285,24 +285,26 @@
 				<visible>$PARAM[focused] + !String.IsEmpty(ListItem.Art(poster))</visible>
 				<include condition="$PARAM[focused]">Animation_FocusTextureFade</include>
 			</control>
-			<control type="image">
-				<left>15</left>
-				<top>-10</top>
-				<width>290</width>
-				<height>400</height>
-				<texture background="true">$INFO[ListItem.Art(poster)]</texture>
-				<aspectratio>scale</aspectratio>
-				<bordertexture border="20">overlays/shadow.png</bordertexture>
-				<bordersize>20</bordersize>
+			<control type="group">
 				<visible>!String.IsEmpty(ListItem.Art(poster))</visible>
-			</control>
-			<control type="image">
-				<left>35</left>
-				<top>290</top>
-				<width>80</width>
-				<height>80</height>
-				<texture>overlays/overlay-bg.png</texture>
-				<visible>Listitem.IsCollection | ListItem.IsResumable | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0)</visible>
+				<control type="image">
+					<left>15</left>
+					<top>-10</top>
+					<width>290</width>
+					<height>400</height>
+					<texture background="true">$INFO[ListItem.Art(poster)]</texture>
+					<aspectratio>scale</aspectratio>
+					<bordertexture border="20">overlays/shadow.png</bordertexture>
+					<bordersize>20</bordersize>
+				</control>
+				<control type="image">
+					<left>35</left>
+					<top>290</top>
+					<width>80</width>
+					<height>80</height>
+					<texture>overlays/overlay-bg.png</texture>
+					<visible>Listitem.IsCollection | ListItem.IsResumable | ListItem.IsPlaying | Integer.IsGreater(ListItem.Playcount,0)</visible>
+				</control>
 			</control>
 			<control type="group">
 				<visible>String.IsEqual(ListItem.DBtype,tvshow)</visible>
@@ -312,7 +314,8 @@
 					<top>0</top>
 					<width>250</width>
 					<height>50</height>
-					<texture>overlays/overlayfade.png</texture>
+					<texture colordiffuse="CCFFFFFF">overlays/overlayfade.png</texture>
+					<visible>!String.IsEmpty(ListItem.Art(poster))</visible>
 				</control>
 				<control type="label">
 					<left>0</left>
@@ -398,7 +401,7 @@
 				</focusedlayout>
 				<itemlayout height="300" width="300" condition="Container.Content(episodes)">
 					<control type="group">
-						<left>40</left>
+						<left>64</left>
 						<top>110</top>
 						<include content="InfoWallEpisodeLayout">
 							<param name="focused" value="false" />
@@ -409,9 +412,9 @@
 				<focusedlayout height="300" width="300" condition="Container.Content(episodes)">
 					<control type="group">
 						<depth>DepthContentPopout</depth>
-						<animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="200,250">Focus</animation>
-						<animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="200,250">UnFocus</animation>
-						<left>40</left>
+						<animation effect="zoom" start="100" end="110" time="200" tween="sine" easing="inout" center="220,250">Focus</animation>
+						<animation effect="zoom" start="110" end="100" time="200" tween="sine" easing="inout" center="220,250">UnFocus</animation>
+						<left>64</left>
 						<top>110</top>
 						<include content="InfoWallEpisodeLayout">
 							<param name="focused" value="true" />
@@ -424,11 +427,6 @@
 						<top>150</top>
 						<left>40</left>
 						<include>InfoWallMusicLayout</include>
-						<control type="group">
-							<left>133</left>
-							<top>-4</top>
-							<include>UserRatingCircle</include>
-						</control>
 					</control>
 				</itemlayout>
 				<focusedlayout height="410" width="310" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos)">
@@ -441,11 +439,6 @@
 						<include content="InfoWallMusicLayout">
 							<param name="focused" value="true" />
 						</include>
-						<control type="group">
-							<left>133</left>
-							<top>-4</top>
-							<include>UserRatingCircle</include>
-						</control>
 					</control>
 				</focusedlayout>
 				<itemlayout height="400" width="378" condition="Container.Content(images)">
-- 
cgit v1.2.3