diff --git a/1080i/Home.xml b/1080i/Home.xml
index 02887c0..441af5b 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -2,7 +2,6 @@
 <window id="0">
 	<defaultcontrol always="true">9000</defaultcontrol>
 	<include>fadeInOut</include>
-	<onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=9001&amp;group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu|gamesubmenu)</onload>
 	<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
 	<onload>AlarmClock(hidemenu,setfocus(9999),00:20,true)</onload>
 	<onunload>CancelAlarm(hidemenu,true)</onunload>
@@ -206,7 +205,7 @@
 					</control>
 				</focusedlayout>
 				<content>
-					<include>skinshortcuts-mainmenu</include>
+					<include>menus-mainmenu</include>
 				</content>
 			</control>
 			<!--power / settings-->
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 6d50a26..a005ee4 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -25,7 +25,7 @@
 	<include file="View_Games.xml"/>
 	<include file="View_SpotifyAlbums.xml"/>
 	<include file="View_SpotifyArtists.xml"/>
-    <include file="script-skinshortcuts-includes.xml"/>
+    <include file="Includes_menus.xml"/>
     <include file="Includes_mediaShowcase.xml"/>
 
     <!--view type conditions-->
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index 7bc789b..a40a952 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -211,10 +211,10 @@
                     </control>
                 </focusedlayout>
                 <content>
-                    <include condition="window.isactive(games)">skinshortcuts-group-gamesubmenu</include>
-					<include condition="window.isactive(pictures)">skinshortcuts-group-picturessubmenu</include>
-                    <include condition="String.Contains(container.folderpath,videodb://musicvideos/titles) | window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers) | window.isactive(musicplaylist) | window.isactive(1103)">skinshortcuts-group-musicsubmenu</include>
-                    <include condition="[window.isactive(videos) + !String.Contains(container.folderpath,videodb://musicvideos/titles)] | window.isactive(tvchannels) | window.isactive(tvrecordings) | window.isactive(tvguide) | window.isactive(tvtimers) | window.isactive(videoplaylist)">skinshortcuts-group-videosubmenu</include>
+                    <include condition="window.isactive(games)">menus-gamemenu</include>
+					<include condition="window.isactive(pictures)">menus-picturemenu</include>
+                    <include condition="String.Contains(container.folderpath,videodb://musicvideos/titles) | window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers) | window.isactive(musicplaylist) | window.isactive(1103)">menus-musicmenu</include>
+                    <include condition="[window.isactive(videos) + !String.Contains(container.folderpath,videodb://musicvideos/titles)] | window.isactive(tvchannels) | window.isactive(tvrecordings) | window.isactive(tvguide) | window.isactive(tvtimers) | window.isactive(videoplaylist)">menus-videomenu</include>
                 </content>
             </control>
         </control>
diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml
index 585b9f1..201f032 100644
--- a/1080i/Includes_hubOptionsItems.xml
+++ b/1080i/Includes_hubOptionsItems.xml
@@ -89,14 +89,6 @@
             <onclick>Mastermode</onclick>
             <selected>system.ismaster</selected>
             <visible>system.haslocks</visible>
-        </control>
-		<control type="button" id="13">
-            <description>Edit video menu</description>
-            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
-            <label>31172</label>
-            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=videosubmenu)</onclick>
         </control>
     </include>
     <!--music submenu items-->
@@ -178,14 +170,6 @@
             <label>191</label>
             <onclick condition="!Playlist.IsRandom">PlayerControl(randomOn)</onclick>
             <onclick condition="Playlist.IsRandom">PlayerControl(randomOff)</onclick>
-        </control>
-		<control type="button" id="14">
-            <description>Edit music menu</description>
-            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
-            <label>31173</label>
-            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=musicsubmenu)</onclick>
         </control>
     </include>
     <!--pictures submenu items-->
@@ -210,14 +194,6 @@
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <alttexturefocus colordiffuse="highlight">colors/white.png</alttexturefocus>
             <onclick>sendclick(pictures,4)</onclick>
-        </control>
-		<control type="button" id="17">
-            <description>Edit pictures menu</description>
-            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
-            <label>31174</label>
-            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=picturessubmenu)</onclick>
         </control>
     </include>
     <!--pictures submenu items-->
@@ -273,14 +249,6 @@
             <altlabel>31110</altlabel>
             <width>12-col</width>
             <onclick>sendclick(games,4)</onclick>
-        </control>
-		<control type="button" id="17">
-            <description>Edit Games menu</description>
-            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <focusedcolor>textActive</focusedcolor>
-            <width>12-col</width>
-            <label>31233</label>
-            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=gamesubmenu)</onclick>
         </control>
 	</include>
 </includes>
\ No newline at end of file
diff --git a/1080i/Includes_menus.xml b/1080i/Includes_menus.xml
new file mode 100644
index 0000000..ee1766e
--- /dev/null
+++ b/1080i/Includes_menus.xml
@@ -0,0 +1,674 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<includes>
+	<include name="menus-mainmenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<label>$LOCALIZE[31136]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>Player.HasMedia</visible>
+			<onclick>action(FullScreen)</onclick>
+			<property name="path">action(FullScreen)</property>
+			<property name="list">action(FullScreen)</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31136</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<label>$LOCALIZE[31221]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31221</property>
+			<property name="defaultID">31221</property>
+			<visible>System.HasMediaDVD</visible>
+			<onclick>XBMC.PlayDVD()</onclick>
+			<property name="path">XBMC.PlayDVD()</property>
+			<property name="list">XBMC.PlayDVD()</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31221</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<label>$LOCALIZE[31251]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31251</property>
+			<property name="defaultID">31251</property>
+			<visible>System.HasMediaDVD</visible>
+			<onclick>EjectTray()</onclick>
+			<property name="path">EjectTray()</property>
+			<property name="list">EjectTray()</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31251</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<label>$LOCALIZE[31249]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31249</property>
+			<property name="defaultID">31249</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick>ActivateWindow(TVChannels)</onclick>
+			<property name="path">ActivateWindow(TVChannels)</property>
+			<property name="list">TVChannels</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31249</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<label>$LOCALIZE[31250]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31250</property>
+			<property name="defaultID">31250</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasRadioChannels]</visible>
+			<onclick>ActivateWindow(Radiochannels)</onclick>
+			<property name="path">ActivateWindow(Radiochannels)</property>
+			<property name="list">Radiochannels</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31250</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<label>$LOCALIZE[342]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">movies</property>
+			<property name="defaultID">movies</property>
+			<visible>[Library.HasContent(Movies)] + [Library.HasContent(Movies)]</visible>
+			<onclick condition="!Skin.HasSetting(disableRecentMovies)">ActivateWindow(Videos,videodb://movies/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://movies/titles/)</property>
+			<property name="list">videodb://movies/titles/</property>
+			<onclick condition="!Skin.HasSetting(disableRecentMovies)">control.setfocus(9103,0,absolute)</onclick>
+			<onclick condition="Skin.HasSetting(disableRecentMovies)">ActivateWindow(Videos,videodb://movies/titles/)</onclick>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">movies</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<label>$LOCALIZE[20343]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">tvshows</property>
+			<property name="defaultID">tvshows</property>
+			<visible>[Library.HasContent(TVShows)] + [Library.HasContent(TVshows)]</visible>
+			<onclick condition="!Skin.HasSetting(disableRecentTVShows)">ActivateWindow(Videos,videodb://tvshows/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://tvshows/titles/)</property>
+			<property name="list">videodb://tvshows/titles/</property>
+			<onclick condition="!Skin.HasSetting(disableRecentTVShows)">control.setfocus(9203,0,absolute)</onclick>
+			<onclick condition="Skin.HasSetting(disableRecentTVShows)">ActivateWindow(Videos,videodb://tvshows/titles/)</onclick>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">tvshows</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<label>$LOCALIZE[3]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">3</property>
+			<property name="defaultID">3</property>
+			<visible>!Library.HasContent(Video)</visible>
+			<onclick>ActivateWindow(Videos,sources://video/)</onclick>
+			<property name="path">ActivateWindow(Videos,sources://video/)</property>
+			<property name="list">sources://video/</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-3</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<label>$LOCALIZE[2]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">2</property>
+			<property name="defaultID">2</property>
+			<property name="icon">DefaultAddon.png</property>
+			<visible>[Library.HasContent(Music)] + [Library.HasContent(Music)]</visible>
+			<onclick condition="!Skin.HasSetting(disableRecentAlbums)">ActivateWindow(Music,musicdb://albums/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="list">musicdb://albums/</property>
+			<onclick condition="!Skin.HasSetting(disableRecentAlbums)">control.setfocus(9998,0,absolute)</onclick>
+			<onclick condition="Skin.HasSetting(disableRecentAlbums)">ActivateWindow(Music,musicdb://albums/)</onclick>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-2</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
+			<label>$LOCALIZE[2]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">2--0</property>
+			<property name="defaultID">2--0</property>
+			<visible>!Library.HasContent(Music)</visible>
+			<onclick>ActivateWindow(Music,Files)</onclick>
+			<property name="path">ActivateWindow(Music,Files)</property>
+			<property name="list">Files</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">2-0</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
+			<label>$LOCALIZE[31229]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31229</property>
+			<property name="defaultID">31229</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick>PlayerControl(Partymode(music))</onclick>
+			<property name="path">PlayerControl(Partymode(music))</property>
+			<property name="list">PlayerControl(Partymode(music))</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31229</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
+			<label>$LOCALIZE[31232]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31232</property>
+			<property name="defaultID">31232</property>
+			<onclick>ActivateWindow(games)</onclick>
+			<property name="path">ActivateWindow(games)</property>
+			<property name="list">games</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">num-31232</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="13">
+			<property name="id">$NUMBER[13]</property>
+			<label>$LOCALIZE[12600]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">weather</property>
+			<property name="defaultID">weather</property>
+			<visible>!String.IsEmpty(Weather.Plugin)</visible>
+			<onclick>ActivateWindow(Weather)</onclick>
+			<property name="path">ActivateWindow(Weather)</property>
+			<property name="list">Weather</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">weather</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="14">
+			<property name="id">$NUMBER[14]</property>
+			<label>$LOCALIZE[10002]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">pictures</property>
+			<property name="defaultID">pictures</property>
+			<onclick>ActivateWindow(Pictures)</onclick>
+			<property name="path">ActivateWindow(Pictures)</property>
+			<property name="list">Pictures</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">pictures</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">True</property>
+		</item>
+	</include>
+	<include name="menus-videomenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31136]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>Player.HasMedia</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>action(FullScreen)</onclick>
+			<property name="path">action(FullScreen)</property>
+			<property name="list">action(FullScreen)</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31215]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31215</property>
+			<property name="defaultID">31215</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(TVChannels)</onclick>
+			<property name="path">ActivateWindow(TVChannels)</property>
+			<property name="list">TVChannels</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31112]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31112</property>
+			<property name="defaultID">31112</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(TVGuide)</onclick>
+			<property name="path">ActivateWindow(TVGuide)</property>
+			<property name="list">TVGuide</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31165]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31165</property>
+			<property name="defaultID">31165</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasTVChannels]</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(TVRecordings)</onclick>
+			<property name="path">ActivateWindow(TVRecordings)</property>
+			<property name="list">TVRecordings</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[342]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">movies</property>
+			<property name="defaultID">movies</property>
+			<visible>Library.HasContent(Movies)</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!window.isactive(videos) + !Skin.HasSetting(disableRecentMovies)">ActivateWindow(Videos,videodb://movies/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://movies/titles/)</property>
+			<property name="list">videodb://movies/titles/</property>
+			<onclick condition="!window.isactive(videos) + !Skin.HasSetting(disableRecentMovies)">control.setfocus(9103,0,absolute)</onclick>
+			<onclick condition="window.isactive(videos) + !Skin.HasSetting(disableRecentMovies)">Container.Update(videodb://movies/titles/)</onclick>
+			<onclick condition="window.isactive(videos) + !Skin.HasSetting(disableRecentMovies)">control.setfocus(9103,0,absolute)</onclick>
+			<onclick condition="!window.isactive(videos) + Skin.HasSetting(disableRecentMovies)">ActivateWindow(Videos,videodb://movies/titles/)</onclick>
+			<onclick condition="!window.isactive(videos) + Skin.HasSetting(disableRecentMovies)">control.setfocus(9104,0,absolute)</onclick>
+			<onclick condition="window.isactive(videos) + Skin.HasSetting(disableRecentMovies)">Container.Update(videodb://movies/titles/)</onclick>
+			<onclick condition="window.isactive(videos) + Skin.HasSetting(disableRecentMovies)">control.setfocus(9104,0,absolute)</onclick>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[20343]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">tvshows</property>
+			<property name="defaultID">tvshows</property>
+			<visible>Library.HasContent(TVShows)</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!window.isactive(videos) + !Skin.HasSetting(disableRecentTVShows)">ActivateWindow(Videos,videodb://tvshows/titles/)</onclick>
+			<property name="path">ActivateWindow(Videos,videodb://tvshows/titles/)</property>
+			<property name="list">videodb://tvshows/titles/</property>
+			<onclick condition="!window.isactive(videos) + !Skin.HasSetting(disableRecentTVShows)">control.setfocus(9203,0,absolute)</onclick>
+			<onclick condition="window.isactive(videos) + !Skin.HasSetting(disableRecentTVShows)">Container.Update(videodb://tvshows/titles/)</onclick>
+			<onclick condition="window.isactive(videos) + !Skin.HasSetting(disableRecentTVShows)">control.setfocus(9203,0,absolute)</onclick>
+			<onclick condition="!window.isactive(videos) + Skin.HasSetting(disableRecentTVShows)">ActivateWindow(Videos,videodb://tvshows/titles/)</onclick>
+			<onclick condition="!window.isactive(videos) + Skin.HasSetting(disableRecentTVShows)">control.setfocus(9204,0,absolute)</onclick>
+			<onclick condition="window.isactive(videos) + Skin.HasSetting(disableRecentTVShows)">Container.Update(videodb://tvshows/titles/)</onclick>
+			<onclick condition="window.isactive(videos) + Skin.HasSetting(disableRecentTVShows)">control.setfocus(9204,0,absolute)</onclick>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[31088]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31088</property>
+			<property name="defaultID">31088</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(Videos,addons://sources/video/)</onclick>
+			<property name="path">ActivateWindow(Videos,addons://sources/video/)</property>
+			<property name="list">addons://sources/video/</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[136]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">136</property>
+			<property name="defaultID">136</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(Videos,special://videoplaylists/,return)</onclick>
+			<property name="path">ActivateWindow(Videos,special://videoplaylists/,return)</property>
+			<property name="list">special://videoplaylists/</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">15</property>
+			<label>$LOCALIZE[744]</label>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(Videos,sources://video/)</onclick>
+			<property name="path">ActivateWindow(Videos,sources://video/)</property>
+			<property name="list">sources://video/</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">videosubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="menus-musicmenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31136</property>
+			<property name="defaultID">31136</property>
+			<visible>Player.HasMedia</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>activateWindow(1103)</onclick>
+			<property name="path">activateWindow(1103)</property>
+			<property name="list">activateWindow(1103)</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31248]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31248</property>
+			<property name="defaultID">31248</property>
+			<visible>MusicPlayer.HasNext</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>activateWindow(musicplaylist)</onclick>
+			<property name="path">activateWindow(musicplaylist)</property>
+			<property name="list">activateWindow(musicplaylist)</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="3">
+			<property name="id">$NUMBER[3]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31031]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31031</property>
+			<property name="defaultID">31031</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>PlayerControl(Partymode(music))</onclick>
+			<property name="path">PlayerControl(Partymode(music))</property>
+			<property name="list">PlayerControl(Partymode(music))</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31250]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31250</property>
+			<property name="defaultID">31250</property>
+			<visible>[System.HasPVRAddon] + [PVR.HasRadioChannels]</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(Radiochannels)</onclick>
+			<property name="path">ActivateWindow(Radiochannels)</property>
+			<property name="list">Radiochannels</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[133]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">133</property>
+			<property name="defaultID">133</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="window.isactive(music)">Container.Update(musicdb://artists/)</onclick>
+			<property name="path">Container.Update(musicdb://artists/)</property>
+			<property name="list">Container.Update(musicdb://artists/)</property>
+			<onclick condition="window.isactive(music)">control.setfocus(51,0,absolute)</onclick>
+			<onclick condition="!window.isactive(music)">ActivateWindow(Music,musicdb://artists/)</onclick>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[132]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">132</property>
+			<property name="defaultID">132</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="!window.isactive(music) + !Skin.HasSetting(disableRecentAlbums)">ActivateWindow(Music,musicdb://albums/)</onclick>
+			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="list">musicdb://albums/</property>
+			<onclick condition="!window.isactive(music) + !Skin.HasSetting(disableRecentAlbums)">control.setfocus(9998,0,absolute)</onclick>
+			<onclick condition="window.isactive(music) + !Skin.HasSetting(disableRecentAlbums)">Container.Update(musicdb://albums/)</onclick>
+			<onclick condition="window.isactive(music) + !Skin.HasSetting(disableRecentAlbums)">control.setfocus(9998,0,absolute)</onclick>
+			<onclick condition="!window.isactive(music) + Skin.HasSetting(disableRecentAlbums)">ActivateWindow(Music,musicdb://albums/)</onclick>
+			<onclick condition="!window.isactive(music) + Skin.HasSetting(disableRecentAlbums)">control.setfocus(9124,0,absolute)</onclick>
+			<onclick condition="window.isactive(music) + Skin.HasSetting(disableRecentAlbums)">Container.Update(musicdb://albums/)</onclick>
+			<onclick condition="window.isactive(music) + Skin.HasSetting(disableRecentAlbums)">control.setfocus(9124,0,absolute)</onclick>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[135]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">135</property>
+			<property name="defaultID">135</property>
+			<visible>Library.HasContent(Music)</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="window.isactive(music)">Container.Update(musicdb://genres/)</onclick>
+			<property name="path">Container.Update(musicdb://genres/)</property>
+			<property name="list">Container.Update(musicdb://genres/)</property>
+			<onclick condition="!window.isactive(music)">ActivateWindow(Music,musicdb://genres/)</onclick>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[136]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">136</property>
+			<property name="defaultID">136</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>activateWindow(Music,special://musicplaylists/)</onclick>
+			<property name="path">activateWindow(Music,special://musicplaylists/)</property>
+			<property name="list">activateWindow(Music,special://musicplaylists/)</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[20389]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">musicvideos</property>
+			<property name="defaultID">musicvideos</property>
+			<visible>Library.HasContent(MusicVideos)</visible>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick condition="window.isactive(music)">Container.Update(videodb://musicvideos/titles/)</onclick>
+			<property name="path">Container.Update(videodb://musicvideos/titles/)</property>
+			<property name="list">Container.Update(videodb://musicvideos/titles/)</property>
+			<onclick condition="!window.isactive(music)">ActivateWindow(Videos,videodb://musicvideos/titles/)</onclick>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[31090]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">31090</property>
+			<property name="defaultID">31090</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(Music,Addons)</onclick>
+			<property name="path">ActivateWindow(Music,Addons)</property>
+			<property name="list">Addons</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
+			<property name="mainmenuid">16</property>
+			<label>$LOCALIZE[744]</label>
+			<label2>$LOCALIZE[10005]</label2>
+			<icon>DefaultAddon.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(Music,Files)</onclick>
+			<property name="path">ActivateWindow(Music,Files)</property>
+			<property name="list">Files</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">musicsubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="menus-picturemenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">17</property>
+			<label>$LOCALIZE[744]</label>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(Pictures,files)</onclick>
+			<property name="path">ActivateWindow(Pictures,files)</property>
+			<property name="list">files</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">17</property>
+			<label>$LOCALIZE[1039]</label>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">1039</property>
+			<property name="defaultID">1039</property>
+			<onclick condition="true">control.setfocus(9999)</onclick>
+			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">picturessubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+	<include name="menus-gamemenu">
+		<item id="1">
+			<property name="id">$NUMBER[1]</property>
+			<property name="mainmenuid">18</property>
+			<label>$LOCALIZE[744]</label>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">744</property>
+			<property name="defaultID">744</property>
+			<onclick>ActivateWindow(Games,files)</onclick>
+			<property name="path">ActivateWindow(Games,files)</property>
+			<property name="list">files</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">gamesubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+		<item id="2">
+			<property name="id">$NUMBER[2]</property>
+			<property name="mainmenuid">18</property>
+			<label>$LOCALIZE[31234]</label>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">31234</property>
+			<property name="defaultID">31234</property>
+			<onclick>ActivateWindow(Games,Addons,return)</onclick>
+			<property name="path">ActivateWindow(Games,Addons,return)</property>
+			<property name="list">Addons</property>
+			<visible>String.IsEqual(System.ProfileName,Master user)</visible>
+			<property name="group">gamesubmenu</property>
+			<property name="isSubmenu">True</property>
+		</item>
+	</include>
+</includes>
\ No newline at end of file
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index db950ec..c80fc2e 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">8000</defaultcontrol>
-    <onunload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=9001&amp;group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu|gamesubmenu)</onunload>
     <controls>
         <!--background-->
         <include>globalBackground</include>
@@ -182,41 +181,6 @@
                     <onclick>ReloadSkin()</onclick>
                     <selected>Skin.HasSetting(lowPowerMode)</selected>
                 </control>
-                <control type="button" id="12">
-                    <visible>Container(8000).Hasfocus(2)</visible>
-                    <description>Edit home menu</description>
-                    <width>14-col</width>
-                    <label>31171</label>
-                    <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=mainmenu)</onclick>
-                </control>
-                <control type="button" id="13">
-                    <visible>Container(8000).Hasfocus(2)</visible>
-                    <description>Edit video menu</description>
-                    <width>14-col</width>
-                    <label>31172</label>
-                    <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=videosubmenu)</onclick>
-                </control>
-                <control type="button" id="14">
-                    <visible>Container(8000).Hasfocus(2)</visible>
-                    <description>Edit music menu</description>
-                    <width>14-col</width>
-                    <label>31173</label>
-                    <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=musicsubmenu)</onclick>
-                </control>
-                <control type="button" id="15">
-                    <visible>Container(8000).Hasfocus(2)</visible>
-                    <description>Edit pictures menu</description>
-                    <width>14-col</width>
-                    <label>31174</label>
-                    <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=picturessubmenu)</onclick>
-                </control>
-				<control type="button" id="16">
-                    <visible>Container(8000).Hasfocus(2)</visible>
-                    <description>Edit games menu</description>
-                    <width>14-col</width>
-                    <label>31233</label>
-                    <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=gamesubmenu)</onclick>
-                </control>
                 <control type="radiobutton" id="17">
                     <visible>Container(8000).Hasfocus(1)</visible>
                     <description>Extended Fanart</description>
diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml
deleted file mode 100644
index 7e89f5d..0000000
--- a/1080i/script-skinshortcuts.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-    <defaultcontrol always="false">211</defaultcontrol>
-    <onunload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=9001&amp;group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu|gamesubmenu)</onunload>
-    <onunload>control.setfocus(9000)</onunload>
-    <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>-12</posx>
-                <posy>-12</posy>
-                <width>1320</width>
-                <height>708</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <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>71</posy>
-                <width>18-col</width>
-                <height>1</height>
-                <texture>colors/black.png</texture>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <!--title-->
-            <control type="label">
-                <posx>24</posx>
-                <posy>0</posy>
-                <width>18-col-gutter</width>
-                <height>2-row</height>
-                <font>dialogTitle</font>
-                <label>$LOCALIZE[31228]</label>
-                <textcolor>textActive</textcolor>
-                <shadowcolor></shadowcolor>
-            </control>
-			<!--options-->
-            <control type="grouplist" id="300">
-                <posx>0</posx>
-                <posy>84</posy>
-                <width>276</width>
-				<height>17-row</height>
-				<itemgap>0</itemgap>
-                <control type="button" id="301">
-                    <description>Add a new shortcut</description>
-                    <onright>211</onright>
-                    <width>5-col-gutter</width>
-                    <label>$ADDON[script.skinshortcuts 32000]</label>
-                </control>
-                <control type="button" id="302">
-                    <description>Delete shortcut</description>
-                    <onright>211</onright>
-                    <width>5-col-gutter</width>
-                    <label>$ADDON[script.skinshortcuts 32001]</label>
-                </control>
-                <control type="button" id="303">
-                    <description>Move shortcut up</description>
-                    <onright>211</onright>
-                    <width>5-col-gutter</width>
-                    <label>$ADDON[script.skinshortcuts 32002]</label>
-                </control>
-                <control type="button" id="304">
-                    <description>Move shortcut down</description>
-                    <onright>211</onright>
-                    <width>5-col-gutter</width>
-                    <label>$ADDON[script.skinshortcuts 32003]</label>
-                </control>
-                <control type="button" id="305">
-                    <description>Change shortcut label</description>
-                    <onright>211</onright>
-                    <width>5-col-gutter</width>
-                    <label>$ADDON[script.skinshortcuts 32025]</label>
-                </control>
-                <control type="button" id="307">
-                    <description>Change shortcut action</description>
-                    <onright>211</onright>
-                    <width>5-col-gutter</width>
-                    <label>$ADDON[script.skinshortcuts 32027]</label>
-                </control>
-                <control type="button" id="308">
-                    <description>Reset shortcuts</description>
-                    <onright>211</onright>
-                    <width>5-col-gutter</width>
-                    <label>$ADDON[script.skinshortcuts 32028]</label>
-                </control>
-            </control>
-			<!-- id 211 - Current shortcuts -->
-			<!--options-->
-            <control type="list" id="211">
-                <posx>4-col</posx>
-                <posy>84</posy>
-                <width>14-col</width>
-                <height>17-row</height>
-                <onleft>300</onleft>
-                <orientation>vertical</orientation>
-                <itemlayout width="14-col" height="2-row">
-                    <control type="label">
-                        <posx>24</posx>
-                        <posy>0</posy>
-                        <width>13-col</width>
-                        <height>2-row</height>
-                        <font>buttonTitle</font>
-                        <aligny>center</aligny>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor></shadowcolor>
-                        <label>$INFO[ListItem.label]</label>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="14-col" height="2-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>14-col</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>textActive</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                        <animation effect="fade" start="100" end="50" condition="!Control.HasFocus(211)">Conditional</animation>
-                    </control>
-                    <control type="label">
-                        <posx>24</posx>
-                        <posy>0</posy>
-                        <width>13-col</width>
-                        <height>2-row</height>
-                        <font>buttonTitle</font>
-                        <aligny>center</aligny>
-                        <textcolor>black</textcolor>
-                        <shadowcolor></shadowcolor>
-                        <label>$INFO[ListItem.label]</label>
-                    </control>
-                </focusedlayout>
-            </control>
-		</control>     
-        <!--debugging-->
-        <include>DebugGrid</include>
-        <control type="label">
-            <include>WindowID</include>
-            <label>script-skinshortcuts.xml</label>
-        </control>
-    </controls>
-</window>
diff --git a/README.md b/README.md
index 9da364d..6dd132f 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@ Built for the living room, Pellucid is a clean and carefully designed Kodi exper
 
 #### Additional features
 
-- Skin Shortcuts addon support.
 - Full PVR / Live TV support
 
 Discussion thread: http://forum.kodi.tv/forumdisplay.php?fid=267
diff --git a/addon.xml b/addon.xml
index 5419999..cd94cfb 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.pellucid" version="3.0.0" name="Pellucid" provider-name="theDeadman">
+<addon id="skin.pellucid" version="3.1.0" name="Pellucid" provider-name="theDeadman">
     <requires>
         <import addon="xbmc.gui" version="5.15.0"/>
-        <import addon="script.skinshortcuts" version="1.1.4"/>
     </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 4b86e9c..b6aa49e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,7 @@
 **Changelog**
+[V3.1.0]
+- Skin shortcuts removed
+
 [V3.0.0]
 - Updated for Kodi Matrix
 
diff --git a/shortcuts/gamesubmenu.DATA.xml b/shortcuts/gamesubmenu.DATA.xml
deleted file mode 100644
index 821e23f..0000000
--- a/shortcuts/gamesubmenu.DATA.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shortcuts>
-    <shortcut>
-        <label>744</label>
-        <label2>32020</label2>
-        <icon>DefaultAddonPicture.png</icon>
-        <thumb />
-        <action>ActivateWindow(Games,files)</action>
-    </shortcut>
-    <shortcut>
-        <label>31234</label>
-        <label2>32020</label2>
-        <icon>DefaultAddonPicture.png</icon>
-        <thumb />
-        <action>ActivateWindow(Games,Addons,return)</action>
-    </shortcut>
-</shortcuts>
\ No newline at end of file
diff --git a/shortcuts/mainmenu.DATA.xml b/shortcuts/mainmenu.DATA.xml
deleted file mode 100644
index 699f40e..0000000
--- a/shortcuts/mainmenu.DATA.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shortcuts>
-    <shortcut>
-        <visible>Player.HasMedia</visible>
-        <label>31136</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>action(FullScreen)</action>
-    </shortcut>
-    <shortcut>
-        <label>31221</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>XBMC.PlayDVD()</action>
-    </shortcut>
-    <shortcut>
-        <visible>System.HasMediaDVD</visible>
-        <label>31251</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>EjectTray()</action>
-    </shortcut>
-    <shortcut>
-        <visible>PVR.HasTVChannels</visible>
-        <label>31249</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(TVChannels)</action>
-    </shortcut>
-    <shortcut>
-        <visible>PVR.HasRadioChannels</visible>
-        <label>31250</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Radiochannels)</action>
-    </shortcut>
-	<shortcut>
-		<visible>Library.HasContent(Movies)</visible>
-        <label>342</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Videos,videodb://movies/titles/)</action>
-    </shortcut>
-	<shortcut>
-		<visible>Library.HasContent(TVshows)</visible>
-        <label>20343</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Videos,videodb://tvshows/titles/)</action>
-    </shortcut>
-    <shortcut>
-        <visible>!Library.HasContent(Video)</visible>
-        <label>3</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Videos,sources://video/)</action>
-    </shortcut>
-    <shortcut>
-        <visible>Library.HasContent(Music)</visible>
-        <label>2</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Music,musicdb://albums/)</action>
-    </shortcut>
-    <shortcut>
-        <visible>!Library.HasContent(Music)</visible>
-        <label>2</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Music,Files)</action>
-    </shortcut>
-	<shortcut>
-        <visible>Library.HasContent(Music)</visible>
-        <label>31229</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>PlayerControl(Partymode(music))</action>
-    </shortcut>
-    <shortcut>
-        <label>31232</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(games)</action>
-    </shortcut>
-	<shortcut>
-        <label>12600</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Weather)</action>
-    </shortcut>
-    <shortcut>
-        <label>10002</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Pictures)</action>
-    </shortcut>
-</shortcuts>
diff --git a/shortcuts/musicsubmenu.DATA.xml b/shortcuts/musicsubmenu.DATA.xml
deleted file mode 100644
index 5879709..0000000
--- a/shortcuts/musicsubmenu.DATA.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shortcuts>
-    <shortcut>
-        <visible>Player.HasMedia + !window.isactive(1103)</visible>
-        <label>31136</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>activateWindow(1103)</action>
-    </shortcut>
-	<shortcut>
-        <visible>MusicPlayer.HasNext</visible>
-        <label>31248</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>activateWindow(musicplaylist)</action>
-    </shortcut>
-    <shortcut>
-        <visible>Library.HasContent(Music)</visible>
-        <label>31031</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>PlayerControl(Partymode(music))</action>
-    </shortcut>
-    <shortcut>
-        <visible>PVR.HasRadioChannels</visible>
-        <label>31250</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Radiochannels)</action>
-    </shortcut>
-    <shortcut>
-        <label>133</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Music,musicdb://artists/)</action>
-    </shortcut>
-    <shortcut>
-        <label>132</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Music,musicdb://albums/)</action>
-    </shortcut>
-    <shortcut>
-        <label>135</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Music,musicdb://genres/)</action>
-    </shortcut>
-    <shortcut>
-        <label>136</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>activateWindow(Music,special://musicplaylists/)</action>
-    </shortcut>
-    <shortcut>
-        <label>20389</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Videos,videodb://musicvideos/titles/)</action>
-    </shortcut>
-    <shortcut>
-        <label>31090</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Music,Addons)</action>
-    </shortcut>
-    <shortcut>
-        <label>744</label>
-        <label2>10005</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Music,Files)</action>
-    </shortcut>
-</shortcuts>
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
deleted file mode 100644
index 6a3273e..0000000
--- a/shortcuts/overrides.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<overrides>
-	<doNotShareMenu/>
-	<override action="RunScript(script.globalsearch)">
-		<condition>!system.hasaddon(script.globalsearch)</condition>
-		<action>InstallAddon(script.globalsearch)</action>
-		<action>InstallAddon(plugin.program.autocompletion)</action>
-	</override>
-	<override action="RunScript(script.globalsearch)">
-		<condition>system.hasaddon(script.globalsearch)</condition>
-		<action>::ACTION::</action>
-	</override>
-
-	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="mainmenu">
-		<condition>!Skin.HasSetting(disableRecentMovies)</condition>
-		<action>::ACTION::</action>
-		<action>control.setfocus(9103,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="mainmenu">
-		<condition>Skin.HasSetting(disableRecentMovies)</condition>
-		<action>::ACTION::</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="videosubmenu">
-		<condition>!window.isactive(videos) + !Skin.HasSetting(disableRecentMovies)</condition>
-		<action>::ACTION::</action>
-		<action>control.setfocus(9103,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="videosubmenu">
-		<condition>window.isactive(videos) + !Skin.HasSetting(disableRecentMovies)</condition>
-		<action>Container.Update(videodb://movies/titles/)</action>
-		<action>control.setfocus(9103,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="videosubmenu">
-		<condition>!window.isactive(videos) + Skin.HasSetting(disableRecentMovies)</condition>
-		<action>::ACTION::</action>
-		<action>control.setfocus(9104,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="videosubmenu">
-		<condition>window.isactive(videos) + Skin.HasSetting(disableRecentMovies)</condition>
-		<action>Container.Update(videodb://movies/titles/)</action>
-		<action>control.setfocus(9104,0,absolute)</action>
-	</override>
-	
-	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="mainmenu">
-		<condition>!Skin.HasSetting(disableRecentTVShows)</condition>
-		<action>::ACTION::</action>
-		<action>control.setfocus(9203,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="mainmenu">
-		<condition>Skin.HasSetting(disableRecentTVShows)</condition>
-		<action>::ACTION::</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="videosubmenu">
-		<condition>!window.isactive(videos) + !Skin.HasSetting(disableRecentTVShows)</condition>
-		<action>::ACTION::</action>
-		<action>control.setfocus(9203,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="videosubmenu">
-		<condition>window.isactive(videos) + !Skin.HasSetting(disableRecentTVShows)</condition>
-		<action>Container.Update(videodb://tvshows/titles/)</action>
-		<action>control.setfocus(9203,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="videosubmenu">
-		<condition>!window.isactive(videos) + Skin.HasSetting(disableRecentTVShows)</condition>
-		<action>::ACTION::</action>
-		<action>control.setfocus(9204,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="videosubmenu">
-		<condition>window.isactive(videos) + Skin.HasSetting(disableRecentTVShows)</condition>
-		<action>Container.Update(videodb://tvshows/titles/)</action>
-		<action>control.setfocus(9204,0,absolute)</action>
-	</override>
-	
-	<override action="ActivateWindow(Music,musicdb://artists/)" group="musicsubmenu">
-		<condition>window.isactive(music)</condition>
-		<action>Container.Update(musicdb://artists/)</action>
-		<action>control.setfocus(51,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Music,musicdb://artists/)" group="musicsubmenu">
-		<condition>!window.isactive(music)</condition>
-		<action>::ACTION::</action>
-	</override>
-	
-	<override action="ActivateWindow(Music,musicdb://albums/)" group="mainmenu">
-		<condition>!Skin.HasSetting(disableRecentAlbums)</condition>
-		<action>::ACTION::</action>
-		<action>control.setfocus(9998,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Music,musicdb://albums/)" group="mainmenu">
-		<condition>Skin.HasSetting(disableRecentAlbums)</condition>
-		<action>::ACTION::</action>
-	</override>
-	<override action="ActivateWindow(Music,musicdb://albums/)" group="musicsubmenu">
-		<condition>!window.isactive(music) + !Skin.HasSetting(disableRecentAlbums)</condition>
-		<action>::ACTION::</action>
-		<action>control.setfocus(9998,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Music,musicdb://albums/)" group="musicsubmenu">
-		<condition>window.isactive(music) + !Skin.HasSetting(disableRecentAlbums)</condition>
-		<action>Container.Update(musicdb://albums/)</action>
-		<action>control.setfocus(9998,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Music,musicdb://albums/)" group="musicsubmenu">
-		<condition>!window.isactive(music) + Skin.HasSetting(disableRecentAlbums)</condition>
-		<action>::ACTION::</action>
-		<action>control.setfocus(9124,0,absolute)</action>
-	</override>
-	<override action="ActivateWindow(Music,musicdb://albums/)" group="musicsubmenu">
-		<condition>window.isactive(music) + Skin.HasSetting(disableRecentAlbums)</condition>
-		<action>Container.Update(musicdb://albums/)</action>
-		<action>control.setfocus(9124,0,absolute)</action>
-	</override>
-	
-	<override action="ActivateWindow(Music,musicdb://genres/)" group="musicsubmenu">
-		<condition>window.isactive(music)</condition>
-		<action>Container.Update(musicdb://genres/)</action>
-	</override>
-	<override action="ActivateWindow(Music,musicdb://genres/)" group="musicsubmenu">
-		<condition>!window.isactive(music)</condition>
-		<action>::ACTION::</action>
-	</override>
-	
-	<override action="ActivateWindow(Videos,videodb://musicvideos/titles/)" group="musicsubmenu">
-		<condition>window.isactive(music)</condition>
-		<action>Container.Update(videodb://musicvideos/titles/)</action>
-	</override>
-	<override action="ActivateWindow(Videos,videodb://musicvideos/titles/)" group="musicsubmenu">
-		<condition>!window.isactive(music)</condition>
-		<action>::ACTION::</action>
-	</override>
-	
-	<groupoverride group="videosubmenu" condition="true">control.setfocus(9999)</groupoverride>
-	<groupoverride group="musicsubmenu" condition="true">control.setfocus(9999)</groupoverride>
-	<groupoverride group="picturessubmenu" condition="true">control.setfocus(9999)</groupoverride>
-</overrides>
diff --git a/shortcuts/picturessubmenu.DATA.xml b/shortcuts/picturessubmenu.DATA.xml
deleted file mode 100644
index 7328f75..0000000
--- a/shortcuts/picturessubmenu.DATA.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shortcuts>
-    <shortcut>
-        <label>744</label>
-        <label2>32020</label2>
-        <icon>DefaultAddonPicture.png</icon>
-        <thumb />
-        <action>ActivateWindow(Pictures,files)</action>
-    </shortcut>
-    <shortcut>
-        <label>1039</label>
-        <label2>32020</label2>
-        <icon>DefaultAddonPicture.png</icon>
-        <thumb />
-        <action>ActivateWindow(Pictures,Addons,return)</action>
-    </shortcut>
-</shortcuts>
diff --git a/shortcuts/videosubmenu.DATA.xml b/shortcuts/videosubmenu.DATA.xml
deleted file mode 100644
index 53f23a3..0000000
--- a/shortcuts/videosubmenu.DATA.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shortcuts>
-	<shortcut>
-        <visible>Player.HasMedia</visible>
-        <label>31136</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>action(FullScreen)</action>
-    </shortcut>
-    <shortcut>
-        <visible>PVR.HasTVChannels</visible>
-        <label>31215</label>
-        <label2>32014</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(TVChannels)</action>
-    </shortcut>
-    <shortcut>
-        <visible>PVR.HasTVChannels</visible>
-        <label>31112</label>
-        <label2>32014</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(TVGuide)</action>
-    </shortcut>
-    <shortcut>
-        <visible>PVR.HasTVChannels</visible>
-        <label>31165</label>
-        <label2>32014</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(TVRecordings)</action>
-    </shortcut>
-    <shortcut>
-        <label>342</label>
-        <label2>32014</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Videos,videodb://movies/titles/)</action>
-    </shortcut>
-    <shortcut>
-        <label>20343</label>
-        <label2>32014</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Videos,videodb://tvshows/titles/)</action>
-    </shortcut>
-    <shortcut>
-        <label>31088</label>
-        <label2>32014</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Videos,addons://sources/video/)</action>
-    </shortcut>
-    <shortcut>
-        <label>136</label>
-        <label2>32014</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Videos,special://videoplaylists/,return)</action>
-    </shortcut>
-    <shortcut>
-        <label>744</label>
-        <label2>32014</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>ActivateWindow(Videos,sources://video/)</action>
-    </shortcut>
-</shortcuts>