From c64e37f99b8ffceaf614a31cb9cc566bd4013ffe Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Wed, 17 Aug 2022 21:19:56 +0100
Subject: [PATCH] various

---
 1080i/MyPVRGuide.xml                   |  66 +++++--
 1080i/MyPVRRecordings.xml              |   8 +-
 1080i/Settings.xml                     |   2 +-
 1080i/SettingsCategory.xml             |   5 +-
 1080i/SkinSettings.xml                 |  14 +-
 1080i/View_LiveTVChannels.xml          |  45 +++--
 1080i/View_MusicPlaylist.xml           | 242 ++++++++++---------------
 1080i/custom_musicPlayerFullscreen.xml |   4 +-
 media/masks/fullScreenAlbumArt.png     | Bin 0 -> 816 bytes
 media/masks/menuTitle.png              | Bin 0 -> 443 bytes
 10 files changed, 203 insertions(+), 183 deletions(-)
 create mode 100644 media/masks/fullScreenAlbumArt.png
 create mode 100644 media/masks/menuTitle.png

diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index e645957..14ed553 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -52,15 +52,34 @@
 						</control>
 					</rulerdatelayout>
 					<channellayout height="2-row" width="288">
-						<control type="image">
-							<posx>0</posx>
-							<posy>3</posy>
-							<width>66</width>
-							<height>66</height>
-							<aspectratio>keep</aspectratio>
-							<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-							<colordiffuse>overlay</colordiffuse>
-						</control>
+    					<control type="image">
+    						<posx>0</posx>
+    						<posy>0</posy>
+    						<width>69</width>
+    						<height>69</height>
+    						<aspectratio>stretch</aspectratio>
+    						<texture diffuse="masks/iconEndCapLeft.png" border="0">colors/black.png</texture>
+    						<colordiffuse>d0000000</colordiffuse>
+    					</control>
+    					<control type="image">
+    						<posx>0</posx>
+    						<posy>0</posy>
+    						<width>69</width>
+    						<height>69</height>
+    						<aspectratio>stretch</aspectratio>
+    						<texture diffuse="masks/iconEndCapLeft.png">$INFO[listitem.thumb]</texture>
+                            <bordersize>8</bordersize>
+    						<colordiffuse></colordiffuse>
+    					</control>
+    					<control type="image">
+    						<posx>1-col</posx>
+    						<posy>0</posy>
+    						<width>3-col-textbox</width>
+    						<height>69</height>
+    						<aspectratio>stretch</aspectratio>
+    						<texture border="0">masks/tvChannel.png</texture>
+    						<colordiffuse>d0000000</colordiffuse>
+    					</control>
 						<control type="label">
 							<posx>1-col-indent</posx>
 							<width>198</width>
@@ -80,18 +99,31 @@
 							<texture>colors/white.png</texture>
 							<colordiffuse>highlight</colordiffuse>
 						</control>
-						<control type="image">
-							<posx>0</posx>
-							<posy>3</posy>
-							<width>66</width>
-							<height>66</height>
-							<aspectratio>keep</aspectratio>
-							<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <control type="group">
 							<animation type="focus" loop="false" reversible="false">
 								<effect type="fade" time="500"/>
 								<effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
 							</animation>
-						</control>
+        					<control type="image">
+        						<posx>0</posx>
+        						<posy>0</posy>
+        						<width>69</width>
+        						<height>72</height>
+        						<aspectratio>stretch</aspectratio>
+        						<texture diffuse="masks/iconEndCapLeft.png" border="0">colors/white.png</texture>
+        						<colordiffuse>highlight</colordiffuse>
+        					</control>
+        					<control type="image">
+        						<posx>0</posx>
+        						<posy>0</posy>
+        						<width>69</width>
+        						<height>69</height>
+        						<aspectratio>stretch</aspectratio>
+        						<texture diffuse="masks/iconEndCapLeft.png">$INFO[listitem.thumb]</texture>
+                                <bordersize>8</bordersize>
+        						<colordiffuse></colordiffuse>
+        					</control>
+                        </control>
 						<control type="label">
 							<posx>1-col-indent</posx>
 							<width>198</width>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 971dcf7..472e969 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -82,7 +82,7 @@
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <shadowcolor></shadowcolor>
-                            <label>$INFO[ListItem.Date,,   ]$INFO[ListItem.Duration,(,)]</label>
+                            <label>$INFO[ListItem.Date,,  • ]$INFO[ListItem.duration(H)]hr $INFO[ListItem.duration(MM)]min</label>
                         </control>
                     </itemlayout>
                     <focusedlayout width="24-col" height="2-row">
@@ -132,10 +132,10 @@
                             <textcolor>textActive</textcolor>
                             <selectedcolor>textActive</selectedcolor>
                             <shadowcolor></shadowcolor>
-                            <label>$INFO[ListItem.Label]$INFO[ListItem.EpisodeName,  - ,]</label>
+                            <label>$INFO[ListItem.label]$INFO[ListItem.EpisodeName,  - ,]</label>
                         </control>
                         <control type="label">
-                            <right>12</right>
+                            <right>24</right>
                             <posy>0</posy>
                             <width>12-col</width>
                             <height>2-row</height>
@@ -144,7 +144,7 @@
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <shadowcolor></shadowcolor>
-                            <label>$INFO[ListItem.Date,,   ]$INFO[ListItem.Duration,(,)]</label>
+                            <label>$INFO[ListItem.Date,,  • ]$INFO[ListItem.duration(H)]hr $INFO[ListItem.duration(MM)]min</label>
                         </control>
                     </focusedlayout>
                 </control>
diff --git a/1080i/Settings.xml b/1080i/Settings.xml
index 621a8af..f16aef4 100644
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@@ -26,7 +26,7 @@
                 <posy>0</posy>
                 <width>18-col</width>
                 <height>2-row</height>
-                <texture>colors/white.png</texture>
+                <texture diffuse="masks/menuTitle.png">colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml
index 11139ab..7b410be 100644
--- a/1080i/SettingsCategory.xml
+++ b/1080i/SettingsCategory.xml
@@ -36,7 +36,7 @@
                 <posy>0</posy>
                 <width>18-col</width>
                 <height>2-row</height>
-                <texture>colors/white.png</texture>
+                <texture diffuse="masks/menuTitle.png">colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
@@ -99,6 +99,7 @@
                 <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
                 <align>left</align>
                 <textoffsetx>24</textoffsetx>
+                <font>buttonTitle</font>
             </control>
             <control type="label" id="14">
                 <description>Default Label</description>
@@ -115,10 +116,12 @@
                 <description>Default Radio Button</description>
                 <texturenofocus></texturenofocus>
                 <texturefocus>colors/white.png</texturefocus>
+                <font>buttonTitle</font>
             </control>
             <control type="spincontrolex" id="9">
                 <description>Default Spin Control</description>
                 <texturenofocus></texturenofocus>
+                <font>buttonTitle</font>
             </control>
             <control type="sliderex" id="13">
                 <description>Default Slider</description>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index c04e821..cb00add 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -23,7 +23,7 @@
                 <posy>0</posy>
                 <width>18-col</width>
                 <height>2-row</height>
-                <texture>colors/white.png</texture>
+                <texture diffuse="masks/menuTitle.png">colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
@@ -111,6 +111,7 @@
                     <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(stopVideoOnMenu)</onclick>
                     <selected>Skin.HasSetting(stopVideoOnMenu)</selected>
+                    <font>buttonTitle</font>
                 </control>
                 <control type="button" id="2">
                     <visible>Container(8000).Hasfocus(1)</visible>
@@ -124,6 +125,7 @@
                     <textwidth>8-col</textwidth>
                     <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
                     <texturenofocus></texturenofocus>
+                    <font>buttonTitle</font>
                 </control>
                 <control type="button" id="3">
                     <visible>Container(8000).Hasfocus(1)</visible>
@@ -136,6 +138,7 @@
                     <textwidth>8-col</textwidth>
                     <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
                     <texturenofocus></texturenofocus>
+                    <font>buttonTitle</font>
                 </control>
 
                 <control type="radiobutton" id="1">
@@ -147,6 +150,7 @@
                     <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(exitFirst)</onclick>
                     <selected>Skin.HasSetting(exitFirst)</selected>
+                    <font>buttonTitle</font>
                 </control>
                 <control type="radiobutton" id="7">
                     <visible>Container(8000).Hasfocus(3)</visible>
@@ -157,6 +161,7 @@
                     <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(DebugGrid)</onclick>
                     <selected>Skin.HasSetting(DebugGrid)</selected>
+                    <font>buttonTitle</font>
                 </control>
                 <control type="radiobutton" id="8">
                     <visible>Container(8000).Hasfocus(3)</visible>
@@ -167,6 +172,7 @@
                     <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(DebugInfo)</onclick>
                     <selected>Skin.HasSetting(DebugInfo)</selected>
+                    <font>buttonTitle</font>
                 </control>
                 <control type="button" id="9">
                     <visible>Container(8000).Hasfocus(3)</visible>
@@ -179,6 +185,7 @@
                     <texturenofocus></texturenofocus>
                     <onclick>ReloadSkin()</onclick>
                     <onclick>activateWindow(home)</onclick>
+                    <font>buttonTitle</font>
                 </control>
                 <control type="radiobutton" id="10">
                     <visible>Container(8000).Hasfocus(1)</visible>
@@ -190,6 +197,7 @@
                     <onclick>Skin.ToggleSetting(lowPowerMode)</onclick>
                     <onclick>ReloadSkin()</onclick>
                     <selected>Skin.HasSetting(lowPowerMode)</selected>
+                    <font>buttonTitle</font>
                 </control>
                 <control type="radiobutton" id="17">
                     <visible>Container(8000).Hasfocus(1)</visible>
@@ -200,6 +208,7 @@
                     <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(disableExtendedFanart)</onclick>
                     <selected>Skin.HasSetting(disableExtendedFanart)</selected>
+                    <font>buttonTitle</font>
                 </control>
 				<control type="radiobutton" id="18">
                     <visible>Container(8000).Hasfocus(1)</visible>
@@ -210,6 +219,7 @@
                     <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(disableRecentMovies)</onclick>
                     <selected>Skin.HasSetting(disableRecentMovies)</selected>
+                    <font>buttonTitle</font>
                 </control>
 				<control type="radiobutton" id="19">
                     <visible>Container(8000).Hasfocus(1)</visible>
@@ -220,6 +230,7 @@
                     <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(disableRecentTVShows)</onclick>
                     <selected>Skin.HasSetting(disableRecentTVShows)</selected>
+                    <font>buttonTitle</font>
                 </control>
 				<control type="radiobutton" id="20">
                     <visible>Container(8000).Hasfocus(1)</visible>
@@ -230,6 +241,7 @@
                     <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(disableRecentAlbums)</onclick>
                     <selected>Skin.HasSetting(disableRecentAlbums)</selected>
+                    <font>buttonTitle</font>
                 </control>
             </control>
         </control>
diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml
index 15b3545..5a33c74 100644
--- a/1080i/View_LiveTVChannels.xml
+++ b/1080i/View_LiveTVChannels.xml
@@ -30,9 +30,19 @@
 						<width>69</width>
 						<height>69</height>
 						<aspectratio>stretch</aspectratio>
-						<texture fallback="colors/black.png" diffuse="masks/iconEndCapLeft.png" border="0">$INFO[Listitem.thumb]</texture>
+						<texture diffuse="masks/iconEndCapLeft.png" border="0">colors/black.png</texture>
 						<colordiffuse>d0000000</colordiffuse>
 					</control>
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>69</width>
+						<height>69</height>
+						<aspectratio>stretch</aspectratio>
+						<texture diffuse="masks/iconEndCapLeft.png">$INFO[listitem.thumb]</texture>
+                        <bordersize>8</bordersize>
+						<colordiffuse></colordiffuse>
+					</control>
 					<control type="label">
 						<posx>96</posx>
 						<posy>0</posy>
@@ -58,7 +68,7 @@
 					<control type="label">
 						<posx>520</posx>
 						<posy>0</posy>
-						<width>7-col-gutter</width>
+						<width>444</width>
 						<height>2-row</height>
 						<aligny>center</aligny>
 						<font>itemTitle</font>
@@ -100,20 +110,31 @@
 						<texture border="0">masks/tvChannel.png</texture>
 						<colordiffuse>highlight</colordiffuse>
 					</control>
-					<control type="image">
-						<posx>0</posx>
-						<posy>0</posy>
-						<width>69</width>
-						<height>69</height>
-						<aspectratio>stretch</aspectratio>
-						<texture fallback="colors/white.png" diffuse="masks/iconEndCapLeft.png" border="0">$INFO[Listitem.thumb]</texture>
+                    <control type="group">
 						<animation type="focus" loop="false" reversible="false">
 							<effect type="fade" time="500"/>
 							<effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
                             <effect type="fade" start="100" end="50" time="0"/>
 						</animation>
-                        <colordiffuse>highlight</colordiffuse>
-					</control>
+    					<control type="image">
+    						<posx>0</posx>
+    						<posy>0</posy>
+    						<width>69</width>
+    						<height>69</height>
+    						<aspectratio>stretch</aspectratio>
+    						<texture diffuse="masks/iconEndCapLeft.png" border="0">colors/white.png</texture>
+                            <colordiffuse>highlight</colordiffuse>
+    					</control>
+    					<control type="image">
+    						<posx>0</posx>
+    						<posy>0</posy>
+    						<width>69</width>
+    						<height>69</height>
+    						<aspectratio>stretch</aspectratio>
+    						<texture diffuse="masks/iconEndCapLeft.png">$INFO[listitem.thumb]</texture>
+                            <bordersize>8</bordersize>
+    					</control>
+                    </control>
 					<control type="label">
 						<posx>96</posx>
 						<posy>0</posy>
@@ -139,7 +160,7 @@
 					<control type="label">
 						<posx>520</posx>
 						<posy>0</posy>
-						<width>7-col-gutter</width>
+						<width>444</width>
 						<height>2-row</height>
 						<aligny>center</aligny>
 						<font>itemTitle</font>
diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml
index 2ea6893..7cbb7ba 100644
--- a/1080i/View_MusicPlaylist.xml
+++ b/1080i/View_MusicPlaylist.xml
@@ -16,234 +16,188 @@
                 <onback>9000</onback>
                 <pagecontrol>60</pagecontrol>
                 <scrolltime tween="sine" easing="inout">200</scrolltime>
-                <itemlayout width="23-col" height="3-row">
+                <itemlayout width="23-col" height="2-row">
 					<control type="image">
-						<visible>!listitem.isplaying</visible>
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>105</width>
-                        <height>105</height>
+                        <width>1-col</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
+                        <texture diffuse="masks/iconEndCapLeft.png">colors/black.png</texture>
                         <colordiffuse>overlay</colordiffuse>
                     </control>
 					<control type="image">
-						<visible>!listitem.isplaying</visible>
-                        <posx>108</posx>
+                        <posx>76</posx>
                         <posy>0</posy>
-                        <width>1620</width>
-                        <height>105</height>
+                        <width>7-col-gutter</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
+                        <texture>colors/black.png</texture>
                         <colordiffuse>overlay</colordiffuse>
                     </control>
 					<control type="image">
-						<animation type="conditional" condition="true">
-							<effect type="fade" start="100" end="50" time="0"/>
-						</animation>
-						<visible>ListItem.IsPlaying</visible>
-                        <posx>0</posx>
+                        <posx>560</posx>
                         <posy>0</posy>
-                        <width>105</width>
-                        <height>105</height>
+                        <width>7-col</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/white.png</texture>
-                        <colordiffuse>highlight</colordiffuse>
+                        <texture>colors/black.png</texture>
+                        <colordiffuse>overlay</colordiffuse>
                     </control>
 					<control type="image">
-						<animation type="conditional" condition="player.paused">
-							<effect type="fade" start="100" end="50" time="0"/>
-						</animation>
-						<visible>ListItem.IsPlaying</visible>
-                        <posx>108</posx>
+                        <posx>1068</posx>
                         <posy>0</posy>
-                        <width>1620</width>
-                        <height>105</height>
+                        <width>514</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/white.png</texture>
-                        <colordiffuse>highlight</colordiffuse>
+                        <texture>colors/black.png</texture>
+                        <colordiffuse>overlay</colordiffuse>
                     </control>
 					<control type="image">
-                        <visible>ListItem.IsPlaying + !player.paused</visible>
-                        <posx>18</posx>
+                        <posx>1587</posx>
                         <posy>0</posy>
-                        <width>72</width>
-                        <height>72</height>
-                        <texture>equaliser.gif</texture>
-                        <animation type="focus" loop="false" reversible="false">
-                            <effect type="fade" time="500"/>
-                            <effect type="rotatey" end="360" center="44" tween="back" easing="out" time="1000"/>
-                        </animation>
-                    </control>
+                        <width>141</width>
+                        <height>69</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture diffuse="masks/songList2.png">colors/black.png</texture>
+                        <colordiffuse>overlay</colordiffuse>
+                    </control>      
                     <control type="label">
-						<visible>ListItem.IsPlaying + !player.paused + Skin.HasSetting(lowPowerMode)</visible>
-                        <posx>0</posx>
+                        <posx>96</posx>
                         <posy>0</posy>
-                        <width>105</width>
-                        <height>105</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>symbolLarge</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor></shadowcolor>
-                        <label></label>
-                    </control>
-                    <control type="label">
-                        <visible>ListItem.IsPlaying + player.paused</visible>
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>105</width>
-                        <height>105</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>symbolLarge</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor></shadowcolor>
-                        <label></label>
-                    </control>
-                    <control type="image">
-                        <visible>!ListItem.IsPlaying</visible>
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>105</width>
-                        <height>105</height>
-                        <aspectratio>scale</aspectratio>
-						<bordersize>1</bordersize>
-                        <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
-                    </control>
-                    <control type="label">
-                        <posx>117</posx>
-                        <posy>-4</posy>
-                        <width>13-col</width>
+                        <width>7-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>dialogTitle</font>
+                        <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor></shadowcolor>
                         <label>$INFO[ListItem.Title]</label>
                     </control>
                     <control type="label">
-                        <posx>117</posx>
-                        <posy>35</posy>
-                        <width>13-col</width>
+                        <posx>8-col</posx>
+                        <posy>0</posy>
+                        <width>7-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>playlistSubTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor></shadowcolor>
-                        <label>$INFO[ListItem.Artist]  [LIGHT]$INFO[ListItem.Album]$INFO[ListItem.Year, (,)][/LIGHT]</label>
+                        <label>$INFO[ListItem.Artist]</label>
+                    </control>
+                    <control type="label">
+                        <posx>1086</posx>
+                        <posy>0</posy>
+                        <width>7-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>playlistSubTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor></shadowcolor>
+                        <label>$INFO[ListItem.album]</label>
                     </control>
                     <control type="label">
                         <right>-36</right>
                         <posy>0</posy>
                         <width>3-col-gutter</width>
-                        <height>105</height>
+                        <height>2-row</height>
                         <aligny>center</aligny>
                         <align>right</align>
-                        <font>regularStrong</font>
+                        <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor></shadowcolor>
                         <label>$INFO[listitem.duration]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="23-col" height="3-row">
+                <focusedlayout width="23-col" height="2-row">
 					<control type="image">
 						<animation type="focus">
 							<effect type="fade" start="100" end="33" time="0"/>
 						</animation>
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>105</width>
-                        <height>105</height>
+                        <width>1-col</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/white.png</texture>
+                        <texture diffuse="masks/iconEndCapLeft.png">colors/white.png</texture>
                         <colordiffuse>highlight</colordiffuse>
                     </control>
 					<control type="image">
-						<animation type="conditional" condition="player.playing">
-							<effect type="fade" start="100" end="50" time="0"/>
-						</animation>
-                        <posx>108</posx>
+                        <posx>76</posx>
                         <posy>0</posy>
-                        <width>1620</width>
-                        <height>105</height>
+                        <width>7-col-gutter</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/white.png</texture>
+                        <texture>colors/white.png</texture>
                         <colordiffuse>highlight</colordiffuse>
                     </control>
-                    <control type="image">
-                        <visible>ListItem.IsPlaying + !player.paused</visible>
-                        <posx>18</posx>
+					<control type="image">
+                        <posx>560</posx>
                         <posy>0</posy>
-                        <width>72</width>
-                        <height>72</height>
-                        <texture>equaliser.gif</texture>
-                        <animation type="focus" loop="false" reversible="false">
-                            <effect type="fade" time="500"/>
-                            <effect type="rotatey" end="360" center="44" tween="back" easing="out" time="1000"/>
-                        </animation>
+                        <width>7-col</width>
+                        <height>69</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                    </control>
+					<control type="image">
+                        <posx>1068</posx>
+                        <posy>0</posy>
+                        <width>514</width>
+                        <height>69</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                    </control>
+					<control type="image">
+                        <posx>1587</posx>
+                        <posy>0</posy>
+                        <width>141</width>
+                        <height>69</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture diffuse="masks/songList2.png">colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
-                        <visible>ListItem.IsPlaying + player.paused</visible>
-                        <posx>0</posx>
+                        <posx>96</posx>
                         <posy>0</posy>
-                        <width>105</width>
-                        <height>105</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>symbolLarge</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor></shadowcolor>
-                        <label></label>
-                        <animation type="focus" loop="false" reversible="false">
-                            <effect type="fade" time="500"/>
-                            <effect type="rotatey" end="360" center="52" tween="back" easing="out" time="1000"/>
-                        </animation>
-                    </control>
-                    <control type="image">
-                        <visible>!ListItem.IsPlaying</visible>
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>105</width>
-                        <height>105</height>
-						<bordersize>1</bordersize>
-                        <aspectratio>scale</aspectratio>
-                        <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
-                        <animation type="focus" loop="false" reversible="false">
-                            <effect type="fade" time="500"/>
-                            <effect type="rotatey" end="360" center="52" tween="back" easing="out" time="1000"/>
-                        </animation>
-                    </control>
-                    <control type="label">
-                        <posx>117</posx>
-                        <posy>-4</posy>
-                        <width>13-col</width>
+                        <width>7-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>dialogTitle</font>
+                        <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor></shadowcolor>
                         <label>$INFO[ListItem.Title]</label>
                     </control>
                     <control type="label">
-                        <posx>117</posx>
-                        <posy>35</posy>
-                        <width>13-col</width>
+                        <posx>8-col</posx>
+                        <posy>0</posy>
+                        <width>7-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>playlistSubTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor></shadowcolor>
-                        <label>$INFO[ListItem.Artist]  [LIGHT]$INFO[ListItem.Album]$INFO[ListItem.Year, (,)][/LIGHT]</label>
+                        <label>$INFO[ListItem.Artist]</label>
+                    </control>
+                    <control type="label">
+                        <posx>1086</posx>
+                        <posy>0</posy>
+                        <width>7-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>playlistSubTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor></shadowcolor>
+                        <label>$INFO[ListItem.album]</label>
                     </control>
                     <control type="label">
                         <right>-36</right>
                         <posy>0</posy>
                         <width>3-col-gutter</width>
-                        <height>105</height>
+                        <height>2-row</height>
                         <aligny>center</aligny>
                         <align>right</align>
-                        <font>regularStrong</font>
+                        <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor></shadowcolor>
                         <label>$INFO[listitem.duration]</label>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 3a1996d..b0691c3 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -63,9 +63,7 @@
 					<width>7-col</width>
 					<height>7-col</height>
 	                <aspectratio scalediffuse="false">stretch</aspectratio>
-	                <texture fallback="noAlbumCover.jpg">$INFO[MusicPlayer.Cover]</texture>
-                    <bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
-                    <bordersize>6</bordersize>
+	                <texture diffuse="masks/fullScreenAlbumArt.png" fallback="noAlbumCover.jpg">$INFO[MusicPlayer.Cover]</texture>
                     <colordiffuse>ffffffff</colordiffuse>
 	            </control>
 				<!--track info-->
diff --git a/media/masks/fullScreenAlbumArt.png b/media/masks/fullScreenAlbumArt.png
new file mode 100644
index 0000000000000000000000000000000000000000..060a802eca149bf81393049c14f41b10b699e735
GIT binary patch
literal 816
zcmeAS@N?(olHy`uVBq!ia0y~yVEh5XEX+WW5Vl7?K#H+A$lZzY=1HA;AcwQSBeIx*
zfm;}a85w5HkpK$v2l#}z0_p!qpx^0U22hB#B*-tAp<(}j2bL3Cfohmmdb&7<RLpsM
z?V@kAqloK8Zzo1K69G=Hj{C)oVK4SCzwxM9=-u&KtD812oq6$$&7RshGai4oyMJ%{
z@*InIdA}>~&3mhVTYFoK+{gIa%G+Yn<F=c>nfY_8ZQ}W(wqKwB4DZ{|_kI6Q$K&#w
z_a+2?T=gjQ=<2R;(e+w!p?g+UgpLY~obZ?``+wu!g!6{)Zwr6B@NxUky}&e*8@EmU
z%}?VG#r5*vFWpbOQ(Rwp<oxw-U9#8HfA5*}f6n`F?tks|{#R7D{b&CbeBmnhv&Z_t
PRLtP%>gTe~DWM4fOIe!$

literal 0
HcmV?d00001

diff --git a/media/masks/menuTitle.png b/media/masks/menuTitle.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d5e4238c3d7716b200764dbdd3c23fd64de6587
GIT binary patch
literal 443
zcmeAS@N?(olHy`uVBq!ia0y~yU=;weJy@85WKH;yE+EBN9OUlAc=M!AJ&?m$;1OBO
zz`!jG!i)^F=12eq`2&1HT!Hj|B+&14F9RsVS`y?J%+Rp^zXQvOtw1%5CY~;iAr*7p
z-ni&{*g=H#BKs1C04awirjEHxN|);Wk9Y}M3q21huy?EacFv}z=Iw?P-)d(s|NKhx
zPyTJ+c9EEVzWA{94d2~6zF$>-U{oBnm+@Qev(m3D7I~Xb`yA*O(A?3pJ%_2q<B-{E
z@dJ(>DjXA86elUT2(@@L33v)9aXP8cQ}E37SF9V}-<}ih&!8w&ICuM1;RhTaQ@^s@
z_<sK5ZJz_VH7c9#l^)AY+Y9tias1w<|L=-QEY$OF>3n_jA@I?9k;t^)7D|7Z|E9W5
UHrsF~6&Rolp00i_>zopr0Gg4a$^ZZW

literal 0
HcmV?d00001