diff --git a/720p/ViewFanart.xml b/720p/ViewFanart.xml
index a727a70..7ca8fa4 100644
--- a/720p/ViewFanart.xml
+++ b/720p/ViewFanart.xml
@@ -3,6 +3,7 @@
 		<control type="group">
 			<posx>105</posx>
 			<posy>0</posy>
+			<include>WindowOpenCloseFade</include>
 			<visible>Control.IsVisible(52)</visible>
 			<control type="image">
 				<posx>0</posx>
@@ -12,9 +13,9 @@
 				<texture border="2">header-back.png</texture>
 			</control>
 			<control type="label">
-				<posx>30</posx>
+				<posx>180</posx>
 				<posy>52</posy>
-				<width>1115</width>
+				<width>815</width>
 				<height>30</height>
 				<label>[B]$INFO[ListItem.Title][/B]</label>
 				<font>font30</font>
@@ -22,9 +23,9 @@
 				<align>center</align>
 			</control>
 			<control type="label">
-				<posx>30</posx>
+				<posx>180</posx>
 				<posy>50</posy>
-				<width>1115</width>
+				<width>815</width>
 				<height>30</height>
 				<label>[B]$INFO[ListItem.Label][/B]</label>
 				<font>font30</font>
@@ -32,13 +33,19 @@
 				<align>center</align>
 				<visible>IsEmpty(ListItem.Title)</visible>
 			</control>
+			<control type="image">
+				<posx>1100</posx>
+				<posy>56</posy>
+				<width>30</width>
+				<height>30</height>
+				<texture>$INFO[ListItem.Overlay]</texture>
+			</control>
 			<control type="image">
 				<posx>0</posx>
 				<posy>650</posy>
 				<width>1175</width>
 				<height>140</height>
 				<texture>floor.png</texture>
-				<include>WindowOpenCloseFade</include>
 			</control>
 		</control>
 		<control type="group">
@@ -64,7 +71,7 @@
 				<ondown>60</ondown>
 				<onleft>1000</onleft>
 				<onright>52</onright>
-				<itemlayout width="235" height="360" condition="!Container.Content(Movies) + !Container.Content(TVShows) + !Container.Content(Seasons) + !Container.Content(Episodes) + !Container.Content(MusicVideos) + !Container.Content(Artists) + !Container.Content(Addons) + !Window.IsVisible(Pictures)">
+				<itemlayout width="235" height="360" condition="!Container.Content(Movies) + !Container.Content(TVShows) + !Container.Content(Seasons) + !Container.Content(Episodes) + !Container.Content(MusicVideos) + !Container.Content(Artists) + !Container.Content(Addons) + !Window.IsVisible(VideoPlaylist) + !Window.IsVisible(Pictures)">
 					<control type="image">
 						<posx>12</posx>
 						<posy>59</posy>
@@ -85,7 +92,7 @@
 						<aspectratio scalediffuse="false">stretch</aspectratio>
 					</control>
 				</itemlayout>
-				<focusedlayout width="235" height="360" condition="!Container.Content(Movies) + !Container.Content(TVShows) + !Container.Content(Seasons) + !Container.Content(Episodes) + !Container.Content(MusicVideos) + !Container.Content(Artists) + !Container.Content(Addons) + !Window.IsVisible(Pictures)">
+				<focusedlayout width="235" height="360" condition="!Container.Content(Movies) + !Container.Content(TVShows) + !Container.Content(Seasons) + !Container.Content(Episodes) + !Container.Content(MusicVideos) + !Container.Content(Artists) + !Container.Content(Addons) + !Window.IsVisible(VideoPlaylist) + !Window.IsVisible(Pictures)">
 					<control type="image">
 						<posx>12</posx>
 						<posy>59</posy>
@@ -141,8 +148,8 @@
 						<bordertexture border="21">poster-shadow.png</bordertexture>						
 						<bordersize>20</bordersize>
 						<aspectratio scalediffuse="false">stretch</aspectratio>
-						<animation effect="zoom" start="41,60,153,210" end="14,-14,207,290" time="250">Focus</animation>
-						<animation effect="zoom" start="14,-14,207,290" end="41,60,153,210" time="250">UnFocus</animation>
+						<animation effect="zoom" start="41,60,153,210" end="14,-12,207,290" time="250">Focus</animation>
+						<animation effect="zoom" start="14,-12,207,290" end="41,60,153,210" time="250">UnFocus</animation>
 					</control>
 					<control type="image">
 						<posx>41</posx>
@@ -152,11 +159,56 @@
 						<texture background="true" diffuse="poster-diffuse-reverse.png" flipy="true">$INFO[ListItem.Icon]</texture>
 						<bordersize>20</bordersize>
 						<aspectratio scalediffuse="false">stretch</aspectratio>
-						<animation effect="zoom" start="41,230,153,210" end="14,220,207,290" time="250">Focus</animation>
-						<animation effect="zoom" start="14,220,207,290" end="41,230,153,210" time="250">UnFocus</animation>
+						<animation effect="zoom" start="41,230,153,210" end="14,222,207,290" time="250">Focus</animation>
+						<animation effect="zoom" start="14,222,207,290" end="41,230,153,210" time="250">UnFocus</animation>
+					</control>
+				</focusedlayout>
+				<itemlayout width="235" height="360" condition="Container.Content(TVShows) + !Skin.HasSetting(PreferPosters)">
+					<control type="image">
+						<posx>-10</posx>
+						<posy>190</posy>
+						<width>255</width>
+						<height>80</height>
+						<texture background="true" diffuse="banner-diffuse.png">$INFO[ListItem.Icon]</texture>
+						<bordertexture border="21">banner-shadow.png</bordertexture>						
+						<bordersize>20</bordersize>
+						<aspectratio scalediffuse="false">scale</aspectratio>
+					</control>
+					<control type="image">
+						<posx>-10</posx>
+						<posy>230</posy>
+						<width>255</width>
+						<height>80</height>
+						<texture background="true" diffuse="banner-diffuse-reverse.png" flipy="true">$INFO[ListItem.Icon]</texture>
+						<bordersize>20</bordersize>
+						<aspectratio scalediffuse="false">scale</aspectratio>
+					</control>
+				</itemlayout>
+				<focusedlayout width="235" height="360" condition="Container.Content(TVShows) + !Skin.HasSetting(PreferPosters)">
+					<control type="image">
+						<posx>-10</posx>
+						<posy>190</posy>
+						<width>255</width>
+						<height>80</height>
+						<texture background="true" diffuse="banner-diffuse.png">$INFO[ListItem.Icon]</texture>
+						<bordertexture border="21">banner-shadow.png</bordertexture>						
+						<bordersize>20</bordersize>
+						<aspectratio scalediffuse="false">scale</aspectratio>
+						<animation effect="zoom" start="-10,190,255,80" end="-133,134,501,155" time="250">Focus</animation>
+						<animation effect="zoom" start="-133,134,501,155" end="-10,190,255,80" time="250">UnFocus</animation>
+					</control>
+					<control type="image">
+						<posx>-10</posx>
+						<posy>230</posy>
+						<width>255</width>
+						<height>80</height>
+						<texture background="true" diffuse="banner-diffuse-reverse.png" flipy="true">$INFO[ListItem.Icon]</texture>
+						<bordersize>20</bordersize>
+						<aspectratio scalediffuse="false">scale</aspectratio>
+						<animation effect="zoom" start="-10,230,255,80" end="-133,210,501,155" time="250">Focus</animation>
+						<animation effect="zoom" start="-133,210,501,155" end="-10,230,255,80" time="250">UnFocus</animation>
 					</control>
 				</focusedlayout>
-
 				<itemlayout width="235" height="360" condition="Container.Content(Episodes) | Container.Content(MusicVideos)">
 					<control type="image">
 						<posx>12</posx>
@@ -164,7 +216,7 @@
 						<width>211</width>
 						<height>136</height>
 						<texture background="true" diffuse="video-diffuse.png">$INFO[ListItem.Icon]</texture>
-						<bordertexture border="21">thumb-shadow.png</bordertexture>						
+						<bordertexture border="21">video-shadow.png</bordertexture>						
 						<bordersize>20</bordersize>
 						<aspectratio scalediffuse="false" aligny="bottom">scale</aspectratio>
 					</control>
@@ -172,7 +224,7 @@
 						<posx>12</posx>
 						<posy>230</posy>
 						<width>211</width>
-						<height>119</height>
+						<height>136</height>
 						<texture background="true" diffuse="video-diffuse-reverse.png" flipy="true">$INFO[ListItem.Icon]</texture>
 						<bordersize>20</bordersize>
 						<aspectratio scalediffuse="false" aligny="bottom">scale</aspectratio>
@@ -184,8 +236,8 @@
 						<posy>134</posy>
 						<width>211</width>
 						<height>136</height>
-						<texture background="true" diffuse="video-diffuse.png" fallback="DefaultAddon.png">$INFO[ListItem.Icon]</texture>
-						<bordertexture border="21">thumb-shadow.png</bordertexture>						
+						<texture background="true" diffuse="video-diffuse.png">$INFO[ListItem.Icon]</texture>
+						<bordertexture border="21">video-shadow.png</bordertexture>						
 						<bordersize>20</bordersize>
 						<aspectratio scalediffuse="false" aligny="bottom">scale</aspectratio>
 						<animation effect="zoom" start="12,134,211,136" end="-53,72,341,209" time="250">Focus</animation>
@@ -195,14 +247,60 @@
 						<posx>12</posx>
 						<posy>230</posy>
 						<width>211</width>
-						<height>119</height>
-						<texture background="true" diffuse="video-diffuse-reverse.png" fallback="DefaultAddon.png" flipy="true">$INFO[ListItem.Icon]</texture>
+						<height>136</height>
+						<texture background="true" diffuse="video-diffuse-reverse.png" flipy="true">$INFO[ListItem.Icon]</texture>
 						<bordersize>20</bordersize>
 						<aspectratio scalediffuse="false" aligny="bottom">scale</aspectratio>
 						<animation effect="zoom" start="12,230,211,136" end="-53,219,341,209" time="250">Focus</animation>
 						<animation effect="zoom" start="-53,219,341,209" end="12,230,211,136" time="250">UnFocus</animation>
 					</control>
 				</focusedlayout>
+				<itemlayout width="235" height="360" condition="Window.IsVisible(VideoPlaylist)">
+					<control type="image">
+						<posx>41</posx>
+						<posy>60</posy>
+						<width>153</width>
+						<height>210</height>
+						<texture background="true" diffuse="thumb-diffuse.png">$INFO[ListItem.Icon]</texture>
+						<bordertexture border="21">thumb-shadow.png</bordertexture>						
+						<bordersize>20</bordersize>
+						<aspectratio scalediffuse="true" aligny="bottom">keep</aspectratio>
+					</control>
+					<control type="image">
+						<posx>41</posx>
+						<posy>230</posy>
+						<width>153</width>
+						<height>210</height>
+						<texture background="true" diffuse="thumb-diffuse-reverse.png" flipy="true">$INFO[ListItem.Icon]</texture>
+						<bordersize>20</bordersize>
+						<aspectratio scalediffuse="true" aligny="top">keep</aspectratio>
+					</control>
+				</itemlayout>
+				<focusedlayout width="235" height="360" condition="Window.IsVisible(VideoPlaylist)">
+					<control type="image">
+						<posx>41</posx>
+						<posy>60</posy>
+						<width>153</width>
+						<height>210</height>
+						<texture background="true" diffuse="thumb-diffuse.png">$INFO[ListItem.Icon]</texture>
+						<bordertexture border="21">thumb-shadow.png</bordertexture>						
+						<bordersize>20</bordersize>
+						<aspectratio scalediffuse="true" aligny="bottom">keep</aspectratio>
+						<animation effect="zoom" start="41,60,153,210" end="14,-12,207,290" time="250">Focus</animation>
+						<animation effect="zoom" start="14,-12,207,290" end="41,60,153,210" time="250">UnFocus</animation>
+					</control>
+					<control type="image">
+						<posx>41</posx>
+						<posy>230</posy>
+						<width>153</width>
+						<height>210</height>
+						<texture background="true" diffuse="thumb-diffuse-reverse.png" flipy="true">$INFO[ListItem.Icon]</texture>
+						<bordersize>20</bordersize>
+						<aspectratio scalediffuse="true" aligny="top">keep</aspectratio>
+						<animation effect="zoom" start="41,230,153,210" end="14,222,207,290" time="250">Focus</animation>
+						<animation effect="zoom" start="14,222,207,290" end="41,230,153,210" time="250">UnFocus</animation>
+					</control>
+				</focusedlayout>
 				<itemlayout width="235" height="360" condition="Container.Content(Artists)">
 					<control type="image">
 						<posx>12</posx>
diff --git a/media/banner-diffuse-reverse.png b/media/banner-diffuse-reverse.png
new file mode 100644
index 0000000..68f6d6c
Binary files /dev/null and b/media/banner-diffuse-reverse.png differ
diff --git a/media/banner-shadow.png b/media/banner-shadow.png
new file mode 100644
index 0000000..8eb93c2
Binary files /dev/null and b/media/banner-shadow.png differ