From 4bc95b5214e1cb0981126d429e24b3e087f04666 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Mon, 13 Feb 2017 13:48:52 +0000
Subject: [PATCH] videoOSD revamp. Tweaks

---
 1080i/DialogFullScreenInfo.xml          | 140 +------------
 1080i/DialogSeekBar.xml                 |   2 +-
 1080i/VideoOSD.xml                      | 242 +++++++++++++++++-----
 1080i/View_Movies.xml                   |   1 -
 1080i/View_Songs.xml                    |   1 +
 1080i/custom_musicPlayerFullscreen.xml  |   5 +-
 1080i/custom_musicPlayerOptions.xml     |  99 ++++-----
 1080i/custom_subtitleMenu.xml           |  76 -------
 1080i/script-skinshortcuts-includes.xml | 264 +++++++++++++-----------
 changelog.txt                           |   6 +-
 language/English/strings.po             |  20 ++
 11 files changed, 413 insertions(+), 443 deletions(-)
 delete mode 100644 1080i/custom_subtitleMenu.xml

diff --git a/1080i/DialogFullScreenInfo.xml b/1080i/DialogFullScreenInfo.xml
index 0800894..255897f 100644
--- a/1080i/DialogFullScreenInfo.xml
+++ b/1080i/DialogFullScreenInfo.xml
@@ -1,143 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
+    <!--this window redirects to videoOSD.xml-->
+    <onload>activateWindow(videoosd)</onload>
     <controls>
-        <control type="group">
-            <include>fadeInOut</include>
-            <posx>0</posx>
-            <posy>0</posy>
-            <!--fade out if audio / video menu active-->
-            <animation type="Conditional" condition="Window.IsActive(seekbar) | Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels)">
-                <effect type="fade" start="100" end="0" time="200" tween="sine" easing="in"/>
-            </animation>
-            <include>dateTime</include>
-            <!--thumbnail-->
-            <control type="group">
-                <posx>col-1-begin</posx>
-                <posy>row-1-begin</posy>
-                <animation type="Windowopen">
-                    <effect type="fade" start="0" end="100" time="300"/>
-                    <effect type="slide" start="0,-300" end="0,0" tween="cubic" easing="out" time="400"/>
-                </animation>
-                <animation type="Windowclose">
-                    <effect type="fade" start="100" end="0" time="300"/>
-                    <effect type="slide" end="0,-300" tween="cubic" easing="out" time="400"/>
-                </animation>
-                <control type="image">
-					<visible>videoplayer.content(episodes)</visible>
-					<posx>0</posx>
-                    <posy>0</posy>
-                    <width>3-col-gutter</width>
-                    <height>288</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture border="6">$INFO[Player.Art(tvshow.poster)]</texture>
-                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
-                    <bordersize>6</bordersize>
-                    <colordiffuse>ffffffff</colordiffuse>
-				</control>
-				<control type="image">
-					<visible>videoplayer.content(movies)</visible>
-					<posx>0</posx>
-                    <posy>0</posy>
-                    <width>3-col-gutter</width>
-                    <height>288</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture border="6">$INFO[Player.Art(poster)]</texture>
-                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
-                    <bordersize>6</bordersize>
-                    <colordiffuse>ffffffff</colordiffuse>
-				</control>
-				<control type="image">
-					<visible>videoplayer.content(livetv)</visible>
-					<posx>0</posx>
-                    <posy>0</posy>
-                    <width>3-col-gutter</width>
-                    <height>3-col-gutter</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture border="6">$INFO[Player.Art(thumb)]</texture>
-                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
-                    <bordersize>6</bordersize>
-                    <colordiffuse>ffffffff</colordiffuse>
-				</control>
-            </control>
-            <control type="group">
-                <posx>0</posx>
-                <posy>row-22-begin</posy>
-                <animation type="Windowopen">
-                    <effect type="fade" start="0" end="100" time="300"/>
-                    <effect type="slide" start="0,300" end="0,0" tween="cubic" easing="out" time="400"/>
-                </animation>
-                <animation type="Windowclose">
-                    <effect type="fade" start="100" end="0" time="300"/>
-                    <effect type="slide" end="0,300" tween="cubic" easing="out" time="400"/>
-                </animation>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>fullscreenWidth</width>
-                    <height>10-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>textboxInactive</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>fullscreenWidth</width>
-                    <height>2-row</height>
-                    <texture colordiffuse="highlight">colors/white.png</texture>
-                    <colordiffuse>ccffffff</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-                <control type="label">
-                    <posx>120</posx>
-                    <posy>0</posy>
-                    <width>16-col</width>
-                    <height>2-row</height>
-                    <font>pageSubTitle</font>
-                    <aligny>center</aligny>
-                    <textcolor>textActive</textcolor>
-                    <label>[B]$INFO[videoplayer.TVShowTitle,,: ]$INFO[videoplayer.Title][/B]</label>
-                </control>
-                <control type="label">
-                    <visible>VideoPlayer.HasMenu</visible>
-                    <posx>col-17-begin</posx>
-                    <posy>0</posy>
-                    <width>4-col</width>
-                    <height>2-row</height>
-                    <font>pageSubTitle</font>
-                    <aligny>center</aligny>
-                    <textcolor>textActive</textcolor>
-                    <label>$LOCALIZE[31049] [B]$INFO[player.Chapter] / $INFO[player.Chaptercount][/B]</label>
-                </control>
-                <control type="label">
-                    <right>2-col-gutter</right>
-                    <posy>0</posy>
-                    <width>8-col</width>
-                    <height>2-row</height>
-                    <font>pageSubTitle</font>
-                    <align>right</align>
-                    <aligny>center</aligny>
-                    <textcolor>textActive</textcolor>
-                    <label>[B]$INFO[Videoplayer.time] / $INFO[Videoplayer.duration][/B]</label>
-                    <scroll>false</scroll>
-                </control>
-                <control type="textbox">
-                    <posx>120</posx>
-                    <posy>84</posy>
-                    <font>textbox</font>
-                    <width>23-col</width>
-                    <textcolor>textActive</textcolor>
-                    <height>116</height>
-                    <label fallback="31205">$INFO[videoplayer.plot]</label>
-                    <autoscroll delay="10000" time="5000" repeat="10000"/>
-                </control>
-            </control>
-        </control>
-        <!--debugging-->
-        <include>DebugGrid</include>
-        <control type="label">
-            <include>DialogID</include>
-            <label>DialogFullScreenInfo.xml</label>
-        </control>
     </controls>
 </window>
\ No newline at end of file
diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml
index 1879398..40cd592 100644
--- a/1080i/DialogSeekBar.xml
+++ b/1080i/DialogSeekBar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <visible>!window.isactive(videoosd) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings) + !Window.IsActive(1104) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
+    <visible>!window.isactive(videoosd) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
     <controls>
         <control type="image">
             <include>dimensionsFullscreen</include>
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 8daf718..f70df62 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -2,42 +2,163 @@
 <window>
     <defaultcontrol always="true">8001</defaultcontrol>
     <onload>Control.SetFocus(8001,3)</onload>
-    <include>fadeInOut</include>
     <controls>
-		<control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>colors/black.png</texture>
-            <aspectratio>stretch</aspectratio>
-            <colordiffuse>textboxInactive</colordiffuse>
-        </control>
         <control type="group">
+            <posx>1200</posx>
+            <posy>0</posy>
+            <animation type="Windowopen">
+                <effect type="fade" start="0" end="100" time="300" delay="300"/>
+                <effect type="slide" start="800" end="0" tween="cubic" easing="out" time="400" delay="300"/>
+            </animation>
+            <animation type="windowClose">
+                <effect type="fade" start="100" end="0" time="350"/>
+                <effect type="slide" start="0" end="900" tween="cubic" easing="out" time="400"/>
+            </animation>
             <!--fade out if audio / video menu active-->
             <animation type="Conditional" condition="Window.IsActive(seekbar) | Window.IsActive(osdvideosettings) | Window.IsActive(osdaudiosettings) | window.isactive(PVROSDChannels)">
-                <effect type="fade" start="100" end="0" time="200" tween="sine" easing="in"/>
+                <effect type="fade" start="100" end="0" time="350"/>
+                <effect type="slide" start="0" end="900" tween="cubic" easing="out" time="400"/>
             </animation>
-            <posx>col-10-begin</posx>
-            <posy>row-8-begin</posy>
-            <include>modalDialogInOutVertical</include>
-            <!--player controls-->
-            <control type="panel" id="8001">
+            <!--overlay-->
+            <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>6-col</width>
+                <width>10-col</width>
+                <height>fullscreenHeight</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>cc111111</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <posx>-6</posx>
+                <posy>0</posy>
+                <width>6</width>
+                <height>fullscreenHeight</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="group">
+                <posx>24</posx>
+                <posy>row-1-begin</posy>
+                <control type="group">
+                    <posx>-6</posx>
+                    <posy>0</posy>
+                    <control type="image">
+                        <visible>videoplayer.content(episodes)</visible>
+                        <posx>0</posx>
+                        <posy>-38</posy>
+                        <width>3-col-gutter</width>
+                        <height>256</height>
+                        <aspectratio>scale</aspectratio>
+                        <texture border="6">$INFO[Player.Art(tvshow.poster)]</texture>
+                        <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+                        <bordersize>6</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
+                    </control>
+                    <control type="image">
+                        <visible>videoplayer.content(movies)</visible>
+                        <posx>0</posx>
+                        <posy>-38</posy>
+                        <width>3-col-gutter</width>
+                        <height>256</height>
+                        <aspectratio>scale</aspectratio>
+                        <texture border="6">$INFO[Player.Art(poster)]</texture>
+                        <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+                        <bordersize>6</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
+                    </control>
+                    <control type="image">
+                        <visible>videoplayer.content(livetv)</visible>
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>3-col-gutter</width>
+                        <height>3-col-gutter</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="6">$INFO[Player.Art(thumb)]</texture>
+                        <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+                        <bordersize>6</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
+                    </control>
+                </control>
+                <control type="label">
+                    <posx>204</posx>
+                    <posy>24</posy>
+                    <width>396</width>
+                    <align>left</align>
+                    <height>4-row</height>
+                    <aligny>center</aligny>
+                    <font>largeLight</font>
+                    <textcolor>textActive</textcolor>
+                    <label>[B]$INFO[videoplayer.TVShowTitle,,: ][/B]$INFO[videoplayer.title]</label>
+                    <wrapmultiline>true</wrapmultiline>
+                </control>
+                <!--player position-->
+                <control type="progress">
+                    <description>Progress Bar</description>
+                    <posx>150</posx>
+                    <posy>247</posy>
+                    <width>5-col</width>
+                    <height>12</height>
+                    <texturebg>colors/white.png</texturebg>
+                    <midtexture colordiffuse="highlight">colors/white.png</midtexture>
+                    <info>Player.Progress</info>
+                </control>
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>6-row</posy>
+                    <width>8-col</width>
+                    <height>2-row</height>
+                    <font>pageSubTitle</font>
+                    <aligny>center</aligny>
+                    <textcolor>textActive</textcolor>
+                    <label>[B]$INFO[Videoplayer.time][/B]</label>
+                    <scroll>false</scroll>
+                </control>
+                <control type="label">
+                    <right>36</right>
+                    <posy>6-row</posy>
+                    <width>8-col</width>
+                    <height>2-row</height>
+                    <font>pageSubTitle</font>
+                    <align>right</align>
+                    <aligny>center</aligny>
+                    <textcolor>textActive</textcolor>
+                    <label>[B]$INFO[Videoplayer.duration][/B]</label>
+                    <scroll>false</scroll>
+                </control>
+                <!--synopsis-->
+                <control type="textbox">
+                    <posx>0</posx>
+                    <posy>8-row</posy>
+                    <font>textbox</font>
+                    <width>660</width>
+                    <align>left</align>
+                    <textcolor>textActive</textcolor>
+                    <height>388</height>
+                    <label fallback="31205">$INFO[Player.FinishTime(HH:MM),$LOCALIZE[31160] ,. ]$INFO[videoplayer.plot]</label>
+                    <autoscroll>false</autoscroll>
+                    <shadowcolor>-</shadowcolor>
+                    <pagecontrol>61</pagecontrol>
+                </control>
+                <control type="scrollbar" id="61">
+                    <posx>12r</posx>
+                    <posy>9-row</posy>
+                    <height>8-row</height>
+                    <ondown>8001</ondown>
+                </control>
+            </control>
+            <!--player controls-->
+            <control type="panel" id="8001">
+                <posx>60</posx>
+                <posy>766</posy>
+                <width>10-col</width>
                 <height>2-row</height>
                 <itemgap>0</itemgap>
                 <ondown>Control.SetFocus(8002,0)</ondown>
-                <onup>Control.SetFocus(8002,3)</onup>
+                <onup>Control.SetFocus(61)</onup>
                 <orientation>horizontal</orientation>
-                <itemlayout width="1-col" height="2-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>69</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                    </control>
+                <itemlayout width="88" height="2-row">
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -50,7 +171,7 @@
                         <label>$INFO[ListItem.label2]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="1-col" height="2-row">
+                <focusedlayout width="88" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -118,28 +239,23 @@
                         <thumb>-</thumb>
                         <onclick>PlayerControl(next)</onclick>
                     </item>
+                    <item>
+                        <enabled>System.GetBool(pvrmanager.enabled) + Player.CanRecord</enabled>
+                        <label2></label2>
+                        <thumb>-</thumb>
+                        <onclick>PlayerControl(record)</onclick>
+                    </item>
                 </content>
             </control>
             <!--menu items-->
             <control type="panel" id="8002">
                 <posx>0</posx>
-                <posy>2-row</posy>
-                <width>429</width>
+                <posy>24-row</posy>
+                <width>10-col</width>
                 <height>12-row</height>
                 <itemgap>0</itemgap>
                 <onup>8001</onup>
-                <ondown>8001</ondown>
-                <orientation>vertical</orientation>
-                <itemlayout width="6-col" height="2-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col</width>
-                        <height>69</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                    </control>
+                <itemlayout width="5-col" height="2-row">
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -154,7 +270,7 @@
                     <control type="label">
                         <posx>1-col-indent</posx>
                         <posy>0</posy>
-                        <width>5-col-gutter</width>
+                        <width>4-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemSubTitle</font>
@@ -162,7 +278,7 @@
                         <label>$INFO[ListItem.label]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="6-col" height="2-row">
+                <focusedlayout width="5-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -175,7 +291,7 @@
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>6-col</width>
+                        <width>4-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
@@ -196,7 +312,7 @@
                     <control type="label">
                         <posx>1-col-indent</posx>
                         <posy>0</posy>
-                        <width>5-col-gutter</width>
+                        <width>4-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemSubTitle</font>
@@ -206,37 +322,53 @@
                 </focusedlayout>
                 <content>
                     <item>
-                        <enabled>VideoPlayer.HasMenu</enabled>
+                        <visible>VideoPlayer.HasMenu</visible>
                         <label>31051</label>
                         <label2></label2>
                         <thumb>-</thumb>
                         <onclick>PlayerControl(ShowVideoMenu)</onclick>
                     </item>
-					<item>
-                        <enabled>System.GetBool(pvrmanager.enabled) + Player.CanRecord</enabled>
-                        <label>31201</label>
-                        <label2></label2>
+                    <item>
+                        <description>Download subtitles</description>
+                        <label>31154</label>
+                        <label2></label2>
                         <thumb>-</thumb>
-                        <onclick>PlayerControl(record)</onclick>
+                        <onclick>ActivateWindow(SubtitleSearch)</onclick>
                     </item>
                     <item>
-                        <description>Subtitles</description>
+                        <description>Enable Subtitles</description>
+                        <visible>VideoPlayer.HasSubtitles + !VideoPlayer.SubtitlesEnabled</visible>
                         <label>24012</label>
                         <label2></label2>
                         <thumb>-</thumb>
-                        <onclick>Close</onclick>
-                        <onclick>activateWindow(1104)</onclick>
+                        <onclick>ShowSubtitles</onclick>
+                    </item>
+                    <item>
+                        <description>Disable Subtitles</description>
+                        <visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
+                        <label>31161</label>
+                        <label2></label2>
+                        <thumb>-</thumb>
+                        <onclick>ShowSubtitles</onclick>
+                    </item>
+                    <item>
+                        <description>Adjust subtitle offset</description>
+                        <visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
+                        <label>31202</label>
+                        <label2></label2>
+                        <thumb>-</thumb>
+                        <onclick>SubtitleDelay</onclick>
                     </item>
                     <item>
                         <description>Video Settings</description>
-                        <label>13395</label>
+                        <label>31191</label>
                         <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(osdvideosettings)</onclick>
                     </item>
                     <item>
                         <description>Audio Settings</description>
-                        <label>13396</label>
+                        <label>31177</label>
                         <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(osdaudiosettings)</onclick>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index d676a96..209cc3c 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -84,7 +84,6 @@
                             <texture fallback="DefaultPoster.png" border="0">$INFO[ListItem.Art(poster)]</texture>
                             <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                             <bordersize>6</bordersize>
-                            <colordiffuse>ff666666</colordiffuse>
                         </control>
                         <control type="label">
                             <posx>12</posx>
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index 291c533..b4d75b4 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -39,6 +39,7 @@
                 <bordersize>6</bordersize>
                 <fadetime>500</fadetime>
                 <animation effect="rotateY" end="-7" center="auto,auto" time="0">windowopen</animation>
+                <animation effect="rotateY" end="-7" center="auto,auto" time="0">windowclose</animation>
             </control>
         </control>
         <control type="group">
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 208d5bb..ba688b3 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -8,6 +8,9 @@
         <control type="group">
             <include>fadeInOut</include>
             <control type="group">
+                <animation type="Conditional" condition="window.isactive(1105)">
+                    <effect type="slide" start="0,0" end="-100,0" tween="sine" time="300"/>
+                </animation>
                 <!--fanart-->
                 <control type="image">
                     <posx>0</posx>
@@ -31,7 +34,7 @@
             <control type="group">
                 <posx>col-1-begin</posx>
                 <posy>row-23-begin</posy>
-                <animation type="Conditional" condition="control.hasfocus(6789)">
+                <animation type="Conditional" condition="control.hasfocus(6789) | window.isactive(1105)">
                     <effect type="slide" start="0,0" end="0,500" tween="sine" time="400"/>
                 </animation>
                  <animation type="conditional" condition="!StringCompare(MusicPlayer.Time,00:00)">
diff --git a/1080i/custom_musicPlayerOptions.xml b/1080i/custom_musicPlayerOptions.xml
index b838da9..a61c895 100644
--- a/1080i/custom_musicPlayerOptions.xml
+++ b/1080i/custom_musicPlayerOptions.xml
@@ -1,24 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1105">
     <defaultcontrol always="true">8001</defaultcontrol>
-    <include>fadeInOut</include>
     <controls>
-        <control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>colors/black.png</texture>
-            <aspectratio>stretch</aspectratio>
-            <colordiffuse>overlay</colordiffuse>
-        </control>
         <!-- options menu-->
         <control type="group">
-            <posx>col-10-begin</posx>
-            <posy>row-6-begin</posy>
-            <!--animations-->
-            <include>modalDialogInOutVertical</include>
+            <posx>1488</posx>
+            <posy>0</posy>
+            <animation type="Windowopen">
+                <effect type="fade" start="0" end="100" time="300" delay="100"/>
+                <effect type="slide" start="800" end="0" tween="cubic" easing="out" time="400" delay="100"/>
+            </animation>
+            <animation type="windowClose">
+                <effect type="fade" start="100" end="0" time="350"/>
+                <effect type="slide" start="0" end="900" tween="cubic" easing="out" time="400"/>
+            </animation>
+            <!--overlay-->
+            <control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>10-col</width>
+                <height>fullscreenHeight</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>cc111111</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <posx>-6</posx>
+                <posy>0</posy>
+                <width>6</width>
+                <height>fullscreenHeight</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <!--thumbnail-->
+            <control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>6-col</width>
+                <height>6-col</height>
+                <texture fallback="DefaultAlbumCover.png">$INFO[MusicPlayer.Cover]</texture>
+                <colordiffuse>ffffffff</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <!--player controls-->
             <control type="panel" id="8001">
                 <posx>0</posx>
-                <posy>0</posy>
+                <posy>12-row</posy>
                 <width>6-col</width>
                 <height>2-row</height>
                 <itemgap>0</itemgap>
@@ -26,15 +54,6 @@
                 <onup>Control.SetFocus(8003,4)</onup>
                 <orientation>horizontal</orientation>
                 <itemlayout width="1-col" height="2-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>69</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                    </control>
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -51,11 +70,10 @@
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>69</height>
+                        <width>1-col</width>
+                        <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
-                        <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>0</posx>
@@ -65,7 +83,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>symbolLarge</font>
-                        <textcolor>textActive</textcolor>
+                        <textcolor>black</textcolor>
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
@@ -88,6 +106,7 @@
                         <label2></label2>
                         <thumb>-</thumb>
                         <onclick>PlayerControl(stop)</onclick>
+                        <onclick>Dialog.Close(1105)</onclick>
                     </item>
                     <item>
                         <visible>Player.Playing | player.forwarding | player.rewinding</visible>
@@ -120,16 +139,7 @@
             <!--Star rating-->
             <control type="group">
                 <posx>0</posx>
-                <posy>2-row</posy>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>6-col</width>
-                    <height>69</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                </control>
+                <posy>14-row</posy>
                 <control type="image">
                     <visible>control.hasfocus(8002)</visible>
                     <posx>0</posx>
@@ -144,7 +154,7 @@
                     <posx>0</posx>
                     <posy>0</posy>
                     <width>1-col</width>
-                    <height>69</height>
+                    <height>2-row</height>
                     <align>center</align>
                     <aligny>center</aligny>
                     <font>symbolLarge</font>
@@ -154,7 +164,7 @@
                 <control type="button" id="8002">
                     <posx>1-col</posx>
                     <posy>0</posy>
-                    <height>69</height>
+                    <height>2-row</height>
                     <width>5-col</width>
                     <font>symbolLarge</font>
                     <textoffsetx>12</textoffsetx>
@@ -169,22 +179,13 @@
             <!--final options-->
             <control type="panel" id="8003">
                 <posx>0</posx>
-                <posy>4-row</posy>
+                <posy>16-row</posy>
                 <width>429</width>
                 <height>10-row</height>
                 <orientation>vertical</orientation>
                 <onup>8002</onup>
                 <ondown>Control.SetFocus(8001,3)</ondown>
                 <itemlayout width="6-col" height="2-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col</width>
-                        <height>69</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                    </control>
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -202,7 +203,7 @@
                         <width>5-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>itemSubTitle</font>
+                        <font>buttonTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
@@ -244,7 +245,7 @@
                         <width>5-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>itemSubTitle</font>
+                        <font>buttonTitle</font>
                         <textcolor>black</textcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
diff --git a/1080i/custom_subtitleMenu.xml b/1080i/custom_subtitleMenu.xml
deleted file mode 100644
index 06a9ea3..0000000
--- a/1080i/custom_subtitleMenu.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog" id="1104">
-    <defaultcontrol always="true">5000</defaultcontrol>
-    <controls>
-        <include>fadeInOut</include>
-        <control type="group">
-            <visible>!Window.IsVisible(SliderDialog)</visible>
-            <control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>fullscreenWidth</width>
-                <height>fullscreenHeight</height>
-                <aspectratio>stretch</aspectratio>
-                <texture>colors/black.png</texture>
-                <colordiffuse>ccFFFFFF</colordiffuse>
-            </control>
-            <control type="image">
-                <include>dimensionsFullscreen</include>
-                <texture>backgrounds/vignette.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="group">
-                <posx>col-10-begin</posx>
-                <posy>row-9-begin</posy>
-                <!--animations-->
-                <include>modalDialogInOutVertical</include>
-                <!--subtitle menu-->
-                <control type="grouplist" id="5000">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>6-col</width>
-                    <height>11-row</height>
-                    <itemgap>0</itemgap>
-                    <control type="radiobutton" id="1">
-                        <description>Enable subtitles</description>
-                        <enable>VideoPlayer.HasSubtitles</enable>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>textActive</focusedcolor>
-                        <label>31151</label>
-                        <textureradiofocus>-</textureradiofocus>
-                        <textureradionofocus>-</textureradionofocus>
-                        <radiowidth/>
-                        <radioheight/>
-                        <onclick>ShowSubtitles</onclick>
-                        <selected>VideoPlayer.SubtitlesEnabled</selected>
-                    </control>
-                    <control type="button" id="3">
-                        <description>Adjust Subtitle Offset</description>
-                        <visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
-                        <label>31202</label>
-                        <width>8-col</width>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>textActive</focusedcolor>
-                        <onclick>SubtitleDelay</onclick>
-                    </control>
-                    <control type="button" id="4">
-                        <description>Download Subtitle</description>
-                        <width>8-col</width>
-                        <label>31154</label>
-                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <focusedcolor>textActive</focusedcolor>
-                        <onclick>Dialog.Close(VideoOSD)</onclick>
-                        <onclick>ActivateWindow(SubtitleSearch)</onclick>
-                    </control>
-                </control>
-            </control>
-        </control>
-        <!--debugging-->
-        <include>DebugGrid</include>
-        <control type="label">
-            <include>DialogID</include>
-            <label>custom_subtitleMenu.xml</label>
-        </control>
-    </controls>
-</window>
diff --git a/1080i/script-skinshortcuts-includes.xml b/1080i/script-skinshortcuts-includes.xml
index ba2cfef..857b8c8 100644
--- a/1080i/script-skinshortcuts-includes.xml
+++ b/1080i/script-skinshortcuts-includes.xml
@@ -37,6 +37,22 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
+			<label>favourites</label>
+			<label2>Custom item</label2>
+			<icon>DefaultShortcut.png</icon>
+			<thumb />
+			<property name="labelID">favourites</property>
+			<property name="defaultID" />
+			<onclick>ActivateWindow(Pictures,"/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/",return)</onclick>
+			<property name="path">ActivateWindow(Pictures,"/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/",return)</property>
+			<property name="list">/Users/chrisbevan/Sync/Art &amp; Design/CraveControl/</property>
+			<visible>StringCompare(System.ProfileName,Master user)</visible>
+			<property name="submenuVisibility">favourites</property>
+			<property name="group">mainmenu</property>
+			<property name="hasSubmenu">False</property>
+		</item>
+		<item id="4">
+			<property name="id">$NUMBER[4]</property>
 			<label>$ADDON[script.skinshortcuts 32033]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -52,8 +68,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">False</property>
 		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
+		<item id="5">
+			<property name="id">$NUMBER[5]</property>
 			<label>$LOCALIZE[31147]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -69,8 +85,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">False</property>
 		</item>
-		<item id="5">
-			<property name="id">$NUMBER[5]</property>
+		<item id="6">
+			<property name="id">$NUMBER[6]</property>
 			<label>$LOCALIZE[31006]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -86,8 +102,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">False</property>
 		</item>
-		<item id="6">
-			<property name="id">$NUMBER[6]</property>
+		<item id="7">
+			<property name="id">$NUMBER[7]</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -103,8 +119,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">False</property>
 		</item>
-		<item id="7">
-			<property name="id">$NUMBER[7]</property>
+		<item id="8">
+			<property name="id">$NUMBER[8]</property>
 			<label>$LOCALIZE[10006]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -124,8 +140,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">True</property>
 		</item>
-		<item id="8">
-			<property name="id">$NUMBER[8]</property>
+		<item id="9">
+			<property name="id">$NUMBER[9]</property>
 			<label>$LOCALIZE[10006]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -141,8 +157,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">False</property>
 		</item>
-		<item id="9">
-			<property name="id">$NUMBER[9]</property>
+		<item id="10">
+			<property name="id">$NUMBER[10]</property>
 			<label>$LOCALIZE[10005]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -162,8 +178,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">True</property>
 		</item>
-		<item id="10">
-			<property name="id">$NUMBER[10]</property>
+		<item id="11">
+			<property name="id">$NUMBER[11]</property>
 			<label>$LOCALIZE[10005]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -179,8 +195,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">False</property>
 		</item>
-		<item id="11">
-			<property name="id">$NUMBER[11]</property>
+		<item id="12">
+			<property name="id">$NUMBER[12]</property>
 			<label>$LOCALIZE[12600]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -196,8 +212,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">False</property>
 		</item>
-		<item id="12">
-			<property name="id">$NUMBER[12]</property>
+		<item id="13">
+			<property name="id">$NUMBER[13]</property>
 			<label>$LOCALIZE[10002]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -212,8 +228,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">True</property>
 		</item>
-		<item id="13">
-			<property name="id">$NUMBER[13]</property>
+		<item id="14">
+			<property name="id">$NUMBER[14]</property>
 			<label>$LOCALIZE[10004]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -228,8 +244,8 @@
 			<property name="group">mainmenu</property>
 			<property name="hasSubmenu">True</property>
 		</item>
-		<item id="14">
-			<property name="id">$NUMBER[14]</property>
+		<item id="15">
+			<property name="id">$NUMBER[15]</property>
 			<label>$LOCALIZE[31004]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -509,7 +525,7 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">7</property>
+			<property name="mainmenuid">8</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -526,7 +542,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">7</property>
+			<property name="mainmenuid">8</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -542,7 +558,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">7</property>
+			<property name="mainmenuid">8</property>
 			<label>$LOCALIZE[1037]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -558,7 +574,7 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">9</property>
+			<property name="mainmenuid">10</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32019]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -574,7 +590,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">9</property>
+			<property name="mainmenuid">10</property>
 			<label>$LOCALIZE[15100]</label>
 			<label2>$ADDON[script.skinshortcuts 32019]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -590,7 +606,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">9</property>
+			<property name="mainmenuid">10</property>
 			<label>$LOCALIZE[1038]</label>
 			<label2>$ADDON[script.skinshortcuts 32019]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -606,7 +622,7 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">12</property>
+			<property name="mainmenuid">13</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -622,7 +638,7 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[7]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -638,7 +654,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[13200]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -654,7 +670,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[10007]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -670,7 +686,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[14111]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -687,7 +703,7 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -704,7 +720,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -722,7 +738,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31215]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -739,7 +755,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31112]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -756,7 +772,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31165]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -773,7 +789,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[342]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -790,7 +806,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -807,7 +823,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31088]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -823,7 +839,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -839,7 +855,7 @@
 		</item>
 		<item id="10">
 			<property name="id">$NUMBER[10]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -855,7 +871,7 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -872,7 +888,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -890,7 +906,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>&lt;None&gt;</label>
 			<label2>Custom item</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -906,7 +922,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -923,7 +939,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -940,7 +956,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -957,7 +973,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -974,7 +990,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -990,7 +1006,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -1006,7 +1022,7 @@
 		</item>
 		<item id="10">
 			<property name="id">$NUMBER[10]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -1022,7 +1038,7 @@
 		</item>
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">17</property>
+			<property name="mainmenuid">18</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1039,7 +1055,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">17</property>
+			<property name="mainmenuid">18</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1678,6 +1694,12 @@
 			<property name="isSubmenu">True</property>
 		</item>
 	</include>
+	<include name="skinshortcuts-group-favourites">
+		<description>No items</description>
+	</include>
+	<include name="skinshortcuts-group-alt-favourites">
+		<description>No items</description>
+	</include>
 	<include name="skinshortcuts-group-num-32033">
 		<description>No items</description>
 		<description>No items</description>
@@ -1713,7 +1735,7 @@
 	<include name="skinshortcuts-group-videos">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">7</property>
+			<property name="mainmenuid">8</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1730,7 +1752,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">7</property>
+			<property name="mainmenuid">8</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1746,7 +1768,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">7</property>
+			<property name="mainmenuid">8</property>
 			<label>$LOCALIZE[1037]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1813,7 +1835,7 @@
 	<include name="skinshortcuts-group-alt-videos">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">7</property>
+			<property name="mainmenuid">8</property>
 			<label>$LOCALIZE[20389]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1830,7 +1852,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">7</property>
+			<property name="mainmenuid">8</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1846,7 +1868,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">7</property>
+			<property name="mainmenuid">8</property>
 			<label>$LOCALIZE[1037]</label>
 			<label2>$ADDON[script.skinshortcuts 32014]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1921,7 +1943,7 @@
 	<include name="skinshortcuts-group-music">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">9</property>
+			<property name="mainmenuid">10</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32019]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1937,7 +1959,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">9</property>
+			<property name="mainmenuid">10</property>
 			<label>$LOCALIZE[15100]</label>
 			<label2>$ADDON[script.skinshortcuts 32019]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -1953,7 +1975,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">9</property>
+			<property name="mainmenuid">10</property>
 			<label>$LOCALIZE[1038]</label>
 			<label2>$ADDON[script.skinshortcuts 32019]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2019,7 +2041,7 @@
 	<include name="skinshortcuts-group-alt-music">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">9</property>
+			<property name="mainmenuid">10</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32019]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2035,7 +2057,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">9</property>
+			<property name="mainmenuid">10</property>
 			<label>$LOCALIZE[15100]</label>
 			<label2>$ADDON[script.skinshortcuts 32019]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2051,7 +2073,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">9</property>
+			<property name="mainmenuid">10</property>
 			<label>$LOCALIZE[1038]</label>
 			<label2>$ADDON[script.skinshortcuts 32019]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2133,7 +2155,7 @@
 	<include name="skinshortcuts-group-pictures">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">12</property>
+			<property name="mainmenuid">13</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2167,7 +2189,7 @@
 	<include name="skinshortcuts-group-alt-pictures">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">12</property>
+			<property name="mainmenuid">13</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2201,7 +2223,7 @@
 	<include name="skinshortcuts-group-settings">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[7]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2217,7 +2239,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[13200]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2233,7 +2255,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[10007]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2249,7 +2271,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[14111]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2333,7 +2355,7 @@
 	<include name="skinshortcuts-group-alt-settings">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[7]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2349,7 +2371,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[13200]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2365,7 +2387,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[10007]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2381,7 +2403,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">13</property>
+			<property name="mainmenuid">14</property>
 			<label>$LOCALIZE[14111]</label>
 			<label2>$ADDON[script.skinshortcuts 32034]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -2473,7 +2495,7 @@
 	<include name="skinshortcuts-group-videosubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2490,7 +2512,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2508,7 +2530,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31215]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2525,7 +2547,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31112]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2542,7 +2564,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31165]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2559,7 +2581,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[342]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2576,7 +2598,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2593,7 +2615,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31088]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2609,7 +2631,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2625,7 +2647,7 @@
 		</item>
 		<item id="10">
 			<property name="id">$NUMBER[10]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2811,7 +2833,7 @@
 	<include name="skinshortcuts-group-alt-videosubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>Common menu item</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2828,7 +2850,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2846,7 +2868,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31215]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2863,7 +2885,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31112]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2880,7 +2902,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31165]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2897,7 +2919,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[342]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2914,7 +2936,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[20343]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2931,7 +2953,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[31088]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2947,7 +2969,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -2963,7 +2985,7 @@
 		</item>
 		<item id="10">
 			<property name="id">$NUMBER[10]</property>
-			<property name="mainmenuid">15</property>
+			<property name="mainmenuid">16</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>Videos</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3149,7 +3171,7 @@
 	<include name="skinshortcuts-group-musicsubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3166,7 +3188,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3184,7 +3206,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>&lt;None&gt;</label>
 			<label2>Custom item</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -3200,7 +3222,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3217,7 +3239,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3234,7 +3256,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3251,7 +3273,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3268,7 +3290,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3284,7 +3306,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3300,7 +3322,7 @@
 		</item>
 		<item id="10">
 			<property name="id">$NUMBER[10]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3469,7 +3491,7 @@
 	<include name="skinshortcuts-group-alt-musicsubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31136]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3486,7 +3508,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31005]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3504,7 +3526,7 @@
 		</item>
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>&lt;None&gt;</label>
 			<label2>Custom item</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -3520,7 +3542,7 @@
 		</item>
 		<item id="4">
 			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3537,7 +3559,7 @@
 		</item>
 		<item id="5">
 			<property name="id">$NUMBER[5]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3554,7 +3576,7 @@
 		</item>
 		<item id="6">
 			<property name="id">$NUMBER[6]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3571,7 +3593,7 @@
 		</item>
 		<item id="7">
 			<property name="id">$NUMBER[7]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3588,7 +3610,7 @@
 		</item>
 		<item id="8">
 			<property name="id">$NUMBER[8]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3604,7 +3626,7 @@
 		</item>
 		<item id="9">
 			<property name="id">$NUMBER[9]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3620,7 +3642,7 @@
 		</item>
 		<item id="10">
 			<property name="id">$NUMBER[10]</property>
-			<property name="mainmenuid">16</property>
+			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3789,7 +3811,7 @@
 	<include name="skinshortcuts-group-picturessubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">17</property>
+			<property name="mainmenuid">18</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -3806,7 +3828,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">17</property>
+			<property name="mainmenuid">18</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -3859,7 +3881,7 @@
 	<include name="skinshortcuts-group-alt-picturessubmenu">
 		<item id="1">
 			<property name="id">$NUMBER[1]</property>
-			<property name="mainmenuid">17</property>
+			<property name="mainmenuid">18</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
@@ -3876,7 +3898,7 @@
 		</item>
 		<item id="2">
 			<property name="id">$NUMBER[2]</property>
-			<property name="mainmenuid">17</property>
+			<property name="mainmenuid">18</property>
 			<label>$LOCALIZE[1039]</label>
 			<label2>$ADDON[script.skinshortcuts 32020]</label2>
 			<icon>DefaultShortcut.png</icon>
diff --git a/changelog.txt b/changelog.txt
index 5a43edb..87cec32 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,7 +5,11 @@ DONE - video playlists
 DONE - pvr info screen rework (header - 2 column mode)
 DONE - Add user options for menu customisation to skin settings
 DONE - album default art fix
-DONE - picture section fix
+DONE - rework fullscreen options OSD
+
+- picture section fix
+
+DONE - Reworked music fullscreen menu. Ensure closes properly on stop
 
 [V1.0.4]
 - Minor tweaks and bug fixes
diff --git a/language/English/strings.po b/language/English/strings.po
index d963c48..3e2d326 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -657,10 +657,22 @@ msgctxt "#31159"
 msgid "Unknown"
 msgstr ""
 
+msgctxt "#31160"
+msgid "Ends"
+msgstr ""
+
+msgctxt "#31161"
+msgid "Turn off Subtitles"
+msgstr ""
+
 msgctxt "#31162"
 msgid "Home menu items"
 msgstr ""
 
+msgctxt "#31163"
+msgid "Music Player"
+msgstr ""
+
 msgctxt "#31164"
 msgid "Radio"
 msgstr ""
@@ -713,6 +725,10 @@ msgctxt "#31176"
 msgid "New Movies"
 msgstr ""
 
+msgctxt "#31177"
+msgid "Audio Settings"
+msgstr ""
+
 msgctxt "#31178"
 msgid "New TV Shows"
 msgstr ""
@@ -765,6 +781,10 @@ msgctxt "#31190"
 msgid "All Episodes"
 msgstr ""
 
+msgctxt "#31191"
+msgid "Video Settings"
+msgstr ""
+
 msgctxt "#31192"
 msgid "Date"
 msgstr ""