diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 0c7d2d4..2a22248 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">50</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <include>fadeInOut</include>
     <controls>
         <!--background-->
diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index 21d5c94..f3a0222 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">8000</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <controls>
         <include>globalBackground</include>
         <!--About this addon-->
diff --git a/1080i/DialogAddonSettings.xml b/1080i/DialogAddonSettings.xml
index 3a0dfcd..9410582 100644
--- a/1080i/DialogAddonSettings.xml
+++ b/1080i/DialogAddonSettings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <include>globalBackground</include>
         <!--configuration options-->
diff --git a/1080i/DialogAlbumInfo.xml b/1080i/DialogAlbumInfo.xml
index 01a5027..81b974b 100644
--- a/1080i/DialogAlbumInfo.xml
+++ b/1080i/DialogAlbumInfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">8000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <include>fadeInOut</include>
     <controls>
         <!--fanart / coverart if available-->
diff --git a/1080i/DialogBusy.xml b/1080i/DialogBusy.xml
index 9aa8bfe..5b4ac31 100644
--- a/1080i/DialogBusy.xml
+++ b/1080i/DialogBusy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">-</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <control type="label">
             <posy>0</posy>
diff --git a/1080i/DialogButtonMenu.xml b/1080i/DialogButtonMenu.xml
index db74fbd..24ecaf9 100644
--- a/1080i/DialogButtonMenu.xml
+++ b/1080i/DialogButtonMenu.xml
@@ -2,7 +2,7 @@
 <!--power menu-->
 <window type="buttonMenu">
     <defaultcontrol always="true">8000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <include>fadeInOut</include>
     <controls>
         <include>modalDialog</include>
diff --git a/1080i/DialogContentSettings.xml b/1080i/DialogContentSettings.xml
index c7ba3fb..d1e76e0 100644
--- a/1080i/DialogContentSettings.xml
+++ b/1080i/DialogContentSettings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">20</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
     <controls>
         <!--background-->
         <include>globalBackground</include>
diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml
index a85de43..e5a7563 100644
--- a/1080i/DialogContextMenu.xml
+++ b/1080i/DialogContextMenu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">1000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <include>fadeInOut</include>
     <controls>
         <include>modalDialog</include>
diff --git a/1080i/DialogFavourites.xml b/1080i/DialogFavourites.xml
index d6d2e00..e803fd2 100644
--- a/1080i/DialogFavourites.xml
+++ b/1080i/DialogFavourites.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog">
     <defaultcontrol always="true">450</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <include>fadeInOut</include>
     <controls>
         <!--background-->
diff --git a/1080i/DialogFileStacking.xml b/1080i/DialogFileStacking.xml
deleted file mode 100644
index 7b357c6..0000000
--- a/1080i/DialogFileStacking.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-    <defaultcontrol always="true">450</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
-    <controls>
-        <control type="image">
-            <posx>0</posx>
-            <posy>0</posy>
-            <width>fullscreenWidth</width>
-            <height>fullscreenHeight</height>
-            <aspectratio>stretch</aspectratio>
-            <texture>colors/black.png</texture>
-            <colordiffuse>ddFFFFFF</colordiffuse>
-            <include>fadeInOut</include>
-        </control>
-        <control type="group">
-            <posx>col-7-begin</posx>
-            <posy>row-3-begin</posy>
-            <!--animations-->
-            <include>modalDialogInOutVertical</include>
-            <control type="image">
-                <posx>-528</posx>
-                <posy>44</posy>
-                <width>fullscreenWidth</width>
-                <height>1-row</height>
-                <texture>colors/white.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>-3</posx>
-                <posy>44</posy>
-                <width>3</width>
-                <height>1-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="label">
-                <posx>12</posx>
-                <posy>44</posy>
-                <width>12-col</width>
-                <font>dialogTitle</font>
-                <textcolor>black</textcolor>
-                <shadowcolor>-</shadowcolor>
-                <label>$INFO[ListItem.Label]</label>
-            </control>
-            <control type="list" id="450">
-                <posx>0</posx>
-                <posy>120</posy>
-                <width>12-col</width>
-                <height>11-row</height>
-                <onleft>5</onleft>
-                <onright>9001</onright>
-                <onup>6</onup>
-                <ondown>6</ondown>
-                <itemlayout height="1-row" width="6-col">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>6-col-gutter</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="24,0,24,0">UIControls/listitemNF.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>99FFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>4</posx>
-                        <posy>4</posy>
-                        <width>48</width>
-                        <height>48</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
-                    </control>
-                    <control type="label">
-                        <posx>1-col</posx>
-                        <posy>0</posy>
-                        <width>312</width>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Label]</label>
-                    </control>
-                </itemlayout>
-                <focusedlayout height="1-row" width="6-col">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>6-col-gutter</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="24,0,24,0">UIControls/listitemFO.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>FFFFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>4</posx>
-                        <posy>4</posy>
-                        <width>48</width>
-                        <height>48</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
-                    </control>
-                    <control type="label">
-                        <posx>1-col</posx>
-                        <posy>0</posy>
-                        <width>312</width>
-                        <font>itemTitle</font>
-                        <textcolor>black</textcolor>
-                        <selectedcolor>black</selectedcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Label]</label>
-                    </control>
-                </focusedlayout>
-            </control>
-        </control>
-    </controls>
-</window>
diff --git a/1080i/DialogKaiToast.xml b/1080i/DialogKaiToast.xml
index 6301131..6458774 100644
--- a/1080i/DialogKaiToast.xml
+++ b/1080i/DialogKaiToast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <onload condition="Window.isactive(videolibrary) | window.isactive(videoplaylist) | Window.isactive(pvr) window.isactive(musiclibrary) | window.isactive(musicfiles) | window.isactive(musicplaylist)">SetFocus(9000,0)</onload>
+    <onload condition="Window.isactive(videolibrary) | window.isactive(videoplaylist) | Window.isactive(pvr) window.isactive(musiclibrary) | window.isactive(musicplaylist)">SetFocus(9000,0)</onload>
     <controls>
         <control type="group">
             <posx>col-19-begin</posx>
diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml
index 4e48748..b1b5a06 100644
--- a/1080i/DialogKeyboard.xml
+++ b/1080i/DialogKeyboard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">300</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <control type="group">
             <visible>!Window.IsVisible(numericinput)</visible>
diff --git a/1080i/DialogMuteBug.xml b/1080i/DialogMuteBug.xml
index 19557d8..0320227 100644
--- a/1080i/DialogMuteBug.xml
+++ b/1080i/DialogMuteBug.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">901</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <coordinates>
         <origin x="0" y="0"/>
     </coordinates>
diff --git a/1080i/DialogNetworkSetup.xml b/1080i/DialogNetworkSetup.xml
index 6685697..9e7c4be 100644
--- a/1080i/DialogNetworkSetup.xml
+++ b/1080i/DialogNetworkSetup.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">10</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <controls>
         <!--background-->
         <include>globalBackground</include>
diff --git a/1080i/DialogNumeric.xml b/1080i/DialogNumeric.xml
index 62f6866..7dcb56a 100644
--- a/1080i/DialogNumeric.xml
+++ b/1080i/DialogNumeric.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">4</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <control type="group">
         <posx>0</posx>
diff --git a/1080i/DialogOk.xml b/1080i/DialogOk.xml
index 95fd84e..dd5eafc 100644
--- a/1080i/DialogOk.xml
+++ b/1080i/DialogOk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9001</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <include>fadeInOut</include>
     <controls>
         <include>modalDialog</include>
diff --git a/1080i/DialogPVRChannelManager.xml b/1080i/DialogPVRChannelManager.xml
index d6b46db..b7f9df2 100644
--- a/1080i/DialogPVRChannelManager.xml
+++ b/1080i/DialogPVRChannelManager.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">20</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <coordinates>
         <system>1</system>
         <posx>0</posx>
diff --git a/1080i/DialogPeripheralManager.xml b/1080i/DialogPeripheralManager.xml
deleted file mode 100644
index ed62fed..0000000
--- a/1080i/DialogPeripheralManager.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-    <defaultcontrol always="true">20</defaultcontrol>
-    <controls>
-        <!--background-->
-        <include>globalBackground</include>
-        <control type="group">
-            <posx>col-4-begin</posx>
-            <posy>row-5-begin</posy>
-            <!--animations-->
-            <include>modalDialogInOutVertical</include>
-            <control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>18-col</width>
-                <height>2-row</height>
-                <texture>colors/white.png</texture>
-                <colordiffuse>highlight</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>18-col</width>
-                <height>18-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>14-col</width>
-                <height>18-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="label" id="1">
-                <posx>24</posx>
-                <posy>0</posy>
-                <width>16-col</width>
-                <height>2-row</height>
-                <aligny>center</aligny>
-                <font>dialogTitle</font>
-                <label>$LOCALIZE[35000]</label>
-                <textcolor>textActive</textcolor>
-                <shadowcolor>-</shadowcolor>
-            </control>
-            <control type="panel" id="20">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>14-col</width>
-                <height>18-row</height>
-                <onup>10</onup>
-                <ondown>10</ondown>
-                <onright>9000</onright>
-                <itemlayout height="3-row" width="14-col">
-                    <control type="label">
-                        <description>Name</description>
-                        <posx>24</posx>
-                        <posy>3</posy>
-                        <width>13-col</width>
-                        <height>1-row</height>
-                        <label>$INFO[ListItem.Label]</label>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                    </control>
-                    <control type="label">
-                        <description>Product ID Vendor ID</description>
-                        <posx>24</posx>
-                        <posy>42</posy>
-                        <width>13-col</width>
-                        <height>1-row</height>
-                        <label>$LOCALIZE[35504]: [B]$INFO[ListItem.Property(Product)][/B]    $LOCALIZE[35503]: [B]$INFO[ListItem.Property(Vendor)][/B]</label>
-                        <font>smallMedium</font>
-                        <textcolor>textActive</textcolor>
-                    </control>
-                    <control type="label">
-                        <description>class</description>
-                        <posx>24</posx>
-                        <posy>2-row</posy>
-                        <width>13-col</width>
-                        <height>1-row</height>
-                        <label>$LOCALIZE[35501]: [B]$INFO[ListItem.Property(Class)][/B]     $LOCALIZE[19114]: [B]$INFO[ListItem.Property(Version)][/B]</label>
-                        <font>smallMedium</font>
-                        <textcolor>textActive</textcolor>
-                    </control>
-                </itemlayout>
-                <focusedlayout height="3-row" width="14-col">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>14-col</width>
-                        <height>3-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
-                    </control>
-                    <control type="label">
-                        <description>Name</description>
-                        <posx>24</posx>
-                        <posy>3</posy>
-                        <width>13-col</width>
-                        <height>1-row</height>
-                        <label>$INFO[ListItem.Label]</label>
-                        <font>itemTitle</font>
-                        <textcolor>black</textcolor>
-                    </control>
-                    <control type="label">
-                        <description>Product ID Vendor ID</description>
-                        <posx>24</posx>
-                        <posy>42</posy>
-                        <width>13-col</width>
-                        <height>1-row</height>
-                        <label>$LOCALIZE[35504]: [B]$INFO[ListItem.Property(Product)][/B]    $LOCALIZE[35503]: [B]$INFO[ListItem.Property(Vendor)][/B]</label>
-                        <font>smallMedium</font>
-                        <textcolor>black</textcolor>
-                    </control>
-                    <control type="label">
-                        <description>class</description>
-                        <posx>24</posx>
-                        <posy>2-row</posy>
-                        <width>13-col</width>
-                        <height>1-row</height>
-                        <label>$LOCALIZE[35501]: [B]$INFO[ListItem.Property(Class)][/B]     $LOCALIZE[19114]: [B]$INFO[ListItem.Property(Version)][/B]</label>
-                        <font>smallMedium</font>
-                        <textcolor>black</textcolor>
-                    </control>
-                </focusedlayout>
-            </control>
-            <!--buttons-->
-            <control type="panel" id="9000">
-                <posx>14-col</posx>
-                <posy>2-row</posy>
-                <width>4-col</width>
-                <height>6-row</height>
-                <orientation>vertical</orientation>
-                <onleft>20</onleft>
-                <itemlayout width="6-col" height="2-row">
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>symbol</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label2]</label>
-                    </control>
-                    <control type="label">
-                        <posx>1-col-indent</posx>
-                        <posy>-1</posy>
-                        <width>3-col-gutter</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <font>buttonTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label]</label>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="6-col" height="2-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>highlight</colordiffuse>
-                        <include>spinFocusIcon</include>
-                    </control>
-                    <control type="image">
-                        <posx>1-col</posx>
-                        <posy>0</posy>
-                        <width>3-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
-                    </control>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>symbol</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label2]</label>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                    <control type="label">
-                        <posx>1-col-indent</posx>
-                        <posy>-1</posy>
-                        <width>5-col-gutter</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <font>buttonTitle</font>
-                        <textcolor>black</textcolor>
-                        <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                </focusedlayout>
-                <content>
-                    <item id="1">
-                        <description>Ok Button</description>
-                        <label>186</label>
-                        <label2></label2>
-                        <thumb>-</thumb>
-                        <onclick>SendClick(10)</onclick>
-                    </item>
-                </content>
-            </control>
-        </control>
-        <!--buttons-->
-        <control type="group">
-            <visible>false</visible>
-            <control type="button" id="10">
-                <description>OK button</description>
-            </control>
-        </control>
-        <!--debugging-->
-        <include>DebugGrid</include>
-        <control type="label">
-            <include>DialogID</include>
-            <label>DialogPeripheralManager.xml</label>
-        </control>
-    </controls>
-</window>
diff --git a/1080i/DialogPictureInfo.xml b/1080i/DialogPictureInfo.xml
index e3db02d..24e3ed7 100644
--- a/1080i/DialogPictureInfo.xml
+++ b/1080i/DialogPictureInfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">5</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
 	<include>fadeInOut</include>
     <controls>
         <include>modalDialog</include>
diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml
index 4053a12..b0c57f4 100644
--- a/1080i/DialogSeekBar.xml
+++ b/1080i/DialogSeekBar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">901</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <visible>!window.isactive(videoosd) + !window.isactive(123) + !window.isactive(124) + !Window.IsActive(5901) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
     <controls>
         <control type="image">
diff --git a/1080i/DialogSlider.xml b/1080i/DialogSlider.xml
index a2b62a8..ec7580c 100644
--- a/1080i/DialogSlider.xml
+++ b/1080i/DialogSlider.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">11</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <control type="group">
             <posx>col-19-begin</posx>
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index a24086e..2dad564 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol>160</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <controls>
         <control type="image">
             <posx>0</posx>
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index 7262c1d..4f65d52 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">8000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+
     <include condition="skin.string(showcast,false)">fadeInOut</include>
     <onunload>Skin.Reset(showcast)</onunload>
     <onunload condition="skin.string(showcast,true)">action(info)</onunload>
@@ -116,7 +116,7 @@
                 <content>
                     <item>
                         <label>$LOCALIZE[562]</label>
-                        <label2>$INFO[ListItem.year]</label2>
+                        <label2>$INFO[ListItem.year] $INFO[ListItem.dbid]</label2>
                         <thumb>-</thumb>
                         <onclick>noop</onclick>
                     </item>
diff --git a/1080i/DialogVolumeBar.xml b/1080i/DialogVolumeBar.xml
index c1b4eb0..fb4eb9d 100644
--- a/1080i/DialogVolumeBar.xml
+++ b/1080i/DialogVolumeBar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">-</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <control type="group">
             <posx>col-19-begin</posx>
diff --git a/1080i/DialogYesNo.xml b/1080i/DialogYesNo.xml
index f5f833e..f2e2957 100644
--- a/1080i/DialogYesNo.xml
+++ b/1080i/DialogYesNo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9001</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <include>fadeInOut</include>
     <controls>
         <include>modalDialog</include>
diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml
index e249c0a..4700ffc 100644
--- a/1080i/FileBrowser.xml
+++ b/1080i/FileBrowser.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">450</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <include>fadeInOut</include>
     <controls>
         <!--background-->
diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml
index 4e2247b..b3bb0a9 100644
--- a/1080i/FileManager.xml
+++ b/1080i/FileManager.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">20</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <include>fadeInOut</include>
     <controls>
         <include>globalBackground</include>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 6ba9866..506340a 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window id="0">
     <defaultcontrol always="true">9000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
     <onload>Skin.Reset(keepMusicMenuActive)</onload>
     <animation effect="fade" start="100" end="0" time="250">WindowClose</animation>
@@ -115,9 +115,8 @@
                         <label>31001</label>
                         <label2></label2>
                         <thumb>-</thumb>
-                        <onclick condition="!Library.HasContent(Music)">ActivateWindow(MusicFiles,root)</onclick>
+                        <onclick>ActivateWindow(musiclibrary)</onclick>
                         <onclick condition="!Library.HasContent(Music)">Skin.SetString(showRecentMusicItems,false)</onclick>
-                        <onclick condition="Library.HasContent(Music)">ActivateWindow(musiclibrary)</onclick>
                         <onclick condition="Library.HasContent(Music)">Skin.SetString(showRecentMusicItems,true)</onclick>
                     </item>
                     <item id="3">
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 1189e28..9ff8b06 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -15,8 +15,10 @@
     <include file="View_Episodes.xml"/>
     <include file="View_Movies.xml"/>
     <include file="View_TVShows.xml"/>
-    <include file="View_Addons.xml"/>
-    <include file="View_Files.xml"/>
+    <include file="View_VideoAddons.xml"/>
+    <include file="View_MusicAddons.xml"/>
+    <include file="View_MusicGenres.xml"/>
+    <include file="View_VideoFiles.xml"/>
     <include file="View_Photos.xml"/>
     <include file="View_Artists.xml"/>
     <include file="View_Albums.xml"/>
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index 4f329e5..8933e95 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -51,7 +51,7 @@
                 </control>
                 <!--music-->
                 <control type="label">
-                    <visible>window.isactive(musiclibrary) | window.isactive(musicfiles) | window.isactive(musicplaylist) | window.isactive(radiochannels)</visible>
+                    <visible>window.isactive(musiclibrary) | window.isactive(musicplaylist) | window.isactive(radiochannels)</visible>
                     <posx>col-1-begin</posx>
                     <posy>row-1-begin</posy>
                     <width>1-col</width>
@@ -122,7 +122,7 @@
                     </control>
                 </focusedlayout>
                 <include condition="Window.isactive(videolibrary) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)">videoMenu</include>
-                <include condition="window.isactive(musiclibrary) | window.isactive(musicfiles) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicMenu</include>
+                <include condition="window.isactive(musiclibrary) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicMenu</include>
                 <include condition="Window.isactive(pictures)">picturesMenu</include>
             </control>
         </control>
@@ -171,7 +171,7 @@
                 </control>
                 <!--music-->
                 <control type="label">
-                    <visible>window.isactive(musiclibrary) | window.isactive(musicfiles) | window.isactive(musicplaylist) | window.isactive(radiochannels)</visible>
+                    <visible>window.isactive(musiclibrary) | window.isactive(musicplaylist) | window.isactive(radiochannels)</visible>
                     <posx>col-1-begin</posx>
                     <posy>row-1-begin</posy>
                     <width>1-col</width>
@@ -207,7 +207,7 @@
                 <onup>9002</onup>
                 <ondown>9002</ondown>
                 <include condition="Window.isactive(videolibrary) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)">videoSideMenu</include>
-                <include condition="window.isactive(musiclibrary) | window.isactive(musicfiles) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include>
+                <include condition="window.isactive(musiclibrary) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include>
                 <include condition="window.isactive(pictures)">picturesSideMenu</include>
             </control>
         </control>
diff --git a/1080i/Includes_hubMenuItems.xml b/1080i/Includes_hubMenuItems.xml
index b873499..26722c8 100644
--- a/1080i/Includes_hubMenuItems.xml
+++ b/1080i/Includes_hubMenuItems.xml
@@ -225,7 +225,7 @@
                 <label>133</label>
                 <label2/>
                 <onclick>replaceWindow(musiclibrary,musicdb://artists)</onclick>
-                <onclick>Control.SetFocus(53)</onclick>
+                <onclick>Control.SetFocus(50)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
             </item>
             <item>
@@ -233,7 +233,7 @@
                 <label>132</label>
                 <label2/>
                 <onclick>replaceWindow(musiclibrary,musicdb://albums)</onclick>
-                <onclick>Control.SetFocus(55)</onclick>
+                <onclick>Control.SetFocus(50)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
             </item>
             <item>
@@ -241,7 +241,7 @@
                 <label>135</label>
                 <label2/>
                 <onclick>ReplaceWindow(MusicLibrary,musicdb://genres)</onclick>
-                <onclick>Control.SetFocus(53)</onclick>
+                <onclick>Control.SetFocus(50)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
             </item>
             <item>
@@ -257,8 +257,8 @@
                 <visible/>
                 <label>136</label>
                 <label2/>
-                <onclick>ReplaceWindow(MusicFiles,special://musicplaylists/)</onclick>
-                <onclick>Control.SetFocus(51)</onclick>
+                <onclick>ReplaceWindow(MusicLibrary,special://musicplaylists/)</onclick>
+                <onclick>Control.SetFocus(50)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
             </item>
             <!--custom music addons-->
@@ -268,11 +268,10 @@
                 <onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioAddon)">ActivateWindow(musiclibrary)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon1)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon1)],return)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioAddon)">setfocus(51)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioPlaylist)">setfocus(56)</onclick>
+                <onclick>setfocus(50)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon2))</visible>
@@ -280,11 +279,10 @@
                 <onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
                 <onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioAddon)">ActivateWindow(musiclibrary)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon2)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon2)],return)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioAddon)">setfocus(51)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioPlaylist)">setfocus(56)</onclick>
+                <onclick>setfocus(50)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon3))</visible>
@@ -292,12 +290,11 @@
                 <onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioAddon)">ActivateWindow(musiclibrary)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon3)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon3)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioAddon)">setfocus(51)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioPlaylist)">setfocus(56)</onclick>
+                <onclick>setfocus(50)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon4))</visible>
@@ -305,12 +302,11 @@
                 <onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioAddon)">ActivateWindow(musiclibrary)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon4)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon4)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioAddon)">setfocus(51)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioPlaylist)">setfocus(56)</onclick>
+                <onclick>setfocus(50)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon5))</visible>
@@ -318,12 +314,11 @@
                 <onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioAddon)">ActivateWindow(musiclibrary)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon5)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon5)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioAddon)">setfocus(51)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioPlaylist)">setfocus(56)</onclick>
+                <onclick>setfocus(50)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon6))</visible>
@@ -331,12 +326,11 @@
                 <onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioAddon)">ActivateWindow(musiclibrary)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon6)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon6)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioAddon)">setfocus(51)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioPlaylist)">setfocus(56)</onclick>
+                <onclick>setfocus(50)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon7))</visible>
@@ -344,12 +338,11 @@
                 <onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioAddon)">ActivateWindow(musiclibrary)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon7)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon7)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioAddon)">setfocus(51)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioPlaylist)">setfocus(56)</onclick>
+                <onclick>setfocus(50)</onclick>
             </item>
             <item>
                 <visible>!isempty(Skin.String(customMusicAddon8))</visible>
@@ -357,20 +350,19 @@
                 <onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
+                <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioAddon)">ActivateWindow(musiclibrary)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon8)])</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon8)],return)</onclick>
                 <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioPlaylist)">PlayerControl(play)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioAddon)">setfocus(51)</onclick>
-                <onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioPlaylist)">setfocus(56)</onclick>
+                <onclick>setfocus(50)</onclick>
             </item>
             <!--final bits and bobs-->
             <item>
                 <visible/>
                 <label>31010</label>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
-                <onclick>ReplaceWindow(MusicFiles,Addons,return)</onclick>
-                <onclick>setfocus(59)</onclick>
+                <onclick>ReplaceWindow(MusicLibrary,Addons,return)</onclick>
+                <onclick>setfocus(50)</onclick>
             </item>
             <item>
                 <visible/>
@@ -381,10 +373,9 @@
             <item>
                 <visible/>
                 <label>1214</label>
-                <onclick>replaceWindow(musiclibrary,musicdb://albums)</onclick>
-                <onclick>ActivateWindow(MusicFiles,root)</onclick>
                 <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
-                <onclick>Control.SetFocus(51)</onclick>
+                <onclick>ActivateWindow(Music,Files)</onclick>
+                <onclick>Control.SetFocus(50)</onclick>
             </item>
         </content>
     </include>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index e8439e5..2503b89 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -16,24 +16,34 @@
     <!--folder titles-->
     <variable name="listTitle">
         <value condition="Window.IsActive(videolibrary) + SubString(skin.string(showRecentVideoItems),true)">$LOCALIZE[31012]</value>
+        <value condition="Window.IsActive(videolibrary) + Substring(Container.folderpath,plugin)">$INFO[container.foldername] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[31011] ,]</value>
+        <value condition="Window.IsActive(videolibrary) + Container.Content(movies)">$LOCALIZE[20342] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
+        <value condition="Window.IsActive(videolibrary) + [Container.Content(seasons) | Container.Content(tvshows) | Container.Content(episodes)]">$LOCALIZE[20343] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
+
+
         <value condition="Window.IsActive(musiclibrary) + SubString(skin.string(showRecentMusicItems),true)">$LOCALIZE[31053]</value>
-        <value condition="Window.IsActive(musicfiles) + SubString(container.foldername,add-ons)">$LOCALIZE[31058]</value>
-        <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] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[31011] ,]</value>
-        <value condition="Container.Content(movies)">$LOCALIZE[20342] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
-        <value condition="Container.Content(seasons) | Container.Content(tvshows) | Container.Content(episodes)">$LOCALIZE[20343] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
-        <value condition="Container.Content(addons)">$LOCALIZE[31010]</value>
-        <value condition="Container.Content(albums) + !SubString(container.foldername,Albums)">$LOCALIZE[31037] [COLOR highlight]$INFO[container.foldername][/COLOR]</value>
-        <value condition="Container.Content(songs)">$LOCALIZE[31182]</value>
-        <value condition="!isEmpty(container.foldername)">$INFO[container.foldername]</value>
-        <value>$LOCALIZE[14022]</value>
+        <value condition="Window.IsActive(musiclibrary) + SubString(container.folderpath,addons://)">$LOCALIZE[31058]</value>
+        <value condition="Window.IsActive(musiclibrary) + SubString(container.folderpath,plugin://)">$INFO[container.foldername]</value>
+        <value condition="Window.IsActive(musiclibrary) + Container.Content(albums) + !SubString(container.folderpath,musicdb://albums)">$LOCALIZE[31037] [COLOR highlight]$INFO[container.foldername][/COLOR]</value>
+        <value condition="Window.IsActive(musiclibrary) + Container.Content(songs)">$LOCALIZE[31182]</value>
+        <value condition="Window.IsActive(musiclibrary) + !container.content(genres) + SubString(container.folderpath,musicdb://genres)">$LOCALIZE[31199] [COLOR highlight]$INFO[container.foldername][/COLOR]</value>
+
+
+        <value condition="Window.IsActive(musiclibrary) + !isEmpty(container.foldername)">$INFO[container.foldername]</value>
+        <value condition="Window.IsActive(musiclibrary) + isEmpty(container.foldername)">$LOCALIZE[31012]</value>
+
+
+        <!--
+
+        <value condition="Window.IsActive(musiclibrary) + SubString(container.foldername,playlists)">$LOCALIZE[20011]</value>
+-->
+
     </variable>
     <variable name="listSubTitle">
         <value condition="Window.IsActive(videolibrary) + SubString(skin.string(showRecentVideoItems),false)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
         <value condition="Window.IsActive(videolibrary) + SubString(skin.string(showRecentVideoItems),true)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
         <value condition="Window.IsActive(musiclibrary) + SubString(skin.string(showRecentMusicItems),true)">$INFO[Window(Home).Property(Music.AlbumsCount)] $LOCALIZE[31037]</value>
-        <value condition="[Window.IsActive(musiclibrary) | Window.IsActive(musicfiles)]">$INFO[container.Numitems,, $LOCALIZE[31014]]</value>
+        <value condition="Window.IsActive(musiclibrary)">$INFO[container.Numitems,, $LOCALIZE[31014]]</value>
     </variable>
     <!--list view item detail / subheader-->
     <variable name="itemDetail">
diff --git a/1080i/LockSettings.xml b/1080i/LockSettings.xml
index 7ccc1e0..4c3a268 100644
--- a/1080i/LockSettings.xml
+++ b/1080i/LockSettings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">5</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <!--background-->
         <include>globalBackground</include>
diff --git a/1080i/LoginScreen.xml b/1080i/LoginScreen.xml
index b96d296..d3bb9dc 100644
--- a/1080i/LoginScreen.xml
+++ b/1080i/LoginScreen.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">52</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <include>globalBackground</include>
         <control type="image">
diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index 8208410..301a5c2 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="false">9000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+
     <onload condition="window.previous(0)">setfocus(9000)</onload>
     <previouswindow>home</previouswindow>
     <controls>
@@ -22,16 +22,19 @@
             <control type="group" id="9999">
                 <!--recent items-->
                 <control type="group">
-                    <visible>SubString(skin.string(showRecentMusicItems),true) | isEmpty(container.foldername)</visible>
+                    <visible>Library.HasContent(Music) + SubString(skin.string(showRecentMusicItems),true)</visible>
                     <onleft>9000</onleft>
                     <include>musicRecentItems</include>
                 </control>
                 <!--source content-->
                 <control type="group" id="9500">
-                    <visible>SubString(skin.string(showRecentMusicItems),false) | !skin.string(showRecentMusicItems)</visible>
+                    <visible>skin.string(showRecentMusicItems) + SubString(skin.string(showRecentMusicItems),false)</visible>
                     <include>artist</include>
                     <include>album</include>
                     <include>song</include>
+                    <include>musicgenre</include>
+                    <include>musicfiles</include>
+                    <include>musicaddons</include>
                 </control>
             </control>
 
diff --git a/1080i/MyMusicPlaylist.xml b/1080i/MyMusicPlaylist.xml
index dff5a24..1657ad0 100644
--- a/1080i/MyMusicPlaylist.xml
+++ b/1080i/MyMusicPlaylist.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9999</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <previouswindow>home</previouswindow>
     <controls>
         <include>globalBackground</include>
diff --git a/1080i/MyMusicPlaylistEditor.xml b/1080i/MyMusicPlaylistEditor.xml
index 40c3f24..338b50d 100644
--- a/1080i/MyMusicPlaylistEditor.xml
+++ b/1080i/MyMusicPlaylistEditor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol allways="true">50</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <include>globalBackground</include>
         <control type="group">
diff --git a/1080i/MyMusicSongs.xml b/1080i/MyMusicSongs.xml
deleted file mode 100644
index b72821e..0000000
--- a/1080i/MyMusicSongs.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-    <defaultcontrol always="false">9000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
-    <onunload>Skin.SetString(showRecentMusicItems,true)</onunload>
-    <previouswindow>home</previouswindow>
-    <controls>
-
-        <include>globalBackground</include>
-
-        <!--page container group-->
-        <control type="group">
-
-            <!--window fader-->
-            <animation type="conditional" condition="window.next(0) | window.next(1)">
-                <effect type="fade" start="100" end="0" time="300"/>
-            </animation>
-            <!--shift page for certain modal dialogs-->
-            <include>modalDialogContentShift</include>
-
-            <!--Main content listing-->
-            <control type="group" id="9999">
-                <animation type="windowopen">
-                    <include>listSlideIn</include>
-                </animation>
-                <animation type="windowclose">
-                    <effect type="fade" start="100" end="0" time="300" delay="300"/>
-                </animation>
-                <!--source content-->
-                <control type="group" id="9500">
-
-                    <include>musicfiles</include>
-                    <include>addons</include>
-                </control>
-            </control>
-
-            <!--page scrollbar-->
-            <control type="group" id="8000">
-                <visible>Control.IsVisible(60)</visible>
-                <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
-                <control type="scrollbar" id="60">
-                    <posx>108r</posx>
-                    <posy>276</posy>
-                    <height>672</height>
-                    <onleft>9999</onleft>
-                </control>
-            </control>
-
-            <!--Folder titles-->
-            <control type="group">
-                <posx>0</posx>
-                <posy>0</posy>
-                <animation type="Conditional" condition="IntegerGreaterThan(container.numitems,0)">
-                    <effect type="fade" start="0" end="100" time="300"/>
-                </animation>
-                <!--source title-->
-                <control type="label">
-                    <posx>col-1-begin</posx>
-                    <posy>row-1-begin</posy>
-                    <width>14-col</width>
-                    <font>pageTitle</font>
-                    <label>$VAR[listTitle]</label>
-                    <textcolor>textActive</textcolor>
-                </control>
-                <!--source subtitle-->
-                <control type="label">
-                    <posx>col-1-begin</posx>
-                    <posy>96</posy>
-                    <width>auto</width>
-                    <font>pageSubTitle</font>
-                    <label>$VAR[listSubTitle]</label>
-                    <textcolor>textActive</textcolor>
-                </control>
-                <!--dateTime-->
-                <include>dateTime</include>
-            </control>
-        </control>
-        <!--hub menu-->
-        <include>hubMenu</include>
-        <!--loading indicator-->
-        <include>loadingIndicator</include>
-        <!--debugging-->
-        <include>DebugGrid</include>
-        <control type="label">
-            <include>WindowID</include>
-            <label>MyMusicSongs.xml</label>
-        </control>
-    </controls>
-</window>
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index 4796021..9b9adc1 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="false">9999</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
     <controls>
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 5db5bbe..7092f9a 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -2,7 +2,7 @@
 <window>
     <views>10</views>
     <defaultcontrol always="false">9999</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
     <controls>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 418b2da..94a0dd5 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="false">9999</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
     <controls>
diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml
index e4c1cd1..8fed25e 100644
--- a/1080i/MyPics.xml
+++ b/1080i/MyPics.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <previouswindow>home</previouswindow>
     <controls>
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index 053b933..88b4ce8 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9999</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <include>fadeInOut</include>
     <controls>
         <!--page container group-->
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 7ee3b15..78bf661 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="false">9000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+
     <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <onload condition="window.previous(0)">setfocus(9000)</onload>
     <previouswindow>home</previouswindow>
@@ -25,7 +25,7 @@
                 </animation>
                 <!--recent items-->
                 <control type="group">
-                    <visible>SubString(skin.string(showRecentVideoItems),true) | isEmpty(container.foldername)</visible>
+                    <visible>Library.HasContent(Video) + [SubString(skin.string(showRecentVideoItems),true) | isEmpty(container.foldername)]</visible>
                     <onleft>9000</onleft>
                     <!--content-->
                     <include>videoRecentItems</include>
@@ -37,8 +37,8 @@
                     <include>tvshows</include>
                     <include>seasons</include>
                     <include>episodes</include>
-                    <include>addons</include>
-                    <include>files</include>
+                    <include>videoaddons</include>
+                    <include>videofiles</include>
                 </control>
             </control>
 
diff --git a/1080i/MyVideoPlaylist.xml b/1080i/MyVideoPlaylist.xml
index 82a8e3f..d711ebc 100644
--- a/1080i/MyVideoPlaylist.xml
+++ b/1080i/MyVideoPlaylist.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="false">9000</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <previouswindow>videolibrary</previouswindow>
     <controls>
         <include>globalBackground</include>
diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml
index 8576838..121e2a9 100644
--- a/1080i/MyWeather.xml
+++ b/1080i/MyWeather.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">3</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <include>fadeInOut</include>
         <!--background-->
diff --git a/1080i/ProfileSettings.xml b/1080i/ProfileSettings.xml
index 8c2e7d7..cf48d1a 100644
--- a/1080i/ProfileSettings.xml
+++ b/1080i/ProfileSettings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">6000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <!--background-->
         <control type="group">
diff --git a/1080i/Settings.xml b/1080i/Settings.xml
index 401ae0d..5c5563c 100644
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <!--background-->
         <include>globalBackground</include>
diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml
index 805a33f..84cee9d 100644
--- a/1080i/SettingsCategory.xml
+++ b/1080i/SettingsCategory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">3</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <!--background-->
         <include>globalBackground</include>
diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml
index ac82723..31fa724 100644
--- a/1080i/SettingsProfile.xml
+++ b/1080i/SettingsProfile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">4</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <!--background-->
         <include>globalBackground</include>
diff --git a/1080i/SettingsScreenCalibration.xml b/1080i/SettingsScreenCalibration.xml
index fec3834..597af95 100644
--- a/1080i/SettingsScreenCalibration.xml
+++ b/1080i/SettingsScreenCalibration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">8</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <control type="videowindow" id="20">
             <description>videowindow</description>
diff --git a/1080i/SettingsSystemInfo.xml b/1080i/SettingsSystemInfo.xml
index 4a0c1af..91b036f 100644
--- a/1080i/SettingsSystemInfo.xml
+++ b/1080i/SettingsSystemInfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">95</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <include>fadeInOut</include>
     <controls>
         <!--background-->
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index e3ad396..748ad11 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">8000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <!--background-->
         <include>globalBackground</include>
diff --git a/1080i/SmartPlaylistEditor.xml b/1080i/SmartPlaylistEditor.xml
index 3456da9..4b3a6fe 100644
--- a/1080i/SmartPlaylistEditor.xml
+++ b/1080i/SmartPlaylistEditor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">22</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <controls>
         <include>globalBackground</include>
         <control type="group">
diff --git a/1080i/SmartPlaylistRule.xml b/1080i/SmartPlaylistRule.xml
index 08d5e21..80b6742 100644
--- a/1080i/SmartPlaylistRule.xml
+++ b/1080i/SmartPlaylistRule.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">15</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <include>fadeInOut</include>
     <controls>
          <control type="image">
diff --git a/1080i/Startup.xml b/1080i/Startup.xml
index 82544b4..c2c399c 100644
--- a/1080i/Startup.xml
+++ b/1080i/Startup.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">10</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <onload>Skin.Reset(DebugInfo)</onload>
     <onload>Skin.Reset(DebugGrid)</onload>
     <onload condition="!Skin.String(homeBackground)">Skin.SetString(homeBackground,special://skin/extras/backgrounds/background001.jpg)</onload>
diff --git a/1080i/VideoOSDBookmarks.xml b/1080i/VideoOSDBookmarks.xml
index 3b7d23b..db4cd0f 100644
--- a/1080i/VideoOSDBookmarks.xml
+++ b/1080i/VideoOSDBookmarks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">9000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <control type="image">
             <posx>0</posx>
diff --git a/1080i/VideoOSDSettings.xml b/1080i/VideoOSDSettings.xml
index f50a842..b70f803 100644
--- a/1080i/VideoOSDSettings.xml
+++ b/1080i/VideoOSDSettings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">5</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <include>fadeInOut</include>
     <controls>
         <control type="image">
diff --git a/1080i/VideoOverlay.xml b/1080i/VideoOverlay.xml
deleted file mode 100644
index 36a7b8d..0000000
--- a/1080i/VideoOverlay.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-    <!--Removed - redundant-->
-    <defaultcontrol>-</defaultcontrol>
-    <controls/>
-</window>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 6c3538c..859f1e7 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -5,7 +5,7 @@
 
         <!--fanart-->
         <control type="group">
-            <visible>container.content(albums)</visible>
+            <visible>container.content(albums) + !container.content(songs)</visible>
             <control type="image">
                 <include>dimensionsFullscreen</include>
                 <aspectratio scalediffuse="false">stretch</aspectratio>
@@ -20,16 +20,16 @@
             </control>
         </control>
 
-        <control type="panel" id="55">
-            <visible>container.content(albums) | container.content(addons)</visible>
+        <control type="panel" id="50">
+            <visible>container.content(albums) + !container.content(songs)</visible>
             <posx>78</posx>
             <posy>row-5-begin</posy>
             <width>1800</width>
             <height>23-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
-            <ondown>55</ondown>
-            <onup>55</onup>
+            <ondown>50</ondown>
+            <onup>50</onup>
             <pagecontrol>60</pagecontrol>
             <itemlayout width="300" height="300">
                 <control type="image">
diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml
index c41cadc..c9adbbd 100644
--- a/1080i/View_Artists.xml
+++ b/1080i/View_Artists.xml
@@ -2,16 +2,33 @@
 <includes>
     <!--Artist browser-->
     <include name="artist">
-        <control type="panel" id="53">
-            <visible>container.content(artists) | container.content(genres)</visible>
+        <!--fanart-->
+        <control type="group">
+            <visible>container.content(artists) + !container.content(songs) + !container.content(albums)</visible>
+            <control type="image">
+                <include>dimensionsFullscreen</include>
+                <aspectratio scalediffuse="false">stretch</aspectratio>
+                <texture background="true" border="0">$INFO[Listitem.art(fanart)]</texture>
+                <fadetime>500</fadetime>
+                <colordiffuse>22ffffff</colordiffuse>
+            </control>
+            <control type="image">
+                <texture>vignette.png</texture>
+                <colordiffuse>ffffffff</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+        </control>
+
+        <control type="panel" id="50">
+            <visible>container.content(artists) + !container.content(songs) + !container.content(albums)</visible>
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
             <width>24-col</width>
             <height>23-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
-            <ondown>53</ondown>
-            <onup>53</onup>
+            <ondown>50</ondown>
+            <onup>50</onup>
             <pagecontrol>60</pagecontrol>
             <itemlayout width="8-col" height="2-row">
                 <control type="image">
diff --git a/1080i/View_MusicAddons.xml b/1080i/View_MusicAddons.xml
new file mode 100644
index 0000000..c8c603e
--- /dev/null
+++ b/1080i/View_MusicAddons.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+    <include name="musicaddons">
+        <control type="panel" id="50">
+            <visible>Substring(Container.folderpath,addons://sources/audio)</visible>
+            <posx>78</posx>
+            <posy>row-5-begin</posy>
+            <width>1800</width>
+            <height>23-row</height>
+            <onleft>9000</onleft>
+            <onright>60</onright>
+            <ondown>50</ondown>
+            <onup>50</onup>
+            <pagecontrol>60</pagecontrol>
+            <itemlayout width="300" height="300">
+                <control type="image">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>4-col-gutter</width>
+                    <height>4-col-gutter</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture border="3">colors/black.png</texture>
+                    <bordertexture colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                    <bordersize>3</bordersize>
+                    <colordiffuse>textboxInactive</colordiffuse>
+                </control>
+                <control type="label">
+                    <visible>!controlgroup(9000).hasfocus</visible>
+                    <posx>12</posx>
+                    <posy>2-row</posy>
+                    <width>240</width>
+                    <height>2-row</height>
+                    <align>center</align>
+                    <aligny>center</aligny>
+                    <font>regularStrong</font>
+                    <textcolor>disabled</textcolor>
+                    <label>$INFO[ListItem.label]</label>
+                </control>
+                <control type="label">
+                    <visible>!controlgroup(9000).hasfocus</visible>
+                    <posx>12</posx>
+                    <posy>3-row</posy>
+                    <width>240</width>
+                    <height>2-row</height>
+                    <align>center</align>
+                    <aligny>center</aligny>
+                    <font>buttonTitle</font>
+                    <textcolor>disabled</textcolor>
+                    <label>$INFO[ListItem.Property(Addon.Summary)]</label>
+                </control>
+                <control type="image">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>4-col-gutter</width>
+                    <height>4-col-gutter</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture border="0">$INFO[Listitem.thumb]</texture>
+                    <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                    <bordersize>3</bordersize>
+                    <colordiffuse>ffFFFFFF</colordiffuse>
+                </control>
+            </itemlayout>
+            <focusedlayout width="4-col" height="4-col">
+                <control type="group">
+                    <animation type="focus" loop="false" reversible="false">
+                        <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"/>
+                        <effect type="zoom" start="95" end="110" center="auto" tween="back" easing="out" time="300"/>
+                    </animation>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>4-col-gutter</width>
+                        <height>4-col-gutter</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <bordertexture border="3" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
+                        <bordersize>3</bordersize>
+                        <colordiffuse>ff666666</colordiffuse>
+                    </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>2-row</posy>
+                        <width>240</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>regularStrong</font>
+                        <textcolor>textActive</textcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>3-row</posy>
+                        <width>240</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <label>$INFO[ListItem.Property(Addon.Summary)]</label>
+                    </control>
+                    <control type="grouplist">
+                        <posx>42</posx>
+                        <posy>5-row</posy>
+                        <width>4-col-gutter</width>
+                        <orientation>horizontal</orientation>
+                        <control type="label">
+                            <width>24</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>symbol</font>
+                            <textcolor>textActive</textcolor>
+                            <label></label>
+                        </control>
+                        <control type="label">
+                            <width>1-col</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>smallStrong</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$LOCALIZE[31185]</label>
+                        </control>
+                        <control type="label">
+                            <width>24</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>symbol</font>
+                            <textcolor>textActive</textcolor>
+                            <label></label>
+                        </control>
+                        <control type="label">
+                            <width>1-col</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>smallStrong</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$LOCALIZE[31184]</label>
+                        </control>
+                    </control>
+                </control>
+            </focusedlayout>
+        </control>
+    </include>
+</includes>
diff --git a/1080i/View_MusicFiles.xml b/1080i/View_MusicFiles.xml
index 356ea8f..532aa19 100644
--- a/1080i/View_MusicFiles.xml
+++ b/1080i/View_MusicFiles.xml
@@ -5,16 +5,16 @@
         <control type="group">
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
-            <control type="panel" id="51">
-                <visible>!control.isvisible(9998) + !container.content(artists) + !container.content(genres) + !container.content(albums) + !container.content(addons)</visible>
+            <control type="panel" id="50">
+                <visible>!Substring(Container.folderpath,addons://sources/audio) + !isempty(container.folderpath)</visible>
                 <posx>0</posx>
                 <posy>0</posy>
                 <width>24-col</width>
                 <height>23-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
-                <ondown>51</ondown>
-                <onup>51</onup>
+                <ondown>50</ondown>
+                <onup>50</onup>
                 <pagecontrol>60</pagecontrol>
                 <itemlayout width="24-col" height="2-row">
                     <control type="image">
diff --git a/1080i/View_MusicGenres.xml b/1080i/View_MusicGenres.xml
new file mode 100644
index 0000000..23cf4c1
--- /dev/null
+++ b/1080i/View_MusicGenres.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+    <!--Music genre browser-->
+    <include name="musicgenre">
+        <control type="panel" id="50">
+            <visible>Substring(Container.folderpath,musicdb://genres) + !container.content(artists) + !container.content(songs) + !container.content(albums)</visible>
+            <posx>col-1-begin</posx>
+            <posy>row-5-begin</posy>
+            <width>24-col</width>
+            <height>23-row</height>
+            <onleft>9000</onleft>
+            <onright>60</onright>
+            <ondown>50</ondown>
+            <onup>50</onup>
+            <pagecontrol>60</pagecontrol>
+            <itemlayout width="8-col" height="2-row">
+                <control type="image">
+                    <posx>0</posx>
+                    <posy>3</posy>
+                    <width>66</width>
+                    <height>66</height>
+                    <aspectratio scalediffuse="false">stretch</aspectratio>
+                    <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                </control>
+                <control type="label">
+                    <posx>1-col-indent</posx>
+                    <posy>0</posy>
+                    <width>6-col</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
+                    <font>itemTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label>$INFO[ListItem.Label]</label>
+                </control>
+            </itemlayout>
+            <focusedlayout width="8-col" height="2-row">
+                <control type="image">
+                    <posx>1-col</posx>
+                    <posy>0</posy>
+                    <width>7-col-gutter</width>
+                    <height>2-row</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture>colors/white.png</texture>
+                    <colordiffuse>highlight</colordiffuse>
+                </control>
+                <control type="image">
+                    <posx>0</posx>
+                    <posy>3</posy>
+                    <width>66</width>
+                    <height>66</height>
+                    <aspectratio scalediffuse="false">stretch</aspectratio>
+                    <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                    <animation type="focus" loop="false" reversible="false">
+                        <effect type="fade" time="500"/>
+                        <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                    </animation>
+                </control>
+                <control type="label">
+                    <posx>1-col-indent</posx>
+                    <posy>0</posy>
+                    <width>6-col</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
+                    <font>itemTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label>$INFO[ListItem.Label]</label>
+                </control>
+            </focusedlayout>
+        </control>
+    </include>
+</includes>
\ No newline at end of file
diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml
index 1be07a5..0d40741 100644
--- a/1080i/View_MusicRecentItems.xml
+++ b/1080i/View_MusicRecentItems.xml
@@ -105,17 +105,17 @@
                 </focusedlayout>
                 <content>
                     <item id="1">
-                        <label>plugin://script.thedeadman.functions?type=recentalbums</label>
+                        <label>special://skin/extras/playlists/recentAlbums.xsp</label>
                         <property name="textTitle">31180</property>
                         <onclick>noop</onclick>
                     </item>
                     <item id="2">
-                        <label>plugin://script.thedeadman.functions?type=favouritealbums</label>
+                        <label>special://skin/extras/playlists/recentAlbums.xsp</label>
                         <property name="textTitle">31187</property>
                         <onclick>noop</onclick>
                     </item>
                     <item id="3">
-                        <label>plugin://script.thedeadman.functions?type=randomalbums</label>
+                        <label>special://skin/extras/playlists/recentAlbums.xsp</label>
                         <property name="textTitle">31181</property>
                         <onclick>noop</onclick>
                     </item>
@@ -132,6 +132,9 @@
                 <onleft>9000</onleft>
                 <onback>activateWindow(home)</onback>
                 <orientation>horizontal</orientation>
+                <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
+                <onclick>activatewindow(Musiclibrary,musicdb://albums/$INFO[listitem.DBID])</onclick>
+                <onclick>Control.SetFocus(50)</onclick>
                 <content>$INFO[control.getlabel(9123)]</content>
                 <itemlayout width="300" height="4-col">
                     <control type="image">
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index a374d34..0a604f7 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -3,7 +3,7 @@
     <!--Song browser-->
     <include name="song">
         <control type="group">
-            <visible>container.content(songs)</visible>
+            <visible>container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://)</visible>
             <control type="image">
                 <include>dimensionsFullscreen</include>
                 <aspectratio scalediffuse="false">stretch</aspectratio>
@@ -19,14 +19,14 @@
         </control>
 
         <control type="group">
-            <visible>container.content(songs)</visible>
+            <visible>container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://)</visible>
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
             <animation type="visible">
                 <include>listSlideIn</include>
             </animation>
             <animation type="hidden">
-                <effect type="fade" start="100" end="0" time="200"/>
+                <effect type="fade" start="100" end="0" time="0"/>
             </animation>
             <!--album thumb and info-->
             <control type="image">
@@ -44,7 +44,7 @@
         </control>
 
         <control type="group">
-            <visible>container.content(songs)</visible>
+            <visible>container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://)</visible>
             <control type="label">
                 <posx>col-10-begin</posx>
                 <posy>row-5-begin</posy>
@@ -67,16 +67,16 @@
             </control>
         </control>
 
-        <control type="panel" id="56">
-            <visible>container.content(songs)</visible>
+        <control type="panel" id="50">
+            <visible>container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://)</visible>
             <posx>col-10-begin</posx>
             <posy>row-9-begin</posy>
             <width>15-col</width>
             <height>19-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
-            <ondown>56</ondown>
-            <onup>56</onup>
+            <ondown>50</ondown>
+            <onup>50</onup>
             <pagecontrol>60</pagecontrol>
             <itemlayout width="15-col" height="2-row">
                 <control type="image">
@@ -167,7 +167,7 @@
                     <label>$INFO[ListItem.duration]</label>
                 </control>
             </itemlayout>
-            <focusedlayout width="15-col" height="1-row">
+            <focusedlayout width="15-col" height="2-row">
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
diff --git a/1080i/View_Addons.xml b/1080i/View_VideoAddons.xml
similarity index 99%
rename from 1080i/View_Addons.xml
rename to 1080i/View_VideoAddons.xml
index 37eea03..ad9ae9b 100644
--- a/1080i/View_Addons.xml
+++ b/1080i/View_VideoAddons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-    <include name="addons">
+    <include name="videoaddons">
 
         <control type="group">
             <visible>container.content(addons)</visible>
diff --git a/1080i/View_Files.xml b/1080i/View_VideoFiles.xml
similarity index 99%
rename from 1080i/View_Files.xml
rename to 1080i/View_VideoFiles.xml
index 5f923de..160a6cb 100644
--- a/1080i/View_Files.xml
+++ b/1080i/View_VideoFiles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-    <include name="files">
+    <include name="videofiles">
         <control type="panel" id="50">
             <visible>container.content(files) | StringCompare(container.foldername,files) | StringCompare(container.foldername,Video Playlists)</visible>
             <posx>col-1-begin</posx>
diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml
index da84b12..1b463cf 100644
--- a/1080i/View_VideoRecentItems.xml
+++ b/1080i/View_VideoRecentItems.xml
@@ -152,6 +152,7 @@
                 <onleft>9000</onleft>
                 <onback>activateWindow(home)</onback>
                 <orientation>horizontal</orientation>
+                <!--<oninfo>activatewindow(movieinformation,videodb://movies/titles/12)</oninfo>-->
                 <content>plugin://script.thedeadman.functions?type=$INFO[control.getlabel(9123)]</content>
                 <itemlayout width="228" height="312">
                     <control type="image">
diff --git a/1080i/custom_menuItemTypeSelector.xml b/1080i/custom_menuItemTypeSelector.xml
index 18da226..21022db 100644
--- a/1080i/custom_menuItemTypeSelector.xml
+++ b/1080i/custom_menuItemTypeSelector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="5000">
     <defaultcontrol always="true">6000</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <onload>Skin.Reset(menuItemType)</onload>
     <onload>Skin.SetString(currentAddonSourceSlot,$VAR[customAddonSourceSlot])</onload>
     <onload condition="stringcompare(skin.string(menuItemTypeFilter),video)">Skin.SetString(menuItemType,videoAddon)</onload>
diff --git a/1080i/custom_musicFullscreenDisabler.xml b/1080i/custom_musicFullscreenDisabler.xml
index 75ec8ac..91db327 100644
--- a/1080i/custom_musicFullscreenDisabler.xml
+++ b/1080i/custom_musicFullscreenDisabler.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="3002">
-    <allowoverlay>no</allowoverlay>
     <onload>Dialog.Close(all,true)</onload>
     <visible>Window.IsActive(5001) + !player.hasaudio</visible>
     <controls></controls>
diff --git a/1080i/MusicOverlay.xml b/1080i/custom_musicOverlay.xml
similarity index 93%
rename from 1080i/MusicOverlay.xml
rename to 1080i/custom_musicOverlay.xml
index d0218fd..9c2711c 100644
--- a/1080i/MusicOverlay.xml
+++ b/1080i/custom_musicOverlay.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<window>
-    <defaultcontrol always="true">2</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+<window type="dialog" id="3333">
+    <visible>player.hasaudio</visible>
     <controls>
         <control type="group">
             <posx>col-14-begin</posx>
@@ -62,9 +61,8 @@
         <!--debugging-->
         <include>DebugGrid</include>
         <control type="label">
-            <posy>0</posy>
             <include>DialogID</include>
-            <label>MusicOverlay.xml</label>
+            <label>custom_musicOverlay.xml</label>
         </control>
     </controls>
 </window>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 1b3111d..b5a9cff 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="5001">
     <defaultcontrol always="true">9876</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    
     <onload condition="Skin.HasSetting(artistSlideshowActive)">RunScript(script.artistslideshow)</onload>
     <onunload>activateWindow(MusicLibrary)</onunload>
     <onunload>Skin.SetString(showRecentMusicItems,true)</onunload>
diff --git a/1080i/custom_subtitleMenu.xml b/1080i/custom_subtitleMenu.xml
index 7bc3d4c..ab19339 100644
--- a/1080i/custom_subtitleMenu.xml
+++ b/1080i/custom_subtitleMenu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="5901">
     <defaultcontrol always="true">5000</defaultcontrol>
-    <allowoverlay>yes</allowoverlay>
+     
     <controls>
         <include>fadeInOut</include>
         <control type="group">
diff --git a/1080i/script-RCB-gameinfo.xml b/1080i/script-RCB-gameinfo.xml
index 8c1ec1d..1b1dde2 100644
--- a/1080i/script-RCB-gameinfo.xml
+++ b/1080i/script-RCB-gameinfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <window>
     <onload>control.setfocus(3000)</onload>
-    <allowoverlay>no</allowoverlay>
+    
     <include>fadeInOut</include>
     <controls>
         <control type="group">
diff --git a/1080i/script-Rom_Collection_Browser-main.xml b/1080i/script-Rom_Collection_Browser-main.xml
index 78d1cb2..50653d0 100644
--- a/1080i/script-Rom_Collection_Browser-main.xml
+++ b/1080i/script-Rom_Collection_Browser-main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <window>
-    <allowoverlay>no</allowoverlay>
+    
     <defaultcontrol always="true">500</defaultcontrol>
     <controls>
         <include>globalBackground</include>
diff --git a/1080i/script-globalsearch-main.xml b/1080i/script-globalsearch-main.xml
index 59bf1b0..1a2c374 100644
--- a/1080i/script-globalsearch-main.xml
+++ b/1080i/script-globalsearch-main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog">
-    <allowoverlay>no</allowoverlay>
+    
     <include>fadeInOut</include>
     <controls>
         <include>globalBackground</include>
diff --git a/addon.xml b/addon.xml
index d748feb..c207958 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.pellucid" version="0.8.0" name="Pellucid" provider-name="theDeadman">
+<addon id="skin.pellucid" version="0.9.0" name="Pellucid" provider-name="theDeadman">
     <requires>
-        <import addon="xbmc.gui" version="5.9.0"/>
+        <import addon="xbmc.gui" version="5.10.0"/>
         <import addon="script.globalsearch" version="1.1.1"/>
         <import addon="script.artistslideshow" version="1.5.0"/>
-        <import addon="script.thedeadman.functions" version="1.0.1"/>
     </requires>
     <extension point="xbmc.gui.skin" debugging="false">
         <res width="1920" height="1080" aspect="16:9" default="true" folder="1080i" />
diff --git a/changelog.txt b/changelog.txt
index a18df45..6dbcf8f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,20 @@
-[B]0.1.0[/B]
+[B]0.9.0[/B]
+
+***Working towards Kodi Jarvis***
+
+- [REMOVED DEPENDENCY] script.thedeadman.functions (Nice one team Kodi!)
+- [REMOVED] DialogPeripheralManager.xml
+- [REMOVED] DialogKaraokeSongSelector.xml
+- [REMOVED] DialogKaraokeSongSelectorLarge.xml
+- [REMOVED] MusicKaraokeLyrics.xml
+- [REMOVED] References to "allowoverlay" tag
+- [REMOVED] mymusicsongs.xml
+- [REMOVED] videooverlay.xml
+- [REMOVED] musicoverlay.xml
+- [NEW] custom_musicOverlay.xml
+
+
+[B]0.1.0[/B]
+- Initial Commit
+
 
-- Initial Commit
\ No newline at end of file
diff --git a/extras/playlists/recentAlbums.xsp b/extras/playlists/recentAlbums.xsp
new file mode 100644
index 0000000..9dde169
--- /dev/null
+++ b/extras/playlists/recentAlbums.xsp
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="albums">
+    <name>recentAlbums</name>
+    <match>all</match>
+    <limit>10</limit>
+    <order direction="ascending">random</order>
+</smartplaylist>
\ No newline at end of file
diff --git a/language/English/strings.po b/language/English/strings.po
index ba5816c..dc48813 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -61,6 +61,10 @@ msgctxt "#31008"
 msgid "Enable Artist Slideshow"
 msgstr ""
 
+msgctxt "#31009"
+msgid "Genres"
+msgstr ""
+
 msgctxt "#31010"
 msgid "Add-ons"
 msgstr ""
@@ -126,7 +130,7 @@ msgid "Enable Debug Info"
 msgstr ""
 
 msgctxt "#31037"
-msgid "Albums"
+msgid "Albums by"
 msgstr ""
 
 msgctxt "#31041"
@@ -525,6 +529,10 @@ msgctxt "#31198"
 msgid "unwatched"
 msgstr ""
 
+msgctxt "#31199"
+msgid "Artists in"
+msgstr ""
+
 msgctxt "#31201"
 msgid "Record Show"
 msgstr ""