--- a/skin.aeon.nox/720p/Includes_Viewtypes.xml
+++ b/skin.aeon.nox/720p/Includes_Viewtypes.xml
@@ -1,7 +1,7 @@
 <includes>
   <include name="InfoPane_Fanart_Movies">
     <control type="group">
-      <visible>Container.Content(movies)+!ListItem.IsFolder+[[Skin.HasSetting(fanartinfopane)+Control.IsVisible(501)]|[Skin.HasSetting(fanartinfopane503)+Control.IsVisible(503)]|[Skin.HasSetting(fanartinfopane504)+Control.IsVisible(504)]|[Control.IsVisible(510)+Skin.HasSetting(posterslide)]]</visible>
+      <visible>[Container.Content(movies)+!ListItem.IsFolder+[[Skin.HasSetting(fanartinfopane)+Control.IsVisible(501)]|[Skin.HasSetting(fanartinfopane503)+Control.IsVisible(503)]|[Skin.HasSetting(fanartinfopane504)+Control.IsVisible(504)]|[Control.IsVisible(510)+Skin.HasSetting(posterslide)]]]|[[Container.Content(seasons)|Container.Content(episodes)]+IsEmpty(ListItem.TVShowTitle)]</visible>
       <posx>105</posx>
       <posy>42</posy>
       <control type="group">
@@ -200,7 +200,7 @@
       <animation effect="fade" start="0" end="100" time="400">Visible</animation>
     </control>
     <control type="group">
-      <visible>Container.Content(episodes)</visible>
+      <visible>Container.Content(episodes)+!IsEmpty(ListItem.TVShowTitle)</visible>
       <posx>105</posx>
       <posy>42</posy>
       <control type="label">
@@ -1471,7 +1471,7 @@
     <control type="group">
       <visible>[!ControlGroup(9000).HasFocus|Skin.HasSetting(breadcrumb)]</visible>
       <control type="group">
-        <visible>Container.Content(movies)+!Skin.HasSetting(wallgenre)+!ListItem.IsFolder</visible>
+        <visible>[Container.Content(movies)+!Skin.HasSetting(wallgenre)+!ListItem.IsFolder]|[Container.Content(seasons)+IsEmpty(ListItem.TVShowTitle)]</visible>
         <control type="label">
           <posx>340</posx>
           <posy>670</posy>
@@ -1479,7 +1479,7 @@
           <align>center</align>
           <aligny>center</aligny>
           <include>Animation_CommonFade</include>
-          <font>Font_Info</font>
+          <font>Font_Info_Caps</font>
           <textcolor>floor</textcolor>
           <shadowcolor>floorshadow</shadowcolor>
           <label>[UPPERCASE]$INFO[ListItem.Year]$INFO[ListItem.Duration, ��� , $LOCALIZE[12391]]$INFO[ListItem.RatingAndVotes, ��� ][/UPPERCASE]</label>
@@ -1492,7 +1492,7 @@
         <align>center</align>
         <aligny>center</aligny>
         <include>Animation_CommonFade</include>
-        <font>Font_Info</font>
+        <font>Font_Info_Caps</font>
         <textcolor>floor</textcolor>
         <shadowcolor>floorshadow</shadowcolor>
         <label>[UPPERCASE]$INFO[ListItem.Label2]$INFO[ListItem.Property(UnWatchedEpisodes), ($LOCALIZE[16101]: ,)][/UPPERCASE]</label>
@@ -1505,11 +1505,11 @@
         <align>center</align>
         <aligny>center</aligny>
         <include>Animation_CommonFade</include>
-        <font>Font_Info</font>
+        <font>Font_Info_Caps</font>
         <textcolor>floor</textcolor>
         <shadowcolor>floorshadow</shadowcolor>
         <label>[UPPERCASE]$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[20360]]$INFO[ListItem.Property(UnWatchedEpisodes), ($LOCALIZE[16101]: ,)][/UPPERCASE]</label>
-        <visible>!Skin.HasSetting(wallgenretv)+Container.Content(seasons)</visible>
+        <visible>!Skin.HasSetting(wallgenretv)+Container.Content(seasons)+!IsEmpty(ListItem.TVShowTitle)</visible>
       </control>
       <control type="label">
         <posx>340</posx>
@@ -1518,11 +1518,11 @@
         <align>center</align>
         <aligny>center</aligny>
         <include>Animation_CommonFade</include>
-        <font>Font_Info</font>
+        <font>Font_Info_Caps</font>
         <textcolor>floor</textcolor>
         <shadowcolor>floorshadow</shadowcolor>
         <label>[UPPERCASE]$INFO[ListItem.Genre][/UPPERCASE]</label>
-        <visible>[Skin.HasSetting(wallgenre)+Container.Content(movies)]|[Skin.HasSetting(wallgenretv)+[Container.Content(tvshows)|Container.Content(seasons)]]</visible>
+        <visible>[Skin.HasSetting(wallgenre)+Container.Content(movies)]|[Skin.HasSetting(wallgenretv)+[Container.Content(tvshows)|Container.Content(seasons)]+!IsEmpty(ListItem.TVShowTitle)]</visible>
       </control>
       <control type="label">
         <posx>340</posx>
@@ -1531,7 +1531,7 @@
         <align>center</align>
         <aligny>center</aligny>
         <include>Animation_CommonFade</include>
-        <font>Font_Info</font>
+        <font>Font_Info_Caps</font>
         <textcolor>floor</textcolor>
         <shadowcolor>floorshadow</shadowcolor>
         <label>[UPPERCASE]$INFO[ListItem.Label2][/UPPERCASE]</label>
@@ -1544,7 +1544,7 @@
         <align>center</align>
         <aligny>center</aligny>
         <include>Animation_CommonFade</include>
-        <font>Font_Info</font>
+        <font>Font_Info_Caps</font>
         <textcolor>floor</textcolor>
         <shadowcolor>floorshadow</shadowcolor>
         <label>[UPPERCASE]$INFO[ListItem.Genre][/UPPERCASE]</label>
@@ -1560,8 +1560,9 @@
       <align>center</align>
       <aligny>center</aligny>
       <include>Animation_CommonFade</include>
-      <font>Font_ShowcaseMainLabel2</font>
+      <font>Font_ShowcaseMainLabel2_Caps</font>
       <scroll>true</scroll>
+      <scrollspeed>50</scrollspeed>
       <textcolor>floor</textcolor>
       <shadowcolor>floorshadow</shadowcolor>
       <label>[UPPERCASE]$INFO[ListItem.Label][/UPPERCASE]</label>
@@ -1574,7 +1575,7 @@
       <align>center</align>
       <aligny>center</aligny>
       <include>Animation_CommonFade</include>
-      <font>Font_ShowcaseMainLabel2</font>
+      <font>Font_ShowcaseMainLabel2_Caps</font>
       <textcolor>floor</textcolor>
       <shadowcolor>floorshadow</shadowcolor>
       <label>[UPPERCASE]$INFO[Container.NumItems] $LOCALIZE[31025] | $LOCALIZE[31024] $INFO[Container.CurrentPage]/$INFO[Container.NumPages][/UPPERCASE]</label>
@@ -2244,7 +2245,20 @@
           <scrollspeed>50</scrollspeed>
           <scroll>true</scroll>
           <label fallback="312577">$INFO[ListItem.Property(TotalEpisodes),[COLOR abFFFFFF]$LOCALIZE[20360]: [/COLOR]]</label>
-          <visible>Skin.HasSetting(wallgenretv)+Container.Content(seasons)</visible>
+          <visible>Skin.HasSetting(wallgenretv)+Container.Content(seasons)+!IsEmpty(ListItem.TVShowTitle)</visible>
+        </control>
+        <control type="label">
+          <posx>0</posx>
+          <posy>0</posy>
+          <height>38</height>
+          <width>180</width>
+          <aligny>center</aligny>
+          <font>Font_Info</font>
+          <textcolor>white</textcolor>
+          <scrollspeed>50</scrollspeed>
+          <scroll>true</scroll>
+          <label fallback="312577">$INFO[ListItem.Duration,[COLOR abFFFFFF]$LOCALIZE[2050]: [/COLOR], $LOCALIZE[12391]]</label>
+          <visible>Skin.HasSetting(wallgenretv)+Container.Content(seasons)+IsEmpty(ListItem.TVShowTitle)</visible>
         </control>
         <control type="label">
           <posx>0</posx>
@@ -2296,7 +2310,20 @@
           <scrollspeed>50</scrollspeed>
           <scroll>true</scroll>
           <label fallback="312577">$INFO[ListItem.Property(WatchedEpisodes),[COLOR abFFFFFF]$LOCALIZE[16102]: [/COLOR]]</label>
-          <visible>Container.Content(seasons)</visible>
+          <visible>Container.Content(seasons)+!IsEmpty(ListItem.TVShowTitle)</visible>
+        </control>
+        <control type="label">
+          <posx>200</posx>
+          <posy>0</posy>
+          <height>38</height>
+          <width>180</width>
+          <aligny>center</aligny>
+          <font>Font_Info</font>
+          <textcolor>white</textcolor>
+          <scrollspeed>50</scrollspeed>
+          <scroll>true</scroll>
+          <label fallback="312577">$INFO[ListItem.Rating,[COLOR abFFFFFF]$LOCALIZE[368]: [/COLOR]]</label>
+          <visible>Container.Content(seasons)+IsEmpty(ListItem.TVShowTitle)</visible>
         </control>
         <control type="label">
           <posx>400</posx>
@@ -2309,7 +2336,20 @@
           <scrollspeed>50</scrollspeed>
           <scroll>true</scroll>
           <label fallback="312577">$INFO[ListItem.Property(UnWatchedEpisodes),[COLOR abFFFFFF]$LOCALIZE[16101]: [/COLOR]]</label>
-          <visible>Container.Content(seasons)</visible>
+          <visible>Container.Content(seasons)+!IsEmpty(ListItem.TVShowTitle)</visible>
+        </control>
+        <control type="label">
+          <posx>400</posx>
+          <posy>0</posy>
+          <height>38</height>
+          <width>180</width>
+          <aligny>center</aligny>
+          <font>Font_Info</font>
+          <textcolor>white</textcolor>
+          <scrollspeed>50</scrollspeed>
+          <scroll>true</scroll>
+          <label fallback="312577">$INFO[ListItem.Year,[COLOR abFFFFFF]$LOCALIZE[345]: [/COLOR]]</label>
+          <visible>Container.Content(seasons)+IsEmpty(ListItem.TVShowTitle)</visible>
         </control>
         <control type="group">
           <description>Next Aired</description>