diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index de987d9..4857168 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -292,17 +292,6 @@
                             <thumb>-</thumb>
                             <onclick>SendClick(2000,5)</onclick>
                         </item>
-                        <item id="3">
-                            <description>Artwork downloader</description>
-                            <label>$LOCALIZE[31219]</label>
-                            <label2></label2>
-                            <thumb>-</thumb>
-                            <onclick condition="system.hasaddon(script.artwork.downloader) + Container.Content(tvshows)">XBMC.RunScript(script.artwork.downloader, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
-                            <onclick condition="system.hasaddon(script.artwork.downloader) + Container.Content(movies)">XBMC.RunScript(script.artwork.downloader, mediatype=movie, dbid=$INFO[ListItem.DBID])</onclick>
-                            <onclick condition="system.hasaddon(script.artwork.downloader) + Container.Content(musicvideos)">XBMC.RunScript(script.artwork.downloader, mediatype=musicvideos, dbid=$INFO[ListItem.DBID])</onclick>
-                            <onclick condition="!system.hasaddon(script.artwork.downloader)">InstallAddon(script.artwork.downloader)</onclick>
-                            <visible>[Container.Content(tvshows)|Container.Content(movies)|Container.Content(musicvideos)]</visible>
-                        </item>
                         <item id="2">
                             <description>Cancel Button</description>
                             <label>222</label>
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index ab71131..0217185 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -26,10 +26,7 @@
         </control>
         <!--movie / tv show fanart-->
         <control type="group">
-
-            <!--<include condition="!Substring(Container.folderpath,plugin) + !container.content(episodes)">itemFanart</include>-->
             <include condition="!Substring(Container.folderpath,plugin) + !container.content(episodes)">itemShowcase</include>
-
             <!--music video-->
             <control type="group">
                 <visible>container.content(musicvideos)</visible>
@@ -72,9 +69,8 @@
             </control>
             <control type="image">
                 <posx>col-1-begin</posx>
-                <posy>row-23-begin</posy>
+                <posy>898</posy>
                 <width>5-col</width>
-                <height>4-col</height>
                 <texture>$INFO[ListItem.Art(clearlogo)]</texture>
                 <aspectratio align="left">keep</aspectratio>
             </control>
@@ -92,6 +88,15 @@
                 <effect type="fade" start="100" end="0" time="350"/>
                 <effect type="slide" start="0" end="900" tween="cubic" easing="out" time="400"/>
             </animation>
+            <animation type="conditional" condition="control.hasfocus(8000)">
+                <effect type="fade" start="0" end="100" time="300" delay="300"/>
+                <effect type="slide" start="800" end="0" tween="cubic" easing="out" time="400" delay="300"/>
+            </animation>
+            <animation type="conditional" condition="!control.hasfocus(8000)">
+                <effect type="fade" start="100" end="0" time="350"/>
+                <effect type="slide" start="0" end="900" tween="cubic" easing="out" time="400"/>
+            </animation>
+
             <!--overlay-->
             <control type="image">
                 <posx>0</posx>
@@ -212,6 +217,7 @@
                 <height>6-row</height>
                 <itemgap>3</itemgap>
                 <onup>61</onup>
+                <onleft>999981</onleft>
                 <orientation>vertical</orientation>
                 <itemlayout width="5-col" height="2-row">
                     <control type="image">
@@ -298,10 +304,14 @@
                         <onclick>sendclick(2003,8)</onclick>
                     </item>
                     <item>
-                        <label>31074</label>
-                        <label2></label2>
+                        <description>Artwork downloader</description>
+                        <label>$LOCALIZE[31219]</label>
+                        <label2></label2>
                         <thumb>-</thumb>
-                        <onclick>control.setfocus(62)</onclick>
+                        <onclick condition="system.hasaddon(script.artwork.downloader) + String.IsEqual(ListItem.DBTYPE,tvshow)">XBMC.RunScript(script.artwork.downloader, mediatype=tvshow, dbid=$INFO[ListItem.DBID])</onclick>
+                        <onclick condition="system.hasaddon(script.artwork.downloader) + String.IsEqual(ListItem.DBTYPE,movie)">XBMC.RunScript(script.artwork.downloader, mediatype=movie, dbid=$INFO[ListItem.DBID])</onclick>
+                        <onclick condition="system.hasaddon(script.artwork.downloader) + String.IsEqual(ListItem.DBTYPE,musicvideo)">XBMC.RunScript(script.artwork.downloader, mediatype=musicvideos, dbid=$INFO[ListItem.DBID])</onclick>
+                        <onclick condition="!system.hasaddon(script.artwork.downloader)">InstallAddon(script.artwork.downloader)</onclick>
                     </item>
                     <item>
                         <label>20410</label>
diff --git a/1080i/Includes_mediaShowcase.xml b/1080i/Includes_mediaShowcase.xml
index 527fabc..d89c54d 100644
--- a/1080i/Includes_mediaShowcase.xml
+++ b/1080i/Includes_mediaShowcase.xml
@@ -15,21 +15,39 @@
             <content>$VAR[extraFanartLocation]</content>
         </control>
         <control type="grouplist" id="99998">
-            <posx>col-1-begin</posx>
-            <posy>row-4-begin</posy>
-            <width>24-col</width>
+            <posx>0</posx>
+            <posy>row-3-begin</posy>
+            <width>20000</width>
             <height>fullscreenHeight</height>
-            <itemgap>2-col</itemgap>
-            <pagecontrol>62</pagecontrol>
+            <itemgap>0</itemgap>
             <scrolltime tween="sine" easing="out">500</scrolltime>
             <orientation>horizontal</orientation>
             <usecontrolcoords>true</usecontrolcoords>
             <animation type="windowopen">
                 <effect type="fade" start="0" end="100" delay="250" time="1000"/>
             </animation>
+            <!--movement-->
+            <animation effect="slide" time="300" end="0,0" condition="Control.HasFocus(999981)">condition</animation>
+            <animation effect="slide" time="300" end="-700,0" condition="Control.HasFocus(999982)">condition</animation>
+            <animation effect="slide" time="300" end="-1400,0" condition="Control.HasFocus(999983)">condition</animation>
+            <animation effect="slide" time="300" end="-1900,0" condition="Control.HasFocus(999984)">condition</animation>
+            <animation effect="slide" time="300" end="-2600,0" condition="Control.HasFocus(999985)">condition</animation>
+            <animation effect="slide" time="300" end="-3100,0" condition="Control.HasFocus(999986)">condition</animation>
+            <animation effect="slide" time="300" end="-3800,0" condition="Control.HasFocus(999987)">condition</animation>
+            <animation effect="slide" time="300" end="-4500,0" condition="Control.HasFocus(999988)">condition</animation>
+            <animation effect="slide" time="300" end="-5200,0" condition="Control.HasFocus(999989)">condition</animation>
+            <animation effect="slide" time="300" end="-5900,0" condition="Control.HasFocus(999990)">condition</animation>
+            <animation effect="slide" time="300" end="-6600,0" condition="Control.HasFocus(999991)">condition</animation>
+            <animation effect="slide" time="300" end="-7200,0" condition="Control.HasFocus(999992)">condition</animation>
+            <animation effect="slide" time="300" end="-7900,0" condition="Control.HasFocus(999993)">condition</animation>
+            <animation effect="slide" time="300" end="-8600,0" condition="Control.HasFocus(999994)">condition</animation>
+            <animation effect="slide" time="300" end="-9300,0" condition="Control.HasFocus(999995)">condition</animation>
+            <animation effect="slide" time="300" end="-10000,0" condition="Control.HasFocus(999996)">condition</animation>
+            <animation effect="slide" time="300" end="-10700,0" condition="Control.HasFocus(999997)">condition</animation>
+            <animation effect="slide" time="300" end="-11400,0" condition="Control.HasFocus(999998)">condition</animation>
             <control type="label">
-                <visible>!isempty(ListItem.tagline)</visible>
-                <posx>0</posx>
+                <visible>!isempty(listitem.tagline)</visible>
+                <posx>col-1-begin</posx>
                 <posy>0</posy>
                 <width>756</width>
                 <height>756</height>
@@ -40,6 +58,7 @@
                 <wrapmultiline>true</wrapmultiline>
             </control>
             <control type="image">
+                <posx>2-col</posx>
                 <visible>!isempty(ListItem.art(poster))</visible>
                 <posx>0</posx>
                 <width>504</width>
@@ -51,6 +70,7 @@
                 <bordersize>3</bordersize>
             </control>
             <control type="image">
+                <posx>2-col</posx>
                 <visible>!isempty(ListItem.art(fanart))</visible>
                 <width>1344</width>
                 <height>756</height>
@@ -61,7 +81,7 @@
                 <bordersize>3</bordersize>
             </control>
             <control type="panel" id="50">
-                <posx>0</posx>
+                <posx>180</posx>
                 <posy>12</posy>
                 <width>20-col</width>
                 <height>756</height>
@@ -103,6 +123,7 @@
                 <focusedlayout/>
             </control>
             <control type="image">
+                <posx>2-col</posx>
                 <visible>!isempty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart)</visible>
                 <width>1344</width>
                 <height>756</height>
@@ -113,6 +134,7 @@
                 <bordersize>3</bordersize>
             </control>
             <control type="image">
+                <posx>2-col</posx>
                 <visible>!isempty(listitem.art(discart))</visible>
                 <width>756</width>
                 <height>756</height>
@@ -121,6 +143,7 @@
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
+                <posx>2-col</posx>
                 <visible>!isempty(container(99999).ListItemNoWrap(1).filenameandpath) + !Skin.HasSetting(disableExtendedFanart)</visible>
                 <width>1344</width>
                 <height>756</height>
@@ -131,6 +154,7 @@
                 <bordersize>3</bordersize>
             </control>
             <control type="image">
+                <posx>2-col</posx>
                 <visible>!isempty(container(99999).ListItemNoWrap(2).filenameandpath) + !Skin.HasSetting(disableExtendedFanart)</visible>
                 <width>1344</width>
                 <height>756</height>
@@ -141,6 +165,7 @@
                 <bordersize>3</bordersize>
             </control>
             <control type="image">
+                <posx>2-col</posx>
                 <visible>!isempty(container(99999).ListItemNoWrap(3).filenameandpath) + !Skin.HasSetting(disableExtendedFanart)</visible>
                 <width>1344</width>
                 <height>756</height>
@@ -151,6 +176,7 @@
                 <bordersize>3</bordersize>
             </control>
             <control type="image">
+                <posx>2-col</posx>
                 <visible>!isempty(container(99999).ListItemNoWrap(4).filenameandpath) + !Skin.HasSetting(disableExtendedFanart)</visible>
                 <width>1344</width>
                 <height>756</height>
@@ -160,14 +186,139 @@
                 <bordertexture border="3">colors/white.png</bordertexture>
                 <bordersize>3</bordersize>
             </control>
+            <control type="image">
+                <posx>3-col</posx>
+                <width>1-col</width>
+                <height>756</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>ffffffff</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
         </control>
 
         <control type="scrollbar" id="62">
-            <posx>col-6-begin</posx>
-            <posy>row-26-begin</posy>
+            <posx>col-9-begin</posx>
+            <posy>row-27-begin</posy>
             <height>12</height>
             <width>8-col</width>
             <orientation>horizontal</orientation>
+            <onback>8000</onback>
+        </control>
+
+        <!--navigation-->
+        <control type="grouplist">
+            <posx>636</posx>
+            <posy>row-27-begin</posy>
+            <orientation>horizontal</orientation>
+            <itemgap>0</itemgap>
+            <control type="button" id="999981">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999982">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999983">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999984">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999985">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999986">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999987">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999988">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999989">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999990">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999991">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999992">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999993">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999994">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999995">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999996">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999997">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
+            <control type="button" id="999998">
+                <width>36</width>
+                <height>12</height>
+                <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                <onback>8000</onback>
+            </control>
         </control>
 
     </include>
diff --git a/1080i/script-skinshortcuts-includes.xml b/1080i/script-skinshortcuts-includes.xml
index e6f4b60..1fc6921 100644
--- a/1080i/script-skinshortcuts-includes.xml
+++ b/1080i/script-skinshortcuts-includes.xml
@@ -4,7 +4,7 @@
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<label>$LOCALIZE[31136]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31136</property>
@@ -21,7 +21,7 @@
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
 			<label>$ADDON[script.skinshortcuts 32032]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">dvd</property>
@@ -38,7 +38,7 @@
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
 			<label>$ADDON[script.skinshortcuts 32033]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">32033</property>
@@ -55,7 +55,7 @@
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
 			<label>$LOCALIZE[31147]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">script.globalsearch</property>
@@ -73,7 +73,7 @@
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
 			<label>$LOCALIZE[31006]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31006</property>
@@ -90,7 +90,7 @@
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
 			<label>$LOCALIZE[31059]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31059</property>
@@ -107,7 +107,7 @@
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
 			<label>$LOCALIZE[10006]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">videos</property>
@@ -123,12 +123,12 @@
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="submenuVisibility">videos</property>
 			<property name="group">mainmenu</property>
-			<property name="hasSubmenu">False</property>
+			<property name="hasSubmenu">True</property>
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
 			<label>$LOCALIZE[10006]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">videos--0</property>
@@ -145,7 +145,7 @@
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
 			<label>$LOCALIZE[10005]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">music</property>
@@ -166,7 +166,7 @@
 		<item id="10">
 			<property name="id">$NUMBER[10]</property>
 			<label>$LOCALIZE[10005]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">music--0</property>
@@ -183,7 +183,7 @@
 		<item id="11">
 			<property name="id">$NUMBER[11]</property>
 			<label>$LOCALIZE[12600]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">weather</property>
@@ -200,7 +200,7 @@
 		<item id="12">
 			<property name="id">$NUMBER[12]</property>
 			<label>$LOCALIZE[10002]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">pictures</property>
@@ -216,7 +216,7 @@
 		<item id="13">
 			<property name="id">$NUMBER[13]</property>
 			<label>$LOCALIZE[10004]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">settings</property>
@@ -232,7 +232,7 @@
 		<item id="14">
 			<property name="id">$NUMBER[14]</property>
 			<label>$LOCALIZE[31004]</label>
-			<label2>Common menu item</label2>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultAddon.png</icon>
 			<thumb />
 			<property name="labelID">31004</property>
@@ -508,6 +508,55 @@
 			<property name="group">dvd</property>
 			<property name="isSubmenu">True</property>
 		</item>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[20389]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">musicvideos</property>
+			<property name="defaultID">musicvideos</property>
+			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
+			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
+			<property name="list">videodb://musicvideos/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,Files,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Files,return)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[1037]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1037</property>
+			<property name="defaultID">1037</property>
+			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">9</property>
@@ -2043,7 +2092,55 @@
 		<description>No items</description>
 	</include>
 	<include name="skinshortcuts-group-videos">
-		<description>No items</description>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[20389]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">musicvideos</property>
+			<property name="defaultID">musicvideos</property>
+			<visible>Library.HasContent(MusicVideos)</visible>
+			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
+			<property name="list">videodb://musicvideos/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,Files,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Files,return)</property>
+			<property name="list">Files</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[1037]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1037</property>
+			<property name="defaultID">1037</property>
+			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">7</property>
@@ -2095,7 +2192,55 @@
 		</item>
 	</include>
 	<include name="skinshortcuts-group-alt-videos">
-		<description>No items</description>
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[20389]</label>
+			<label2>$ADDON[script.skinshortcuts 32034]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">musicvideos</property>
+			<property name="defaultID">musicvideos</property>
+			<visible>[Library.HasContent(MusicVideos)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<onclick>ActivateWindow(Videos,videodb://musicvideos/titles/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://musicvideos/titles/,return)</property>
+			<property name="list">videodb://musicvideos/titles/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Videos,Files,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Files,return)</property>
+			<property name="list">Files</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">7</property>
+			<label>$LOCALIZE[1037]</label>
+			<label2>$ADDON[script.skinshortcuts 32014]</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1037</property>
+			<property name="defaultID">1037</property>
+			<onclick>ActivateWindow(Videos,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Videos,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),videos)</visible>
+			<property name="group">videos</property>
+			<property name="isSubmenu">True</property>
+		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
 			<property name="mainmenuid">7</property>
diff --git a/changelog.txt b/changelog.txt
index 17168cc..c5e2ef8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,12 +1,14 @@
 **Changelog**
 
 [PLANNED WORKS]
-- showcase media -- Add main cast mugshots / polaroid style with labels
 - ensure spotlight disabled when no content
 
+- move the tvshows / multinode stuff from defaults to overrides
+
 
 [V1.2.0]
 - [NEW] Extended fanart support for video info and seasons (active by default)
+- [NEW] 'Media Showcase'. This extension to the video info screen presents media art in a much more engaging way, taking advantage of available media art.
 - [NEW] User option: disable extended fanart
 - [NEW] Keyboard autocomplete support