--- a/skin.transparency/720p/Includes_Home.xml
+++ b/skin.transparency/720p/Includes_Home.xml
@@ -37,10 +37,10 @@
 	</include>
 	<include name="Home_Movies_Fanart">
 		<control type="multiimage">
-			<posx>320</posx>
+			<posx>315</posx>
 			<posy>20</posy>
-			<width>740</width>
-			<height>382</height>
+			<width>745</width>
+			<height>390</height>
 			<include condition="!Skin.HasSetting(Custom_Home_Movies_Fanart_Background)">Home_Movies_Fanart_Path</include>
 			<include condition="Skin.HasSetting(Custom_Home_Movies_Fanart_Background)">Home_Movies_Fanart_Custom_Path</include>
 			<aspectratio aligny="top">scale</aspectratio>
@@ -3190,31 +3190,31 @@
 					<item id="8116">
 						<description>Menu Movies Sub Custom1</description>
 						<label>$INFO[Skin.String(Menu_Movies_Sub_Custom1_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_Movies_Sub_Custom1_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Movies_Sub_Custom1_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Movies_Sub_Custom1)</visible>
 					</item>
 					<item id="8117">
 						<description>Menu Movies Sub Custom2</description>
 						<label>$INFO[Skin.String(Menu_Movies_Sub_Custom2_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_Movies_Sub_Custom2_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Movies_Sub_Custom2_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Movies_Sub_Custom2)</visible>
 					</item>
 					<item id="8118">
 						<description>Menu Movies Sub Custom3</description>
 						<label>$INFO[Skin.String(Menu_Movies_Sub_Custom3_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_Movies_Sub_Custom3_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Movies_Sub_Custom3_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Movies_Sub_Custom3)</visible>
 					</item>
 					<item id="8119">
 						<description>Menu Movies Sub Custom4</description>
 						<label>$INFO[Skin.String(Menu_Movies_Sub_Custom4_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_Movies_Sub_Custom4_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Movies_Sub_Custom4_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Movies_Sub_Custom4)</visible>
 					</item>
 					<item id="8120">
 						<description>Menu Movies Sub Custom5</description>
 						<label>$INFO[Skin.String(Menu_Movies_Sub_Custom5_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_Movies_Sub_Custom5_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Movies_Sub_Custom5_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Movies_Sub_Custom5)</visible>
 					</item>
 					<item id="8121">
@@ -3251,7 +3251,7 @@
 					<item id="8103">
 						<description>Menu TVShows Sub Genres</description>
 						<label>$LOCALIZE[135]</label>
-						<onclick>ActivateWindow(Videos,tvshowgenres,return)</onclick>
+						<onclick>ActivateWindow(Videos,tvshowgenres)</onclick>
 						<visible>!Skin.HasSetting(Menu_TVShows_Sub_Genres)</visible>
 					</item>
 					<item id="8104">
@@ -3287,31 +3287,31 @@
 					<item id="8109">
 						<description>Menu TVShows Sub Custom1</description>
 						<label>$INFO[Skin.String(Menu_TVShows_Sub_Custom1_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_TVShows_Sub_Custom1_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_TVShows_Sub_Custom1_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_TVShows_Sub_Custom1)</visible>
 					</item>
 					<item id="8110">
 						<description>Menu TVShows Sub Custom2</description>
 						<label>$INFO[Skin.String(Menu_TVShows_Sub_Custom2_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_TVShows_Sub_Custom2_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_TVShows_Sub_Custom2_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_TVShows_Sub_Custom2)</visible>
 					</item>
 					<item id="8111">
 						<description>Menu TVShows Sub Custom3</description>
 						<label>$INFO[Skin.String(Menu_TVShows_Sub_Custom3_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_TVShows_Sub_Custom3_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_TVShows_Sub_Custom3_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_TVShows_Sub_Custom3)</visible>
 					</item>
 					<item id="8112">
 						<description>Menu TVShows Sub Custom4</description>
 						<label>$INFO[Skin.String(Menu_TVShows_Sub_Custom4_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_TVShows_Sub_Custom4_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_TVShows_Sub_Custom4_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_TVShows_Sub_Custom4)</visible>
 					</item>
 					<item id="8113">
 						<description>Menu TVShows Sub Custom5</description>
 						<label>$INFO[Skin.String(Menu_TVShows_Sub_Custom5_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_TVShows_Sub_Custom5_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_TVShows_Sub_Custom5_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_TVShows_Sub_Custom5)</visible>
 					</item>
 					<item id="8114">
@@ -3358,72 +3358,78 @@
 						<visible>!Skin.HasSetting(Menu_MusicVideos_Sub_Artists)</visible>
 					</item>
 					<item id="8105">
+						<description>Menu MusicVideos Sub Albums</description>
+						<label>$LOCALIZE[132]</label>
+						<onclick>ActivateWindow(Videos,musicvideoalbums)</onclick>
+						<visible>!Skin.HasSetting(Menu_MusicVideos_Sub_Albums)</visible>
+					</item>
+					<item id="8106">
 						<description>Menu MusicVideos Sub Directors</description>
 						<label>$LOCALIZE[20348]</label>
 						<onclick>ActivateWindow(Videos,musicvideodirectors,return)</onclick>
 						<visible>!Skin.HasSetting(Menu_MusicVideos_Sub_Directors)</visible>
 					</item>
-					<item id="8106">
+					<item id="8107">
 						<description>Menu MusicVideos Sub Studio</description>
 						<label>$LOCALIZE[20388]</label>
-						<onclick>ActivateWindow(Videos,musicvideostudio,return)</onclick>
+						<onclick>ActivateWindow(Videos,musicvideostudios,return)</onclick>
 						<visible>!Skin.HasSetting(Menu_MusicVideos_Sub_Studio)</visible>
 					</item>
-					<item id="8107">
+					<item id="8108">
 						<description>Menu MusicVideos Sub RecentlyAdded</description>
 						<label>$LOCALIZE[31410]</label>
 						<onclick>ActivateWindow(Videos,recentlyaddedmusicvideos,return)</onclick>
 						<visible>!Skin.HasSetting(Menu_MusicVideos_Sub_RecentlyAdded)</visible>
 					</item>
-					<item id="8108">
+					<item id="8109">
 						<description>Menu MusicVideos Sub VideoPlugins</description>
 						<label>$LOCALIZE[1037]</label>
 						<onclick>ActivateWindow(Videos,Addons,return)</onclick>
 						<visible>!Skin.HasSetting(Menu_MusicVideos_Sub_VideoPlugins)</visible>
 					</item>
-					<item id="8109">
+					<item id="8110">
 						<description>Menu MusicVideos Sub Custom1</description>
 						<label>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom1_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_MusicVideos_Sub_Custom1_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_MusicVideos_Sub_Custom1_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_MusicVideos_Sub_Custom1)</visible>
 					</item>
-					<item id="8110">
+					<item id="8111">
 						<description>Menu MusicVideos Sub Custom2</description>
 						<label>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom2_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_MusicVideos_Sub_Custom2_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_MusicVideos_Sub_Custom2_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_MusicVideos_Sub_Custom2)</visible>
 					</item>
-					<item id="8111">
+					<item id="8112">
 						<description>Menu MusicVideos Sub Custom3</description>
 						<label>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom3_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_MusicVideos_Sub_Custom3_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_MusicVideos_Sub_Custom3_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_MusicVideos_Sub_Custom3)</visible>
 					</item>
-					<item id="8112">
+					<item id="8113">
 						<description>Menu MusicVideos Sub Custom4</description>
 						<label>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom4_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_MusicVideos_Sub_Custom4_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_MusicVideos_Sub_Custom4_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_MusicVideos_Sub_Custom4)</visible>
 					</item>
-					<item id="8113">
+					<item id="8114">
 						<description>Menu MusicVideos Sub Custom5</description>
 						<label>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom5_Label)]</label>
-						<onclick>ActivateWindow(Videos,plugin://$INFO[Skin.String(Menu_MusicVideos_Sub_Custom5_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_MusicVideos_Sub_Custom5_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_MusicVideos_Sub_Custom5)</visible>
 					</item>
-					<item id="8114">
+					<item id="8115">
 						<description>Menu MusicVideos Sub Custom6</description>
 						<label>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom6_Label)]</label>
 						<onclick>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom6_Path)]</onclick>
 						<visible>Skin.HasSetting(Menu_MusicVideos_Sub_Custom6)</visible>
 					</item>
-					<item id="8115">
+					<item id="8116">
 						<description>Menu MusicVideos Sub Custom7</description>
 						<label>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom7_Label)]</label>
 						<onclick>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom7_Path)]</onclick>
 						<visible>Skin.HasSetting(Menu_MusicVideos_Sub_Custom7)</visible>
 					</item>
-					<item id="8116">
+					<item id="8117">
 						<description>Menu MusicVideos Sub Custom8</description>
 						<label>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom8_Label)]</label>
 						<onclick>$INFO[Skin.String(Menu_MusicVideos_Sub_Custom8_Path)]</onclick>
@@ -3554,31 +3560,31 @@
 					<item id="8115">
 						<description>Menu Music Sub Custom1</description>
 						<label>$INFO[Skin.String(Menu_Music_Sub_Custom1_Label)]</label>
-						<onclick>ActivateWindow(MusicLibrary,plugin://$INFO[Skin.String(Menu_Music_Sub_Custom1_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Music_Sub_Custom1_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Music_Sub_Custom1)</visible>
 					</item>
 					<item id="8116">
 						<description>Menu Music Sub Custom2</description>
 						<label>$INFO[Skin.String(Menu_Music_Sub_Custom2_Label)]</label>
-						<onclick>ActivateWindow(MusicLibrary,plugin://$INFO[Skin.String(Menu_Music_Sub_Custom2_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Music_Sub_Custom2_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Music_Sub_Custom2)</visible>
 					</item>
 					<item id="8117">
 						<description>Menu Music Sub Custom3</description>
 						<label>$INFO[Skin.String(Menu_Music_Sub_Custom3_Label)]</label>
-						<onclick>ActivateWindow(MusicLibrary,plugin://$INFO[Skin.String(Menu_Music_Sub_Custom3_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Music_Sub_Custom3_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Music_Sub_Custom3)</visible>
 					</item>
 					<item id="8118">
 						<description>Menu Music Sub Custom4</description>
 						<label>$INFO[Skin.String(Menu_Music_Sub_Custom4_Label)]</label>
-						<onclick>ActivateWindow(MusicLibrary,plugin://$INFO[Skin.String(Menu_Music_Sub_Custom4_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Music_Sub_Custom4_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Music_Sub_Custom4)</visible>
 					</item>
 					<item id="8119">
 						<description>Menu Music Sub Custom5</description>
 						<label>$INFO[Skin.String(Menu_Music_Sub_Custom5_Label)]</label>
-						<onclick>ActivateWindow(MusicLibrary,plugin://$INFO[Skin.String(Menu_Music_Sub_Custom5_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Music_Sub_Custom5_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Music_Sub_Custom5)</visible>
 					</item>
 					<item id="8120">
@@ -3645,31 +3651,31 @@
 					<item id="8108">
 						<description>Menu Pictures Sub Custom6</description>
 						<label>$INFO[Skin.String(Menu_Pictures_Sub_Custom6_Label)]</label>
-						<onclick>ActivateWindow(Pictures,plugin://$INFO[Skin.String(Menu_Pictures_Sub_Custom6_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Pictures_Sub_Custom6_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Pictures_Sub_Custom6)</visible>
 					</item>
 					<item id="8108">
 						<description>Menu Pictures Sub Custom7</description>
 						<label>$INFO[Skin.String(Menu_Pictures_Sub_Custom7_Label)]</label>
-						<onclick>ActivateWindow(Pictures,plugin://$INFO[Skin.String(Menu_Pictures_Sub_Custom7_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Pictures_Sub_Custom7_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Pictures_Sub_Custom7)</visible>
 					</item>
 					<item id="8110">
 						<description>Menu Pictures Sub Custom8</description>
 						<label>$INFO[Skin.String(Menu_Pictures_Sub_Custom8_Label)]</label>
-						<onclick>ActivateWindow(Pictures,plugin://$INFO[Skin.String(Menu_Pictures_Sub_Custom8_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Pictures_Sub_Custom8_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Pictures_Sub_Custom8)</visible>
 					</item>
 					<item id="8111">
 						<description>Menu Pictures Sub Custom9</description>
 						<label>$INFO[Skin.String(Menu_Pictures_Sub_Custom9_Label)]</label>
-						<onclick>ActivateWindow(Pictures,plugin://$INFO[Skin.String(Menu_Pictures_Sub_Custom9_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Pictures_Sub_Custom9_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Pictures_Sub_Custom9)</visible>
 					</item>
 					<item id="8112">
 						<description>Menu Pictures Sub Custom10</description>
 						<label>$INFO[Skin.String(Menu_Pictures_Sub_Custom10_Label)]</label>
-						<onclick>ActivateWindow(Pictures,plugin://$INFO[Skin.String(Menu_Pictures_Sub_Custom10_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Pictures_Sub_Custom10_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Pictures_Sub_Custom10)</visible>
 					</item>
 					<item id="8113">
@@ -3766,31 +3772,31 @@
 					<item id="8113">
 						<description>Menu Programs Sub Custom11</description>
 						<label>$INFO[Skin.String(Menu_Programs_Sub_Custom11_Label)]</label>
-						<onclick>ActivateWindow(Programs,plugin://$INFO[Skin.String(Menu_Programs_Sub_Custom11_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Programs_Sub_Custom11_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Programs_Sub_Custom11)</visible>
 					</item>
 					<item id="8114">
 						<description>Menu Programs Sub Custom12</description>
 						<label>$INFO[Skin.String(Menu_Programs_Sub_Custom12_Label)]</label>
-						<onclick>ActivateWindow(Programs,plugin://$INFO[Skin.String(Menu_Programs_Sub_Custom12_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Programs_Sub_Custom12_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Programs_Sub_Custom12)</visible>
 					</item>
 					<item id="8115">
 						<description>Menu Programs Sub Custom13</description>
 						<label>$INFO[Skin.String(Menu_Programs_Sub_Custom13_Label)]</label>
-						<onclick>ActivateWindow(Programs,plugin://$INFO[Skin.String(Menu_Programs_Sub_Custom13_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Programs_Sub_Custom13_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Programs_Sub_Custom13)</visible>
 					</item>
 					<item id="8116">
 						<description>Menu Programs Sub Custom14</description>
 						<label>$INFO[Skin.String(Menu_Programs_Sub_Custom14_Label)]</label>
-						<onclick>ActivateWindow(Programs,plugin://$INFO[Skin.String(Menu_Programs_Sub_Custom14_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Programs_Sub_Custom14_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Programs_Sub_Custom14)</visible>
 					</item>
 					<item id="8117">
 						<description>Menu Programs Sub Custom15</description>
 						<label>$INFO[Skin.String(Menu_Programs_Sub_Custom15_Label)]</label>
-						<onclick>ActivateWindow(Programs,plugin://$INFO[Skin.String(Menu_Programs_Sub_Custom15_Path)],return)</onclick>
+						<onclick>RunAddon($INFO[Skin.String(Menu_Programs_Sub_Custom15_Path)],return)</onclick>
 						<visible>Skin.HasSetting(Menu_Programs_Sub_Custom15)</visible>
 					</item>
 					<item id="8118">
@@ -4029,7 +4035,7 @@
 						<description>Menu PlayDisc Sub Player Controls</description>
 						<label>$LOCALIZE[31409]</label>
 						<onclick>ActivateWindow(PlayerControls)</onclick>
-						<visible>!Skin.HasSetting(Menu_PlayDisc_Sub_Playeritems)</visible>
+						<visible>!Skin.HasSetting(Menu_PlayDisc_Sub_PlayerControls)</visible>
 					</item>
 					<item id="8103">
 						<description>Menu PlayDisc Sub Eject</description>