diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index dfa5b1e..3cb66e1 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -47,7 +47,6 @@
                     <posy>84</posy>
                     <width>8-col</width>
                     <height>18-row</height>
-                    <onleft>activateWindow(contextmenu)</onleft>
                     <ondown>50</ondown>
                     <onup>50</onup>
                     <itemgap>0</itemgap>
@@ -132,8 +131,7 @@
                     <posy>84</posy>
                     <width>12-col</width>
                     <height>710</height>
-                    <onleft>activateWindow(contextmenu)</onleft>
-                    <onright>60</onright>
+                    <onleft>60</onleft>
                     <ondown>51</ondown>
                     <onup>51</onup>
                     <pagecontrol>60</pagecontrol>
@@ -180,10 +178,10 @@
                     <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>1420</posx>
+                        <posx>496</posx>
                         <posy>row-11-begin</posy>
                         <height>10-row</height>
-                        <onleft>50</onleft>
+                        <onright>50</onright>
                         <onback>50</onback>
                     </control>
                 </control>
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index 16d7e5c..50fea79 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -54,9 +54,9 @@
 	                <visible>Control.IsVisible(60)</visible>
 	                <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8001).hasfocus">conditional</animation>
 	                <control type="scrollbar" id="60">
-	                    <posx>-30</posx>
-	                    <posy>2-row</posy>
-	                    <height>18-row</height>
+	                    <posx>-36</posx>
+	                    <posy>5-row</posy>
+	                    <height>11-row</height>
 	                    <onright>9000</onright>
 	                </control>
 	            </control>
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index 305dfd8..de377a8 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -14,7 +14,7 @@
                 <width>1464</width>
                 <height>23-row</height>
                 <texture border="24">dialogBackground.png</texture>
-                <colordiffuse>overlay</colordiffuse>
+                <colordiffuse>99000000</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
 			<control type="image">
diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml
index 92ebfe8..1f21909 100644
--- a/1080i/FileBrowser.xml
+++ b/1080i/FileBrowser.xml
@@ -47,9 +47,9 @@
                 <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>-24</posx>
-                    <posy>2-row</posy>
-                    <height>20-row</height>
+                    <posx>-36</posx>
+                    <posy>6-row</posy>
+                    <height>11-row</height>
                     <onright>450</onright>
                     <onback>450</onback>
                 </control>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 959ccc5..a630291 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -2,10 +2,11 @@
 <window id="0">
 	<defaultcontrol always="true">9000</defaultcontrol>
 	<include>fadeInOut</include>
-    <onload>PlayMedia(special://skin/extras/playlists/homeBackground.xsp,1)</onload>
+    <onload condition="!String.IsEmpty(Skin.String(homeBackgroundVideos)) + System.AddonIsEnabled(script.randomvideo)">Runscript(script.randomvideo,dir=$INFO[Skin.String(homeBackgroundVideos)])</onload>
 	<onload>AlarmClock(hidemenu,setfocus(9999),00:20,true)</onload>
 	<onunload>CancelAlarm(hidemenu,true)</onunload>
     <onunload>Playercontrol(stop)</onunload>
+    <onunload>Playlist.Clear</onunload>
 	<controls>
 		<include>globalBackground</include>
         
@@ -18,6 +19,7 @@
 	           <aspectratio>stretch</aspectratio>
 	       </control>
 			<control type="multiimage">
+                <visible>!player.hasvideo</visible>
 				<animation effect="fade" start="0" end="100" time="1000">WindowOpen</animation>
 				<include>dimensionsFullscreen</include>
 				<imagepath>$VAR[homeBackgroundLocation]</imagepath>
@@ -31,7 +33,11 @@
 			</control>
             <!--video window-->
             <control type="videowindow">
-                <include>dimensionsFullScreen</include>
+                <left>0</left>
+                <top>0</top>
+                <width>fullscreenWidth</width>
+                <height>fullscreenHeight</height>
+                <aspectratio>scale</aspectratio>
             </control>
 			<control type="image">
 				<include>dimensionsFullscreen</include>
diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index 760175f..f103641 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -35,9 +35,7 @@
                     <include>musicgenre</include>
                     <include>musicartistcatalogue</include>
                     <include>musicartist</include>
-					<include>musicspotifyartist</include>
                     <include>musicalbum</include>
-					<include>musicspotifyalbum</include>
                     <include>musicsongs</include>
                     <include>musicPlayList</include>
                 </control>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 050ea4e..2f6c8c2 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -103,12 +103,12 @@
                 <itemgap>0</itemgap>
                 <orientation>vertical</orientation>
                 <control type="button" id="2">
-                    <visible>Container(8000).Hasfocus(1)</visible>
+                    <visible>Container(8000).Hasfocus(1) + String.IsEmpty(Skin.String(homeBackground))</visible>
                     <description>Set home background image directory</description>
                     <width>14-col</width>
                     <align>left</align>
                     <textoffsetx>24</textoffsetx>
-                    <label>31116</label>
+                    <label>Set home background directory (images)</label>
                     <label2>$INFO[Skin.String(homeBackground)]</label2>
                     <onclick>Skin.SetPath(homeBackground)</onclick>
                     <textwidth>8-col</textwidth>
@@ -117,19 +117,45 @@
                     <font>buttonTitle</font>
                 </control>
                 <control type="button" id="3">
-                    <visible>Container(8000).Hasfocus(1)</visible>
+                    <visible>Container(8000).Hasfocus(1) + !String.IsEmpty(Skin.String(homeBackground))</visible>
                     <description>Reset home background image directory</description>
                     <width>14-col</width>
                     <align>left</align>
                     <textoffsetx>24</textoffsetx>
-                    <label>31122</label>
+                    <label>Reset home background directory (images)</label>
                     <onclick>Skin.Reset(homeBackground)</onclick>
                     <textwidth>8-col</textwidth>
                     <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
                     <texturenofocus></texturenofocus>
                     <font>buttonTitle</font>
                 </control>
-
+                <control type="button" id="4">
+                    <visible>Container(8000).Hasfocus(1) + String.IsEmpty(Skin.String(homeBackgroundVideos)) + System.AddonIsEnabled(script.randomvideo)</visible>
+                    <description>Set home background video directory</description>
+                    <width>14-col</width>
+                    <align>left</align>
+                    <textoffsetx>24</textoffsetx>
+                    <label>Set home background directory (videos)</label>
+                    <label2>$INFO[Skin.String(homeBackgroundVideo)]</label2>
+                    <onclick>Skin.SetPath(homeBackgroundVideos)</onclick>
+                    <textwidth>8-col</textwidth>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
+                    <font>buttonTitle</font>
+                </control>
+                <control type="button" id="5">
+                    <visible>Container(8000).Hasfocus(1) + !String.IsEmpty(Skin.String(homeBackgroundVideos)) + System.AddonIsEnabled(script.randomvideo)</visible>
+                    <description>Reset home background video directory</description>
+                    <width>14-col</width>
+                    <align>left</align>
+                    <textoffsetx>24</textoffsetx>
+                    <label>Reset home background directory (videos)</label>
+                    <onclick>Skin.Reset(homeBackgroundVideos)</onclick>
+                    <textwidth>8-col</textwidth>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
+                    <font>buttonTitle</font>
+                </control>
                 <control type="radiobutton" id="1">
                     <visible>Container(8000).Hasfocus(1)</visible>
                     <description>Reverse power down options</description>
diff --git a/extras/playlists/homeBackground.xsp b/extras/playlists/homeBackground.xsp
deleted file mode 100644
index 9d962bf..0000000
--- a/extras/playlists/homeBackground.xsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<smartplaylist type="musicvideos">
-  <match>all</match>
-  <order direction="ascending">random</order>
-</smartplaylist>
diff --git a/resources/fanart.jpg b/resources/fanart.jpg
deleted file mode 100644
index 4a6a1d5..0000000
Binary files a/resources/fanart.jpg and /dev/null differ
diff --git a/resources/screenshot-01.jpg b/resources/screenshot-01.jpg
deleted file mode 100644
index 4a6a1d5..0000000
Binary files a/resources/screenshot-01.jpg and /dev/null differ
diff --git a/resources/screenshot-02.jpg b/resources/screenshot-02.jpg
deleted file mode 100644
index be02ce3..0000000
Binary files a/resources/screenshot-02.jpg and /dev/null differ
diff --git a/resources/screenshot-03.jpg b/resources/screenshot-03.jpg
deleted file mode 100644
index c16149b..0000000
Binary files a/resources/screenshot-03.jpg and /dev/null differ
diff --git a/resources/screenshot-04.jpg b/resources/screenshot-04.jpg
deleted file mode 100644
index b5fbdf0..0000000
Binary files a/resources/screenshot-04.jpg and /dev/null differ
diff --git a/resources/screenshot-05.jpg b/resources/screenshot-05.jpg
deleted file mode 100644
index 8706c43..0000000
Binary files a/resources/screenshot-05.jpg and /dev/null differ
diff --git a/resources/screenshot-06.jpg b/resources/screenshot-06.jpg
deleted file mode 100644
index 1bb8996..0000000
Binary files a/resources/screenshot-06.jpg and /dev/null differ