Changed : [Confluence] Removed Right hand side blade image from all screens. And Only made the Left hand one only visible if there is an actual menu on the side of the screen for it.

(I may of wrecked some animation transitions for the side blades with this so feel free to report them, looked OK to me though)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27129 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

29 files changed, 60 insertions, 345 deletions

diff --git a/skin/Confluence/720p/DialogAlbumInfo.xml b/skin/Confluence/720p/DialogAlbumInfo.xml
index 986a771829..fd9b8eb1ca 100644
--- a/skin/Confluence/720p/DialogAlbumInfo.xml
+++ b/skin/Confluence/720p/DialogAlbumInfo.xml
@@ -659,13 +659,7 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

+		<include>SideBladeRight</include>

 		<include>Clock</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/skin/Confluence/720p/DialogFavourites.xml b/skin/Confluence/720p/DialogFavourites.xml
index 35ab2e4de0..f1fd14589b 100644
--- a/skin/Confluence/720p/DialogFavourites.xml
+++ b/skin/Confluence/720p/DialogFavourites.xml
@@ -118,14 +118,6 @@
 				<label>($INFO[Container(450).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages])</label>

 			</control>

 		</control>

-		<control type="image">

-			<posx>1254</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-			<animation effect="slide" start="35,0" time="300" tween="quadratic" easing="out" condition="Window.IsVisible(Home)">WindowOpen</animation>

-			<animation effect="slide" end="35,0" time="300" tween="quadratic" easing="out" condition="Window.IsVisible(Home)">WindowClose</animation>

-		</control>

+		<include>SideBladeRight</include>

 	</controls>

 </window>

diff --git a/skin/Confluence/720p/DialogMuteBug.xml b/skin/Confluence/720p/DialogMuteBug.xml
index f7dd2829a5..80f96b8c4f 100644
--- a/skin/Confluence/720p/DialogMuteBug.xml
+++ b/skin/Confluence/720p/DialogMuteBug.xml
@@ -8,9 +8,8 @@
 	</coordinates>

 	<controls>

 		<control type="group">

-			<posx>100r</posx>

+			<posx>80r</posx>

 			<posy>0</posy>

-			<animation effect="slide" start="0,0" end="20,0" delay="0" time="300" condition="Window.IsActive(Home)">conditional</animation>

 			<animation effect="slide" end="100,0" time="200" tween="quadratic" easing="out">WindowClose</animation>

 			<animation effect="slide" start="100,0" time="200" tween="quadratic" easing="out">WindowOpen</animation>

 			<control type="image">

diff --git a/skin/Confluence/720p/DialogPictureInfo.xml b/skin/Confluence/720p/DialogPictureInfo.xml
index 2d64d30fdb..72159adb16 100644
--- a/skin/Confluence/720p/DialogPictureInfo.xml
+++ b/skin/Confluence/720p/DialogPictureInfo.xml
@@ -146,15 +146,7 @@
 				</focusedlayout>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-			<animation effect="slide" start="26,0" end="0,0" time="200" tween="quadratic" easing="out" condition="Window.IsVisible(Slideshow)">WindowOpen</animation>

-			<animation effect="slide" start="0,0" end="26,0" time="200" tween="quadratic" easing="out" condition="Window.IsVisible(Slideshow)">WindowClose</animation>

-		</control>

+		<include>SideBladeRight</include>

 		<include>Clock</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/skin/Confluence/720p/DialogScriptInfo.xml b/skin/Confluence/720p/DialogScriptInfo.xml
index 957c4666e8..11d99400ce 100644
--- a/skin/Confluence/720p/DialogScriptInfo.xml
+++ b/skin/Confluence/720p/DialogScriptInfo.xml
@@ -76,13 +76,7 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

+		<include>SideBladeRight</include>

 		<include>Clock</include>

 	</controls>

 </window>

diff --git a/skin/Confluence/720p/DialogVideoInfo.xml b/skin/Confluence/720p/DialogVideoInfo.xml
index b582c09039..12d7f6d924 100644
--- a/skin/Confluence/720p/DialogVideoInfo.xml
+++ b/skin/Confluence/720p/DialogVideoInfo.xml
@@ -1117,13 +1117,7 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

+		<include>SideBladeRight</include>

 		<include>Clock</include>

 	</controls>

 </window>

diff --git a/skin/Confluence/720p/FileBrowser.xml b/skin/Confluence/720p/FileBrowser.xml
index f1cb71f0f0..c7bbdd0739 100644
--- a/skin/Confluence/720p/FileBrowser.xml
+++ b/skin/Confluence/720p/FileBrowser.xml
@@ -319,14 +319,7 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-			<visible>!Window.IsVisible(124)</visible>

-		</control>

+		<include>SideBladeRight</include>

 		<include>Clock</include>

 	</controls>

 </window>
\ No newline at end of file
diff --git a/skin/Confluence/720p/FileManager.xml b/skin/Confluence/720p/FileManager.xml
index 3ddcfaa1b3..2b5299f1cb 100644
--- a/skin/Confluence/720p/FileManager.xml
+++ b/skin/Confluence/720p/FileManager.xml
@@ -328,20 +328,6 @@
 				</focusedlayout>

 			</control>

 		</control>

-		<control type="image">

-			<posx>-820</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture>HomeBlade.png</texture>

-		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/Home.xml b/skin/Confluence/720p/Home.xml
index e6a0f31e77..e9605a0c7f 100644
--- a/skin/Confluence/720p/Home.xml
+++ b/skin/Confluence/720p/Home.xml
@@ -16,11 +16,11 @@
 		<include condition="Skin.HasSetting(homepageHideRecentlyAdded)">HomeRecentlyAddedInfo</include>

 		<!-- weather Info -->

 		<control type="group">

-			<posx>510r</posx>

+			<posx>490r</posx>

 			<posy>0</posy>

 			<animation effect="slide" start="0,0" end="-60,0" delay="0" time="300" condition="Window.IsVisible(MuteBug)">conditional</animation>

-			<animation effect="slide" start="0,0" end="510,0" delay="0" time="300">WindowClose</animation>

-			<animation effect="slide" start="510,0" end="0,0" delay="0" time="300">WindowOpen</animation>

+			<animation effect="slide" start="0,0" end="550,0" delay="0" time="300">WindowClose</animation>

+			<animation effect="slide" start="550,0" end="0,0" delay="0" time="300">WindowOpen</animation>

 			<visible>!Skin.HasSetting(homepageWeatherinfo) + Weather.IsFetched</visible>

 			<control type="image">

 				<description>time background</description>

@@ -373,8 +373,8 @@
 			</control>

 		</control>

 		<control type="group">

-			<animation effect="slide" end="-370,0" time="500" tween="quadratic" easing="out">WindowClose</animation>

-			<animation effect="slide" start="-370,0" time="500" tween="quadratic" easing="out">WindowOpen</animation>

+			<animation effect="slide" end="-400,0" time="500" tween="quadratic" easing="out">WindowClose</animation>

+			<animation effect="slide" start="-400,0" time="500" tween="quadratic" easing="out">WindowOpen</animation>

 			<control type="group">

 				<animation effect="slide" end="-228,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

 				<control type="image">

@@ -1002,11 +1002,11 @@
 			</control>

 		</control>

 		<control type="group">

-			<posx>380r</posx>

+			<posx>360r</posx>

 			<posy>0</posy>

 			<animation effect="slide" start="0,0" end="-60,0" delay="0" time="300" condition="Window.IsVisible(MuteBug)">conditional</animation>

-			<animation effect="slide" start="0,0" end="380,0" delay="0" time="300">WindowClose</animation>

-			<animation effect="slide" start="380,0" end="0,0" delay="0" time="300">WindowOpen</animation>

+			<animation effect="slide" start="0,0" end="420,0" delay="0" time="300">WindowClose</animation>

+			<animation effect="slide" start="420,0" end="0,0" delay="0" time="300">WindowOpen</animation>

 			<control type="image">

 				<description>time background</description>

 				<posx>0</posx>

@@ -1029,14 +1029,5 @@
 				<label>[COLOR=grey]$INFO[System.Date][/COLOR] | $INFO[System.Time]</label>

 			</control>

 		</control>

-		<control type="image">

-			<posx>1289</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-			<animation effect="slide" end="-35,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

-			<animation effect="slide" start="-35,0" time="300" tween="quadratic" easing="out" condition="!Window.Previous(startup)">WindowOpen</animation>

-		</control>

 	</controls>	

 </window>
\ No newline at end of file
diff --git a/skin/Confluence/720p/LoginScreen.xml b/skin/Confluence/720p/LoginScreen.xml
index bd1df16566..87ed855c41 100644
--- a/skin/Confluence/720p/LoginScreen.xml
+++ b/skin/Confluence/720p/LoginScreen.xml
@@ -268,19 +268,5 @@
 				<label>$LOCALIZE[20096]</label>

 			</control>

 		</control>

-		<control type="image">

-			<posx>-820</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture>HomeBlade.png</texture>

-		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 	</controls>

 </window>

diff --git a/skin/Confluence/720p/MyMusicNav.xml b/skin/Confluence/720p/MyMusicNav.xml
index 2672da6c81..9685a8b676 100644
--- a/skin/Confluence/720p/MyMusicNav.xml
+++ b/skin/Confluence/720p/MyMusicNav.xml
@@ -113,7 +113,8 @@
 			<animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus | Control.HasFocus(8999)">Conditional</animation>

 			<animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus">WindowClose</animation>

 			<control type="group">

-				<animation effect="slide" end="-228,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

+				<animation effect="slide" end="-240,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

+				<animation effect="slide" start="-15,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>

 				<control type="image">

 					<posx>0</posx>

 					<posy>0</posy>

@@ -215,13 +216,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -328,13 +323,6 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>240</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/MyMusicPlaylist.xml b/skin/Confluence/720p/MyMusicPlaylist.xml
index 1ba34fa2ce..8e1bf972a5 100644
--- a/skin/Confluence/720p/MyMusicPlaylist.xml
+++ b/skin/Confluence/720p/MyMusicPlaylist.xml
@@ -97,13 +97,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -192,13 +186,6 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/MyMusicPlaylistEditor.xml b/skin/Confluence/720p/MyMusicPlaylistEditor.xml
index e133fe2081..72b924bb32 100644
--- a/skin/Confluence/720p/MyMusicPlaylistEditor.xml
+++ b/skin/Confluence/720p/MyMusicPlaylistEditor.xml
@@ -396,20 +396,6 @@
 				</focusedlayout>

 			</control>

 		</control>

-		<control type="image">

-			<posx>-820</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture>HomeBlade.png</texture>

-		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/MyMusicSongs.xml b/skin/Confluence/720p/MyMusicSongs.xml
index e4097a1b04..d7c4e56011 100644
--- a/skin/Confluence/720p/MyMusicSongs.xml
+++ b/skin/Confluence/720p/MyMusicSongs.xml
@@ -98,13 +98,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -183,13 +177,6 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/MyPics.xml b/skin/Confluence/720p/MyPics.xml
index 68e9c75902..1ec93c916c 100644
--- a/skin/Confluence/720p/MyPics.xml
+++ b/skin/Confluence/720p/MyPics.xml
@@ -110,13 +110,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -214,13 +208,6 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/MyPrograms.xml b/skin/Confluence/720p/MyPrograms.xml
index d603c5e6c7..fc7a46b57f 100644
--- a/skin/Confluence/720p/MyPrograms.xml
+++ b/skin/Confluence/720p/MyPrograms.xml
@@ -88,13 +88,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -159,13 +153,6 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/MyScripts.xml b/skin/Confluence/720p/MyScripts.xml
index 2d16ae4489..2db5af3d0e 100644
--- a/skin/Confluence/720p/MyScripts.xml
+++ b/skin/Confluence/720p/MyScripts.xml
@@ -88,13 +88,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -159,13 +153,6 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/MyVideo.xml b/skin/Confluence/720p/MyVideo.xml
index 63f5030509..19dc7a6a70 100644
--- a/skin/Confluence/720p/MyVideo.xml
+++ b/skin/Confluence/720p/MyVideo.xml
@@ -100,7 +100,8 @@
 			<animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus | Control.HasFocus(8999)">Conditional</animation>

 			<animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus">WindowClose</animation>

 			<control type="group">

-				<animation effect="slide" end="-228,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

+				<animation effect="slide" end="-240,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

+				<animation effect="slide" start="-15,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>

 				<control type="image">

 					<posx>0</posx>

 					<posy>0</posy>

@@ -190,13 +191,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -293,13 +288,6 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/MyVideoNav.xml b/skin/Confluence/720p/MyVideoNav.xml
index c76789c6b0..ab17f22a75 100644
--- a/skin/Confluence/720p/MyVideoNav.xml
+++ b/skin/Confluence/720p/MyVideoNav.xml
@@ -157,7 +157,8 @@
 			<animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus | Control.HasFocus(8999)">Conditional</animation>

 			<animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus">WindowClose</animation>

 			<control type="group">

-				<animation effect="slide" end="-228,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

+				<animation effect="slide" end="-240,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

+				<animation effect="slide" start="-15,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>

 				<control type="image">

 					<posx>0</posx>

 					<posy>0</posy>

@@ -303,13 +304,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -416,13 +411,6 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>240</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/MyVideoPlaylist.xml b/skin/Confluence/720p/MyVideoPlaylist.xml
index 24e2fbf853..51847573b6 100644
--- a/skin/Confluence/720p/MyVideoPlaylist.xml
+++ b/skin/Confluence/720p/MyVideoPlaylist.xml
@@ -87,13 +87,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -182,13 +176,6 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/MyWeather.xml b/skin/Confluence/720p/MyWeather.xml
index 54ea837742..6919a50418 100644
--- a/skin/Confluence/720p/MyWeather.xml
+++ b/skin/Confluence/720p/MyWeather.xml
@@ -674,7 +674,8 @@
 			<animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus | Control.HasFocus(8999)">Conditional</animation>

 			<animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus">WindowClose</animation>

 			<control type="group">

-				<animation effect="slide" end="-228,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

+				<animation effect="slide" end="-240,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

+				<animation effect="slide" start="-15,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>

 				<control type="image">

 					<posx>0</posx>

 					<posy>0</posy>

@@ -756,13 +757,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -886,13 +881,6 @@
 			<ondown>3</ondown>

 			<visible allowhiddenfocus="true">false</visible>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/Settings.xml b/skin/Confluence/720p/Settings.xml
index b5c9992575..58d9d135d8 100644
--- a/skin/Confluence/720p/Settings.xml
+++ b/skin/Confluence/720p/Settings.xml
@@ -207,20 +207,6 @@
 			</control>

 		</control>

 		<include>BehindDialogFadeOut</include>

-		<control type="image">

-			<posx>-820</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture>HomeBlade.png</texture>

-		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/SettingsCategory.xml b/skin/Confluence/720p/SettingsCategory.xml
index 7dd834c59c..ef26c9a22e 100644
--- a/skin/Confluence/720p/SettingsCategory.xml
+++ b/skin/Confluence/720p/SettingsCategory.xml
@@ -141,20 +141,6 @@
 			</control>

 		</control>

 		<include>BehindDialogFadeOut</include>

-		<control type="image">

-			<posx>-820</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture>HomeBlade.png</texture>

-		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 

 		<control type="button" id="10">

 			<description>Default Category Button</description>

diff --git a/skin/Confluence/720p/SettingsProfile.xml b/skin/Confluence/720p/SettingsProfile.xml
index 7fea9fccec..2cb7ac6a54 100644
--- a/skin/Confluence/720p/SettingsProfile.xml
+++ b/skin/Confluence/720p/SettingsProfile.xml
@@ -236,20 +236,6 @@
 			</control>

 		</control>

 		<include>BehindDialogFadeOut</include>

-		<control type="image">

-			<posx>-820</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture>HomeBlade.png</texture>

-		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/SettingsSystemInfo.xml b/skin/Confluence/720p/SettingsSystemInfo.xml
index 56148be520..42dd3a8089 100644
--- a/skin/Confluence/720p/SettingsSystemInfo.xml
+++ b/skin/Confluence/720p/SettingsSystemInfo.xml
@@ -317,20 +317,6 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>-820</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture>HomeBlade.png</texture>

-		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/custom_SkinSetting_1111.xml b/skin/Confluence/720p/custom_SkinSetting_1111.xml
index fb36f16dcd..0ca9845bcf 100644
--- a/skin/Confluence/720p/custom_SkinSetting_1111.xml
+++ b/skin/Confluence/720p/custom_SkinSetting_1111.xml
@@ -1706,20 +1706,6 @@
 			</control>

 		</control>

 		<include>BehindDialogFadeOut</include>

-		<control type="image">

-			<posx>-820</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture>HomeBlade.png</texture>

-		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>60</posx>

 			<posy>0</posy>

diff --git a/skin/Confluence/720p/includes.xml b/skin/Confluence/720p/includes.xml
index 04008c233e..ef2af5e212 100644
--- a/skin/Confluence/720p/includes.xml
+++ b/skin/Confluence/720p/includes.xml
@@ -245,6 +245,28 @@
 		<texturenofocus border="5">button-nofocus.png</texturenofocus>

 		<pulseonselect>false</pulseonselect>

 	</include>

+	<include name="SideBladeRight">

+		<control type="image">

+			<posx>26r</posx>

+			<posy>0</posy>

+			<width>846</width>

+			<height>720</height>

+			<texture flipx="true">HomeBlade.png</texture>

+			<animation effect="slide" start="26,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>

+			<animation effect="slide" start="0,0" end="26,0" time="200" delay="200" tween="quadratic" easing="out">WindowClose</animation>

+		</control>

+	</include>

+	<include name="SideBladeLeft">

+		<control type="image">

+			<posx>-820</posx>

+			<posy>0</posy>

+			<width>846</width>

+			<height>720</height>

+			<texture>HomeBlade.png</texture>

+			<animation effect="slide" start="-26,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>

+			<animation effect="slide" start="0,0" end="-26,0" time="200" delay="200" tween="quadratic" easing="out">WindowClose</animation>

+		</control>

+	</include>

 	<include name="CommonPageCount">

 		<control type="label">

 			<posx>40</posx>

@@ -855,7 +877,7 @@
 	</include>

 	<include name="Clock">

 		<control type="group">

-			<posx>160r</posx>

+			<posx>140r</posx>

 			<posy>0</posy>

 			<animation effect="slide" start="0,0" end="-60,0" delay="0" time="300" condition="Window.IsVisible(MuteBug)">conditional</animation>

 			<animation effect="slide" start="0,0" end="210,0" delay="0" time="300" condition="Window.Next(Home) | Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)">WindowClose</animation>

diff --git a/skin/Confluence/720p/script-Apple_Movie_Trailers-chooser.xml b/skin/Confluence/720p/script-Apple_Movie_Trailers-chooser.xml
index 446d279e25..fbfebc418a 100644
--- a/skin/Confluence/720p/script-Apple_Movie_Trailers-chooser.xml
+++ b/skin/Confluence/720p/script-Apple_Movie_Trailers-chooser.xml
@@ -224,13 +224,7 @@
 				</control>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

+		<include>SideBladeRight</include>

 		<include>Clock</include>

 

 		<!-- ** Required ** Do not change <description> -->

diff --git a/skin/Confluence/720p/script-Apple_Movie_Trailers-main.xml b/skin/Confluence/720p/script-Apple_Movie_Trailers-main.xml
index fc4e7357e6..74710c2961 100644
--- a/skin/Confluence/720p/script-Apple_Movie_Trailers-main.xml
+++ b/skin/Confluence/720p/script-Apple_Movie_Trailers-main.xml
@@ -630,7 +630,8 @@
 			<animation effect="slide" start="0,0" end="250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus | Control.HasFocus(8999)">Conditional</animation>

 			<animation effect="slide" start="0,0" end="-250,0" time="400" tween="quadratic" easing="out" condition="ControlGroup(9000).HasFocus | ControlGroup(9001).HasFocus">WindowClose</animation>

 			<control type="group">

-				<animation effect="slide" end="-228,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

+				<animation effect="slide" end="-240,0" time="300" tween="quadratic" easing="out">WindowClose</animation>

+				<animation effect="slide" start="-15,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>

 				<control type="image">

 					<posx>0</posx>

 					<posy>0</posy>

@@ -753,13 +754,7 @@
 				<texturefocus>-</texturefocus>

 				<visible>true</visible>

 			</control>

-			<control type="image">

-				<posx>-820</posx>

-				<posy>0</posy>

-				<width>846</width>

-				<height>720</height>

-				<texture>HomeBlade.png</texture>

-			</control>

+			<include>SideBladeLeft</include>

 			<control type="image">

 				<description>LOGO</description>

 				<posx>-230</posx>

@@ -853,13 +848,6 @@
 				<posy>130</posy>

 			</control>

 		</control>

-		<control type="image">

-			<posx>26r</posx>

-			<posy>0</posy>

-			<width>846</width>

-			<height>720</height>

-			<texture flipx="true">HomeBlade.png</texture>

-		</control>

 		<control type="group">

 			<posx>20</posx>

 			<posy>0</posy>