diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 761499b..8c28ec8 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -144,7 +144,7 @@
                             <height>2-row</height>
                             <aspectratio scalediffuse="false">scale</aspectratio>
                             <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
-                            <include>spinFocus</include>
+                            <include>spinFocusIcon</include>
                         </control>
                         <control type="label">
                             <posx>1-col-indent</posx>
diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index cfc7419..9f0551c 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -150,7 +150,7 @@
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
                             <colordiffuse>500</colordiffuse>
-                            <include>spinFocus</include>
+                            <include>spinFocusIcon</include>
                         </control>
                         <control type="image">
                             <posx>1-col</posx>
diff --git a/1080i/DialogPVRGroupManager.xml b/1080i/DialogPVRGroupManager.xml
index 028e3c9..463d103 100644
--- a/1080i/DialogPVRGroupManager.xml
+++ b/1080i/DialogPVRGroupManager.xml
@@ -86,7 +86,7 @@
                     <posy>0</posy>
                     <width>6-col</width>
                     <font>itemSubTitle</font>
-                    <textcolor>accented</textcolor>
+                    <textcolor>textAccented</textcolor>
                 </control>
                 <control type="panel" id="12">
                     <posx>0</posx>
@@ -152,7 +152,7 @@
                     <posy>0</posy>
                     <width>6-col</width>
                     <font>itemSubTitle</font>
-                    <textcolor>accented</textcolor>
+                    <textcolor>textAccented</textcolor>
                 </control>
                 <control type="panel" id="11">
                     <posx>0</posx>
diff --git a/1080i/DialogSongInfo.xml b/1080i/DialogSongInfo.xml
index 69e2da5..1aeb876 100644
--- a/1080i/DialogSongInfo.xml
+++ b/1080i/DialogSongInfo.xml
@@ -34,7 +34,7 @@
                 <posy>1-row</posy>
                 <width>6-col</width>
                 <font>itemTitle</font>
-                <label>[COLOR accented]$INFO[ListItem.artist,, ][/COLOR]$INFO[ListItem.Album]</label>
+                <label>[COLOR textAccented]$INFO[ListItem.artist,, ][/COLOR]$INFO[ListItem.Album]</label>
                 <textcolor>textActive</textcolor>
                 
                 
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index 1caafcc..0174c3a 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -58,7 +58,7 @@
                 <width>12-col</width>
                 <height>2-row</height>
                 <font>itemTitle</font>
-                <textcolor>accented</textcolor>
+                <textcolor>textAccented</textcolor>
                 <wrapmultiline>true</wrapmultiline>
             </control>
             <!-- ** Required ** Do not change <id>or<type>-->
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index bfc4161..98bc4e7 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -136,7 +136,7 @@
                         <posy>0</posy>
                         <width>4-col-gutter</width>
                         <font>itemSubTitle</font>
-                        <textcolor>accented</textcolor>
+                        <textcolor>textAccented</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
@@ -221,7 +221,7 @@
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                         <colordiffuse>500</colordiffuse>
-                        <include>spinFocus</include>
+                        <include>spinFocusIcon</include>
                     </control>
                     <control type="image">
                         <posx>1-col</posx>
diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml
index 09f7eab..f111270 100644
--- a/1080i/FileManager.xml
+++ b/1080i/FileManager.xml
@@ -81,7 +81,7 @@
                         <info>ListItem.Label2</info>
                         <font>itemTitle</font>
                         <shadowcolor>-</shadowcolor>
-                        <textcolor>accented</textcolor>
+                        <textcolor>textAccented</textcolor>
                     </control>
                 </itemlayout>
                 <focusedlayout height="1-row" width="12-col-gutter">
@@ -162,7 +162,7 @@
                         <info>ListItem.Label2</info>
                         <font>itemTitle</font>
                         <shadowcolor>-</shadowcolor>
-                        <textcolor>accented</textcolor>
+                        <textcolor>textAccented</textcolor>
                     </control>
                 </itemlayout>
                 <focusedlayout height="1-row" width="12-col-gutter">
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 9c60664..0f2f28a 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -206,18 +206,16 @@
                 <width>8-col</width>
                 <height>4-row</height>
                 <align>right</align>
-                <aligny>center</aligny>
                 <font>Large</font>
                 <textcolor>selected</textcolor>
                 <label>$INFO[System.Date(DDD)] [COLOR 500][B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)][/COLOR]</label>
             </control>
             <control type="label">
                 <posx>8-col</posx>
-                <posy>5-row</posy>
-                <width>8-col</width>
+                <posy>182</posy>
+                <width>12-col</width>
                 <height>3-row</height>
                 <align>right</align>
-                <aligny>center</aligny>
                 <font>regular</font>
                 <textcolor>selected</textcolor>
                 <label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [LOWERCASE]$INFO[weather.conditions][/LOWERCASE]</label>
diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml
index 8c437c1..5d9c99b 100644
--- a/1080i/Includes_animations.xml
+++ b/1080i/Includes_animations.xml
@@ -8,6 +8,11 @@
             <effect type="fade" start="100" end="0" time="300"/>
         </animation>
     </include>
+    <include name="fadeIn">
+        <animation type="focus">
+            <effect type="fade" start="0" end="100" time="500"/>
+        </animation>
+    </include>
     <include name="listSlideIn">
         <effect type="fade" start="0" end="100" time="300" delay="600"/>
         <effect type="slide" start="3-col" end="0" center="auto" tween="cubic" easing="out" time="400" delay="500"/>
@@ -21,11 +26,20 @@
         </animation>
     </include>
     <!--focus item spinner-->
-    <include name="spinFocus">
+    <include name="spinFocusIcon">
         <animation type="focus" loop="false" reversible="false">
+            <effect type="fade" time="500"/>
             <effect type="rotatey" end="180" center="36" tween="back" easing="out" time="1000"/>
         </animation>
     </include>
+    <include name="spinFocusPoster">
+        <animation type="focus" loop="false" reversible="false">
+            <effect type="fade" time="600"/>
+            <effect type="rotatey" start="0" end="-15" center="132" tween="back" easing="out" time="300"/>
+            <effect type="rotatey" start="0" end="15" center="132" tween="back" easing="out" delay="300" time="300"/>
+        </animation>
+    </include>
+
     <!--modal dialog handling-->
     <include name="modalDialogInOut">
         <animation type="Windowopen">
diff --git a/1080i/Includes_recentItems.xml b/1080i/Includes_recentItems.xml
index e5e1a43..d5ab10c 100644
--- a/1080i/Includes_recentItems.xml
+++ b/1080i/Includes_recentItems.xml
@@ -2,10 +2,20 @@
 <includes>
     <!--movies-->
     <include name="movieRecentItems">
+        <control type="label">
+            <posx>col-1-begin</posx>
+            <posy>5-row</posy>
+            <width>24-col</width>
+            <height>4-row</height>
+            <align></align>
+            <font>veryLarge</font>
+            <textcolor>textActive</textcolor>
+            <label>Recent Movies</label>
+        </control>
         <control type="panel" id="9998">
             <visible>!stringcompare(Window(Home).Property(Movies.UnWatched),0)</visible>
             <posx>col-1-begin</posx>
-            <posy>row-5-begin</posy>
+            <posy>row-9-begin</posy>
             <width>24-col</width>
             <height>11-row</height>
             <onleft>9000</onleft>
@@ -44,49 +54,50 @@
                     <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                     <bordersize>3</bordersize>
                     <colordiffuse>ffFFFFFF</colordiffuse>
+                    <include>spinFocusPoster</include>
                 </control>
                 <control type="group">
+                    <include>fadeIn</include>
                     <posx>0</posx>
                     <posy>0</posy>
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
+                        <width>1-col</width>
                         <height>396</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <bordertexture border="3" colordiffuse="99111111">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>44FFFFFF</colordiffuse>
+                        <texture border="0">colors/white.png</texture>
                     </control>
                     <control type="label">
-                        <posx>24</posx>
-                        <posy>4-row</posy>
-                        <width>3-col</width>
-                        <align>center</align>
+                        <posx>34</posx>
+                        <posy>10-row</posy>
+                        <width>9-row</width>
+                        <align>left</align>
+                        <angle>90</angle>
                         <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
+                        <textcolor>black</textcolor>
                         <label>$INFO[ListItem.title]</label>
                     </control>
-                    <control type="label">
-                        <posx>24</posx>
-                        <posy>5-row</posy>
-                        <width>3-col</width>
-                        <align>center</align>
-                        <font>itemSubTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[listitem.year]</label>
-                    </control>
                 </control>
             </focusedlayout>
         </control>
     </include>
     <!--tvshows-->
     <include name="tvRecentItems">
+        <control type="label">
+            <posx>col-1-begin</posx>
+            <posy>23-row</posy>
+            <width>24-col</width>
+            <height>4-row</height>
+            <align></align>
+            <font>veryLarge</font>
+            <textcolor>textActive</textcolor>
+            <label>Recent Tvshows</label>
+        </control>
         <control type="panel" id="9997">
             <visible>!stringcompare(Window(Home).Property(Episodes.UnWatched),0)</visible>
             <posx>col-1-begin</posx>
-            <posy>row-17-begin</posy>
+            <posy>row-27-begin</posy>
             <width>24-col</width>
             <onleft>9000</onleft>
             <ondown>control.setfocus(9998,$INFO[Container(9997).Position])</ondown>
@@ -124,49 +135,29 @@
                     <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                     <bordersize>3</bordersize>
                     <colordiffuse>ffffffff</colordiffuse>
+                    <include>spinFocusPoster</include>
                 </control>
                 <control type="group">
+                    <include>fadeIn</include>
                     <posx>0</posx>
                     <posy>0</posy>
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
+                        <width>1-col</width>
                         <height>396</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <bordertexture border="3" colordiffuse="99111111">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>44FFFFFF</colordiffuse>
+                        <texture border="0">colors/white.png</texture>
                     </control>
                     <control type="label">
-                        <posx>24</posx>
-                        <posy>4-row</posy>
-                        <width>3-col</width>
-                        <align>center</align>
+                        <posx>34</posx>
+                        <posy>10-row</posy>
+                        <width>9-row</width>
+                        <align>left</align>
+                        <angle>90</angle>
                         <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.TVshowTitle]</label>
-                    </control>
-                    <control type="label">
-                        <visible>!SubString(skin.string(videoHomeItemsEpisodesSource),randomepisodes)</visible>
-                        <posx>24</posx>
-                        <posy>5-row</posy>
-                        <width>3-col</width>
-                        <align>center</align>
-                        <font>itemSubTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[listitem.property(episodecount),, $LOCALIZE[16101]]</label>
-                    </control>
-                    <control type="label">
-                        <visible>SubString(skin.string(videoHomeItemsEpisodesSource),randomepisodes)</visible>
-                        <posx>24</posx>
-                        <posy>5-row</posy>
-                        <width>3-col</width>
-                        <align>center</align>
-                        <font>itemSubTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.season,$LOCALIZE[31011] ,]</label>
+                        <textcolor>black</textcolor>
+                        <label>$INFO[ListItem.TVshowTitle] $INFO[ListItem.season,$LOCALIZE[31011] ,]</label>
                     </control>
                 </control>
             </focusedlayout>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index ff7735b..d534a1b 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -33,11 +33,11 @@
         <value condition="Window.IsActive(musicfiles) + SubString(container.foldername,playlists)">$LOCALIZE[20011]</value>
         <value condition="Window.IsActive(musicfiles) + !Substring(Container.folderpath,plugin)">$LOCALIZE[31077]</value>
         <value condition="Substring(Container.folderpath,plugin)">$INFO[container.foldername]</value>
-        <value condition="Container.Content(movies)">$LOCALIZE[20342] [COLOR accented]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
-        <value condition="Container.Content(seasons) | Container.Content(tvshows) | Container.Content(episodes)">$LOCALIZE[20343] [COLOR accented]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
+        <value condition="Container.Content(movies)">$LOCALIZE[20342] [COLOR textAccented]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
+        <value condition="Container.Content(seasons) | Container.Content(tvshows) | Container.Content(episodes)">$LOCALIZE[20343] [COLOR textAccented]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
         <value condition="Container.Content(addons)">$LOCALIZE[31010]</value>
-        <value condition="Container.Content(albums)">$LOCALIZE[31037] [COLOR accented]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
-        <value condition="Container.Content(songs)">$INFO[listitem.album] [COLOR accented]$INFO[listitem.artist][/COLOR]</value>
+        <value condition="Container.Content(albums)">$LOCALIZE[31037] [COLOR textAccented]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
+        <value condition="Container.Content(songs)">$INFO[listitem.album] [COLOR textAccented]$INFO[listitem.artist][/COLOR]</value>
         <value condition="!isEmpty(container.foldername)">$INFO[container.foldername]</value>
         <value>$LOCALIZE[14022]</value>
     </variable>
diff --git a/1080i/LoginScreen.xml b/1080i/LoginScreen.xml
index fc42fb5..6e62ace 100644
--- a/1080i/LoginScreen.xml
+++ b/1080i/LoginScreen.xml
@@ -32,7 +32,7 @@
                         <height>1-row</height>
                         <font>itemTitle</font>
                         <align>center</align>
-                        <textcolor>accented</textcolor>
+                        <textcolor>textAccented</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
diff --git a/1080i/MyMusicPlaylist.xml b/1080i/MyMusicPlaylist.xml
index 74e70d6..6775e13 100644
--- a/1080i/MyMusicPlaylist.xml
+++ b/1080i/MyMusicPlaylist.xml
@@ -47,7 +47,7 @@
                             <width>auto</width>
                             <font>pageTitle</font>
                             <label> ($LOCALIZE[31133])</label>
-                            <textcolor>accented</textcolor>
+                            <textcolor>textAccented</textcolor>
                         </control>
                     </control>
                     <!--source subtitle-->
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index 362788c..acf5395 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -46,7 +46,7 @@
                     <posy>0</posy>
                     <width>14-col</width>
                     <font>pageTitle</font>
-                    <label>$LOCALIZE[31006] [COLOR accented]$LOCALIZE[31078][/COLOR]</label>
+                    <label>$LOCALIZE[31006] [COLOR textAccented]$LOCALIZE[31078][/COLOR]</label>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="label">
@@ -55,7 +55,7 @@
                     <posy>0</posy>
                     <width>14-col</width>
                     <font>pageTitle</font>
-                    <label>$LOCALIZE[31164] [COLOR accented]$LOCALIZE[31078][/COLOR]</label>
+                    <label>$LOCALIZE[31164] [COLOR textAccented]$LOCALIZE[31078][/COLOR]</label>
                     <textcolor>textActive</textcolor>
                 </control>
                 <control type="label">
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 66e2700..c3e6cd2 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -36,7 +36,7 @@
                         <posy>0</posy>
                         <width>14-col</width>
                         <font>pageTitle</font>
-                        <label>$LOCALIZE[31006] [COLOR accented]$LOCALIZE[31080][/COLOR]</label>
+                        <label>$LOCALIZE[31006] [COLOR textAccented]$LOCALIZE[31080][/COLOR]</label>
                         <textcolor>textActive</textcolor>
                     </control>
                     <control type="label">
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index ded7a2d..7e0bc37 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -35,7 +35,7 @@
                         <posy>0</posy>
                         <width>14-col</width>
                         <font>pageTitle</font>
-                        <label>$LOCALIZE[31006] [COLOR accented]$LOCALIZE[31165][/COLOR]</label>
+                        <label>$LOCALIZE[31006] [COLOR textAccented]$LOCALIZE[31165][/COLOR]</label>
                         <textcolor>textActive</textcolor>
                     </control>
                     <control type="label">
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 02ebc19..30cda17 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -36,6 +36,7 @@
                     <include>seasons</include>
                     <include>episodes</include>
                     <include>addons</include>
+                    <include>files</include>
                 </control>
             </control>
 
diff --git a/1080i/ProfileSettings.xml b/1080i/ProfileSettings.xml
index 4e59ccc..e13a128 100644
--- a/1080i/ProfileSettings.xml
+++ b/1080i/ProfileSettings.xml
@@ -42,7 +42,7 @@
                 <width>12-col</width>
                 <align>center</align>
                 <font>itemSubTitle</font>
-                <textcolor>accented</textcolor>
+                <textcolor>textAccented</textcolor>
             </control>
             <control type="button" id="6000">
                 <description>Profile switch</description>
diff --git a/1080i/Settings.xml b/1080i/Settings.xml
index 8a42188..7e66385 100644
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@@ -99,7 +99,7 @@
                         <aspectratio scalediffuse="false">scale</aspectratio>
                         <texture border="0">colors/white.png</texture>
                         <colordiffuse>textActive</colordiffuse>
-                        <include>spinFocus</include>
+                        <include>spinFocusIcon</include>
                     </control>
                     <control type="label">
                         <posx>0</posx>
diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml
index 5f7a0a4..b9af051 100644
--- a/1080i/SettingsProfile.xml
+++ b/1080i/SettingsProfile.xml
@@ -50,7 +50,7 @@
                 <align>left</align>
                 <font>itemTitle</font>
                 <label>$LOCALIZE[31107]: $INFO[System.ProfileName]</label>
-                <textcolor>accented</textcolor>
+                <textcolor>textAccented</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
             <!--dialog controls-->
diff --git a/1080i/View_Addons.xml b/1080i/View_Addons.xml
index a7cb75a..59d30d9 100644
--- a/1080i/View_Addons.xml
+++ b/1080i/View_Addons.xml
@@ -6,7 +6,7 @@
             <visible>container.content(addons)</visible>
 
             <control type="panel" id="59">
-                <visible>!container.content(movies) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin)</visible>
+                <visible>!StringCompare(container.foldername,files) + !container.content(movies) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin)</visible>
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
                 <width>24-col</width>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index dae8de8..447222b 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -1,20 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
     <include name="episodes">
+
+        <!--fanart-->
+        <control type="group">
+            <visible>container.content(episodes)</visible>
+            <posy>-692</posy>
+            <control type="image">
+                <include>dimensionsFullscreen</include>
+                <aspectratio scalediffuse="false">stretch</aspectratio>
+                <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
+                <bordertexture border="0" colordiffuse="500">colors/white.png</bordertexture>
+                <bordersize>0,0,0,6</bordersize>
+                <colordiffuse>ffffffff</colordiffuse>
+            </control>
+        </control>
+
+        <!--title-->
+        <control type="group">
+            <posx>col-1-begin</posx>
+            <posy>row-1-begin</posy>
+            <visible>container.content(episodes)</visible>
+            <control type="image">
+                <posx>-96</posx>
+                <posy>5-row</posy>
+                <width>fullscreenWidth</width>
+                <height>148</height>
+                <aspectratio scalediffuse="false">stretch</aspectratio>
+                <texture border="0">colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+            </control>
+            <control type="label">
+                <posx>0</posx>
+                <posy>5-row</posy>
+                <width>24-col</width>
+                <height>4-row</height>
+                <align></align>
+                <font>veryLarge</font>
+                <textcolor>ccf1f1f1</textcolor>
+                <label>$INFO[ListItem.TVShowTitle] $INFO[container.foldername]</label>
+            </control>
+        </control>
+
         <!--episode synopsis & thumb-->
         <control type="group">
             <visible>[container.content(episodes) | Substring(Container.folderpath,plugin)]</visible>
-
             <control type="image">
                 <visible>!Substring(Container.folderpath,plugin)</visible>
                 <posx>col-1-begin</posx>
-                <posy>row-5-begin</posy>
+                <posy>row-12-begin</posy>
                 <width>12-col-gutter</width>
                 <height>473</height>
                 <aspectratio aligny="top" scalediffuse="false">scale</aspectratio>
                 <texture border="0">$INFO[listitem.thumb]</texture>
-                <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
+                <bordertexture border="3" colordiffuse="500">colors/white.png</bordertexture>
+                <bordersize>6</bordersize>
                 <fadetime>200</fadetime>
             </control>
             <control type="image">
@@ -34,7 +74,7 @@
             <control type="panel" id="52">
                 <visible>container.content(episodes) + !Substring(Container.folderpath,plugin)</visible>
                 <posx>col-13-begin</posx>
-                <posy>row-5-begin</posy>
+                <posy>row-12-begin</posy>
                 <width>12-col</width>
                 <height>12-row</height>
                 <onleft>9000</onleft>
@@ -86,22 +126,14 @@
                         <label>$INFO[ListItem.Title]</label>
                         <scroll>false</scroll>
                     </control>
-                    <control type="label">
-                        <visible>!isempty(ListItem.duration)</visible>
-                        <posx>8-col</posx>
-                        <posy>0</posy>
-                        <width>3-col</width>
-                        <font>smallStrong</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.duration] mins</label>
-                        <scroll>false</scroll>
-                    </control>
                     <control type="label">
                         <visible>!isempty(ListItem.playcount)</visible>
-                        <posx>36r</posx>
-                        <posy>1</posy>
-                        <width>40</width>
+                        <posx>11-col</posx>
+                        <posy>0</posy>
+                        <width>1-col</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
                         <font>symbol</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -118,6 +150,7 @@
                         <texture>colors/white.png</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>500</colordiffuse>
+                        <include>spinFocusIcon</include>
                     </control>
                     <control type="label">
                         <posx>0</posx>
@@ -154,22 +187,14 @@
                         <label>$INFO[ListItem.Title]</label>
                         <scroll>false</scroll>
                     </control>
-                    <control type="label">
-                        <visible>!isempty(ListItem.duration)</visible>
-                        <posx>8-col</posx>
-                        <posy>0</posy>
-                        <width>3-col</width>
-                        <font>smallStrong</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.duration] mins</label>
-                        <scroll>false</scroll>
-                    </control>
                     <control type="label">
                         <visible>!isempty(ListItem.playcount)</visible>
-                        <posx>36r</posx>
-                        <posy>1</posy>
-                        <width>40</width>
+                        <posx>11-col</posx>
+                        <posy>0</posy>
+                        <width>1-col</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
                         <font>symbol</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
diff --git a/1080i/View_Files.xml b/1080i/View_Files.xml
index 2cf4885..74043ca 100644
--- a/1080i/View_Files.xml
+++ b/1080i/View_Files.xml
@@ -1,85 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-    <include name="viewFileList">
+    <include name="files">
         <control type="panel" id="50">
-            <posx>0</posx>
-            <posy>0</posy>
-            <width>18-col</width>
-            <height>21-row</height>
+            <visible>StringCompare(container.foldername,files) | StringCompare(container.foldername,Video Playlists)</visible>
+            <posx>col-1-begin</posx>
+            <posy>row-5-begin</posy>
+            <width>12-col</width>
+            <height>25-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
             <ondown>50</ondown>
-            <onup>5</onup>
+            <onup>50</onup>
             <pagecontrol>60</pagecontrol>
-            <itemlayout height="3-row" width="9-col">
+            <itemlayout width="12-col" height="2-row">
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>3-row</width>
-                    <height>3-row</height>
-                    <aspectratio scalediffuse="false">scale</aspectratio>
-                    <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
+                    <width>1-col</width>
+                    <height>2-row</height>
+                    <aspectratio scalediffuse="false" align="right">scale</aspectratio>
+                    <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                </control>
+                <control type="image">
+                    <posx>1-col</posx>
+                    <posy>0</posy>
+                    <width>11-col</width>
+                    <height>2-row</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture border="0">colors/black.png</texture>
+                    <colordiffuse>textboxInactive</colordiffuse>
                 </control>
                 <control type="label">
-                    <posx>2-col</posx>
+                    <posx>1-col-indent</posx>
                     <posy>0</posy>
-                    <width>7-col</width>
+                    <width>11-col-gutter</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
                     <font>itemTitle</font>
                     <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <label>$INFO[ListItem.Label]</label>
                 </control>
-                <control type="label">
-                    <posx>5-col</posx>
-                    <posy>0</posy>
-                    <width>4-col</width>
-                    <aligny>center</aligny>
-                    <label>$INFO[ListItem.Label2]</label>
-                    <font>itemSubtitle</font>
-                    <textcolor>textActive</textcolor>
-                    <selectedcolor>selected</selectedcolor>
-                    <shadowcolor>-</shadowcolor>
-                </control>
             </itemlayout>
-            <focusedlayout height="3-row" width="9-col">
+            <focusedlayout width="12-col" height="2-row">
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>9-col</width>
-                    <height>3-row</height>
+                    <width>1-col</width>
+                    <height>2-row</height>
+                    <aspectratio scalediffuse="false" align="right">scale</aspectratio>
+                    <texture fallback="colors/white.png" border="0">$INFO[Listitem.thumb]</texture>
+                    <include>spinFocusIcon</include>
+                </control>
+                <control type="image">
+                    <posx>1-col</posx>
+                    <posy>0</posy>
+                    <width>11-col</width>
+                    <height>2-row</height>
                     <aspectratio>stretch</aspectratio>
-                    <texture>colors/white.png</texture>
-                    <bordersize>0</bordersize>
+                    <texture border="0">colors/white.png</texture>
                     <colordiffuse>500</colordiffuse>
                 </control>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>3-row</width>
-                    <height>3-row</height>
-                    <aspectratio scalediffuse="false">scale</aspectratio>
-                    <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
-                </control>
                 <control type="label">
-                    <posx>2-col</posx>
+                    <posx>1-col-indent</posx>
                     <posy>0</posy>
-                    <width>7-col</width>
+                    <width>11-col-gutter</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
                     <font>itemTitle</font>
                     <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <label>$INFO[ListItem.Label]</label>
                 </control>
-                <control type="label">
-                    <posx>5-col</posx>
-                    <posy>0</posy>
-                    <width>4-col</width>
-                    <aligny>center</aligny>
-                    <label>$INFO[ListItem.Label2]</label>
-                    <font>itemSubtitle</font>
-                    <textcolor>textActive</textcolor>
-                    <selectedcolor>selected</selectedcolor>
-                    <shadowcolor>-</shadowcolor>
-                </control>
             </focusedlayout>
         </control>
     </include>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index b36f416..7a70944 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
     <include name="movies">
-        <visible>!isEmpty(container.foldername)</visible>
+        <visible>window.isactive(Videos,videodb://movies/titles/)</visible>
         <control type="group">
 
             <!--fanart-->
-            <control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>fullscreenWidth</width>
-                <height>fullscreenHeight</height>
-                <aspectratio scalediffuse="false">stretch</aspectratio>
-                <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
-                <fadetime>1500</fadetime>
+            <control type="group">
+                <visible>container.content(movies)</visible>
+                <control type="image">
+                    <include>dimensionsFullscreen</include>
+                    <aspectratio scalediffuse="false">stretch</aspectratio>
+                    <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
+                    <fadetime>1500</fadetime>
+                </control>
+                <control type="image">
+                    <texture>vignette.png</texture>
+                    <colordiffuse>ffffffff</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
             </control>
 
-            <!--this is a list - it needs to be moved elsewhere-->
             <control type="panel" id="50">
-                <visible>!container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
+                <visible>!StringCompare(container.foldername,files) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
                 <width>24-col</width>
@@ -51,39 +55,30 @@
                         <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                         <bordersize>3</bordersize>
                         <colordiffuse>ffFFFFFF</colordiffuse>
+                        <include>spinFocusPoster</include>
                     </control>
                     <control type="group">
+                        <include>fadeIn</include>
                         <posx>0</posx>
                         <posy>0</posy>
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>4-col-gutter</width>
+                            <width>1-col</width>
                             <height>396</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture border="0">colors/black.png</texture>
-                            <bordertexture border="3" colordiffuse="99111111">colors/white.png</bordertexture>
-                            <bordersize>3</bordersize>
-                            <colordiffuse>44FFFFFF</colordiffuse>
+                            <texture border="0">colors/white.png</texture>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
-                            <posy>4-row</posy>
-                            <width>3-col</width>
-                            <align>center</align>
+                            <posx>34</posx>
+                            <posy>10-row</posy>
+                            <width>9-row</width>
+                            <align>left</align>
+                            <angle>90</angle>
                             <font>itemTitle</font>
-                            <textcolor>textActive</textcolor>
+                            <textcolor>black</textcolor>
                             <label>$INFO[ListItem.title]</label>
                         </control>
-                        <control type="label">
-                            <posx>24</posx>
-                            <posy>5-row</posy>
-                            <width>3-col</width>
-                            <align>center</align>
-                            <font>itemSubTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[listitem.year]</label>
-                        </control>
                     </control>
                 </focusedlayout>
             </control>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 7a5daaa..46433f4 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -5,24 +5,49 @@
             <visible>container.content(seasons) + !container.content(episodes)</visible>
 
             <!--fanart-->
-            <control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>fullscreenWidth</width>
-                <height>fullscreenHeight</height>
-                <aspectratio scalediffuse="false">stretch</aspectratio>
-                <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
-                <fadetime>500</fadetime>
-                <include>kenBurnsey</include>
+            <control type="group">
+                <posy>-512</posy>
+                <control type="image">
+                    <include>dimensionsFullscreen</include>
+                    <aspectratio scalediffuse="false">stretch</aspectratio>
+                    <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
+                    <bordertexture border="6" colordiffuse="500">colors/white.png</bordertexture>
+                    <bordersize>0,0,0,6</bordersize>
+                    <colordiffuse>ffffffff</colordiffuse>
+                </control>
+            </control>
+
+            <!--title-->
+            <control type="group">
+                <posx>col-1-begin</posx>
+                <posy>row-1-begin</posy>
+                <control type="image">
+                    <posx>-96</posx>
+                    <posy>10-row</posy>
+                    <width>fullscreenWidth</width>
+                    <height>148</height>
+                    <aspectratio scalediffuse="false">stretch</aspectratio>
+                    <texture border="0">colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
+                </control>
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>10-row</posy>
+                    <width>24-col</width>
+                    <height>4-row</height>
+                    <font>veryLarge</font>
+                    <textcolor>textActive</textcolor>
+                    <label>$INFO[container.foldername]</label>
+                </control>
             </control>
 
             <!--content-->
             <control type="panel" id="58">
-                <visible>!container.content(episodes) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
+                <visible>!StringCompare(container.foldername,files) + !container.content(episodes) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
                 <posx>col-1-begin</posx>
-                <posy>row-5-begin</posy>
-                <width>21-col</width>
-                <height>744</height>
+                <posy>row-17-begin</posy>
+                <width>24-col</width>
+                <height>11-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <ondown>50</ondown>
@@ -53,38 +78,29 @@
                         <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                         <bordersize>3</bordersize>
                         <colordiffuse>ffFFFFFF</colordiffuse>
+                        <include>spinFocusPoster</include>
                     </control>
                     <control type="group">
+                        <include>fadeIn</include>
                         <posx>0</posx>
                         <posy>0</posy>
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>4-col-gutter</width>
+                            <width>1-col</width>
                             <height>396</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture border="0">colors/black.png</texture>
-                            <bordertexture border="3" colordiffuse="99111111">colors/white.png</bordertexture>
-                            <bordersize>3</bordersize>
-                            <colordiffuse>44FFFFFF</colordiffuse>
+                            <texture border="0">colors/white.png</texture>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
-                            <posy>4-row</posy>
-                            <width>3-col</width>
-                            <align>center</align>
+                            <posx>34</posx>
+                            <posy>10-row</posy>
+                            <width>10-row</width>
+                            <align>left</align>
+                            <angle>90</angle>
                             <font>itemTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.title]</label>
-                        </control>
-                        <control type="label">
-                            <posx>24</posx>
-                            <posy>5-row</posy>
-                            <width>3-col</width>
-                            <align>center</align>
-                            <font>itemSubTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$VAR[itemDetail]</label>
+                            <textcolor>black</textcolor>
+                            <label>$INFO[ListItem.season,$LOCALIZE[31011] , • ]$VAR[itemDetail]</label>
                         </control>
                     </control>
                 </focusedlayout>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 816ceb3..6dd60f5 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
     <include name="tvshows">
-        <visible>!isEmpty(container.foldername)</visible>
+        <visible>window.isactive(Videos,videodb://tvshows/titles/)</visible>
 
         <control type="group">
 
-            <!--this is a list - it needs to be moved elsewhere-->
+            <!--fanart-->
+            <control type="group">
+                <visible>container.content(tvshows)</visible>
+                <control type="image">
+                    <include>dimensionsFullscreen</include>
+                    <aspectratio scalediffuse="false">stretch</aspectratio>
+                    <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
+                    <fadetime>1500</fadetime>
+                </control>
+                <control type="image">
+                    <texture>vignette.png</texture>
+                    <colordiffuse>ffffffff</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
+            </control>
+
+            <!--this is a copy of file list-->
             <control type="panel" id="50">
-                <visible>!container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
+                <visible>!StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
                 <width>12-col</width>
diff --git a/1080i/script-RCB-gameinfo.xml b/1080i/script-RCB-gameinfo.xml
index c2798a7..0dfd801 100644
--- a/1080i/script-RCB-gameinfo.xml
+++ b/1080i/script-RCB-gameinfo.xml
@@ -86,7 +86,7 @@
                             <width>6-col-gutter</width>
                             <font>itemSubTitle</font>
                             <textcolor>textActive</textcolor>
-                            <label>[COLOR accented]$INFO[ListItem.label][/COLOR] $INFO[ListItem.label2]</label>
+                            <label>[COLOR textAccented]$INFO[ListItem.label][/COLOR] $INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                     </itemlayout>
@@ -97,7 +97,7 @@
                             <width>6-col-gutter</width>
                             <font>itemSubTitle</font>
                             <textcolor>textActive</textcolor>
-                            <label>[COLOR accented]$INFO[ListItem.label][/COLOR] $INFO[ListItem.label2]</label>
+                            <label>[COLOR textAccented]$INFO[ListItem.label][/COLOR] $INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                     </focusedlayout>
diff --git a/1080i/script-Rom_Collection_Browser-main.xml b/1080i/script-Rom_Collection_Browser-main.xml
index ff30381..99dc17a 100644
--- a/1080i/script-Rom_Collection_Browser-main.xml
+++ b/1080i/script-Rom_Collection_Browser-main.xml
@@ -74,7 +74,7 @@
                         <posy>0</posy>
                         <width>14-col</width>
                         <font>pageTitle</font>
-                        <label>$LOCALIZE[31156] [COLOR accented]$INFO[ListItem.Property(console)][/COLOR]</label>
+                        <label>$LOCALIZE[31156] [COLOR textAccented]$INFO[ListItem.Property(console)][/COLOR]</label>
                         <textcolor>textActive</textcolor>
                     </control>
                     <!--source subtitle-->
diff --git a/colors/defaults.xml b/colors/defaults.xml
index cbc600e..65aa60c 100644
--- a/colors/defaults.xml
+++ b/colors/defaults.xml
@@ -4,7 +4,7 @@
     <color name="selected">fff0f0f0</color>
     <color name="unselected">ff919191</color>
     <color name="disabled">ff515151</color>
-    <color name="accented">ffa1a1a1</color>
+    <color name="textAccented">ffa1a1a1</color>
 
     <!--new scheme-->
     <color name="background">ff424242</color>
@@ -13,6 +13,7 @@
     <color name="textDisabled">ff757575</color>
     <color name="menuDisabled">ffEF9A9A</color>
     <color name="textboxInactive">99FFFFFF</color>
+    <color name="textAccented">FFF44336</color>
 
     <color name="500">FFF44336</color>