diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 3611491..c04e821 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -94,15 +94,6 @@
                 </control>
             </control>
             <!--options-->
-            <control type="image">
-                <posx>4-col</posx>
-                <posy>2-row</posy>
-                <width>14-col</width>
-                <height>624</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <control type="grouplist" id="200">
                 <posx>4-col</posx>
                 <posy>84</posy>
@@ -116,6 +107,8 @@
                     <description>Stop video on return to menu</description>
                     <width>14-col</width>
                     <label>31138</label>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(stopVideoOnMenu)</onclick>
                     <selected>Skin.HasSetting(stopVideoOnMenu)</selected>
                 </control>
@@ -129,6 +122,8 @@
                     <label2>$INFO[Skin.String(homeBackground)]</label2>
                     <onclick>Skin.SetPath(homeBackground)</onclick>
                     <textwidth>8-col</textwidth>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                 </control>
                 <control type="button" id="3">
                     <visible>Container(8000).Hasfocus(1)</visible>
@@ -139,6 +134,8 @@
                     <label>31122</label>
                     <onclick>Skin.Reset(homeBackground)</onclick>
                     <textwidth>8-col</textwidth>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                 </control>
 
                 <control type="radiobutton" id="1">
@@ -146,6 +143,8 @@
                     <description>Reverse power down options</description>
                     <width>14-col</width>
                     <label>31142</label>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(exitFirst)</onclick>
                     <selected>Skin.HasSetting(exitFirst)</selected>
                 </control>
@@ -154,6 +153,8 @@
                     <description>Enable Debug Grid</description>
                     <width>14-col</width>
                     <label>31034</label>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(DebugGrid)</onclick>
                     <selected>Skin.HasSetting(DebugGrid)</selected>
                 </control>
@@ -162,6 +163,8 @@
                     <description>Disable Debug Info</description>
                     <width>14-col</width>
                     <label>31035</label>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(DebugInfo)</onclick>
                     <selected>Skin.HasSetting(DebugInfo)</selected>
                 </control>
@@ -172,6 +175,8 @@
                     <align>left</align>
                     <textoffsetx>24</textoffsetx>
                     <label>31043</label>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                     <onclick>ReloadSkin()</onclick>
                     <onclick>activateWindow(home)</onclick>
                 </control>
@@ -180,6 +185,8 @@
                     <description>Disable fanart animation effect</description>
                     <width>14-col</width>
                     <label>31102</label>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(lowPowerMode)</onclick>
                     <onclick>ReloadSkin()</onclick>
                     <selected>Skin.HasSetting(lowPowerMode)</selected>
@@ -189,6 +196,8 @@
                     <description>Extended Fanart</description>
                     <width>14-col</width>
                     <label>31220</label>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(disableExtendedFanart)</onclick>
                     <selected>Skin.HasSetting(disableExtendedFanart)</selected>
                 </control>
@@ -197,6 +206,8 @@
                     <description>Disable recently added Movies</description>
                     <width>14-col</width>
                     <label>31238</label>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(disableRecentMovies)</onclick>
                     <selected>Skin.HasSetting(disableRecentMovies)</selected>
                 </control>
@@ -205,6 +216,8 @@
                     <description>Disable recently added TVShows</description>
                     <width>14-col</width>
                     <label>31239</label>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(disableRecentTVShows)</onclick>
                     <selected>Skin.HasSetting(disableRecentTVShows)</selected>
                 </control>
@@ -213,6 +226,8 @@
                     <description>Disable recently added Albums</description>
                     <width>14-col</width>
                     <label>31240</label>
+                    <texturefocus colordiffuse="ffffffff">colors/white.png</texturefocus>
+                    <texturenofocus></texturenofocus>
                     <onclick>Skin.ToggleSetting(disableRecentAlbums)</onclick>
                     <selected>Skin.HasSetting(disableRecentAlbums)</selected>
                 </control>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 69ac429..b898348 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -133,7 +133,7 @@
 	                    <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx>12</posx>
-	                        <posy>322</posy>
+	                        <posy>328</posy>
 	                        <width>300</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
@@ -167,7 +167,7 @@
 	                        <control type="label">
 		                        <visible>!controlgroup(9000).hasfocus</visible>
 		                        <posx>12</posx>
-		                        <posy>322</posy>
+		                        <posy>328</posy>
 		                        <width>276</width>
 		                        <height>2-row</height>
 		                        <aligny>center</aligny>
@@ -243,7 +243,7 @@
 	                    <control type="textbox">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx></posx>
-	                        <posy>270</posy>
+	                        <posy>276</posy>
 	                        <width>264</width>
 	                        <height>60</height>
                             <align>center</align>
@@ -282,7 +282,7 @@
     	                    <control type="textbox">
     	                        <visible>!controlgroup(9000).hasfocus</visible>
     	                        <posx></posx>
-    	                        <posy>270</posy>
+    	                        <posy>276</posy>
     	                        <width>264</width>
     	                        <height>60</height>
                                 <align>center</align>
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index eabf126..24c56de 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -127,7 +127,7 @@
 						<control type="textbox">
 							<visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
-							<posy>268</posy>
+							<posy>274</posy>
 							<width>240</width>
 							<height>60</height>
                             <align>center</align>
@@ -165,7 +165,7 @@
 							<control type="textbox">
 								<visible>!controlgroup(9000).hasfocus</visible>
 								<posx>12</posx>
-								<posy>268</posy>
+								<posy>274</posy>
 								<width>240</width>
 								<height>60</height>
                                 <align>center</align>
diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml
index 025728b..947e808 100644
--- a/1080i/View_Artists.xml
+++ b/1080i/View_Artists.xml
@@ -67,7 +67,7 @@
             <control type="panel" id="51">
                 <visible>$EXP[isMusicArtist]</visible>
                 <posx>90</posx>
-	            <posy>row-7-begin</posy>
+	            <posy>276</posy>
 	            <width>1800</width>
 	            <height>25-row</height>
 	            <onleft>9000</onleft>
@@ -77,7 +77,7 @@
                 <onback>9202</onback>
 	            <scrolltime tween="sine">250</scrolltime>
 	            <pagecontrol>60</pagecontrol>
-	            <itemlayout width="444" height="266">
+	            <itemlayout width="444" height="260">
 	                <control type="image">
 	                    <posx>0</posx>
 	                    <posy>0</posy>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 4bf0b26..7c72f2b 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -113,7 +113,7 @@
                         <width>1-col-textbox</width>
                         <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
+                        <texture diffuse="masks/circle.png">colors/black.png</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>textboxInactive</colordiffuse>
                     </control>
@@ -136,13 +136,13 @@
                         <width>11-col</width>
                         <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
+                        <texture diffuse="masks/episodeMenu.png">colors/black.png</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>textboxInactive</colordiffuse>
                     </control>
                     <control type="label">
                         <visible>ListItem.IsParentFolder</visible>
-                        <posx>1-col-indent</posx>
+                        <posx>108</posx>
                         <posy>0</posy>
                         <width>9-col</width>
                         <height>2-row</height>
@@ -154,7 +154,7 @@
                         <scroll>false</scroll>
                     </control>
                     <control type="label">
-                        <posx>1-col-indent</posx>
+                        <posx>108</posx>
                         <posy>0</posy>
                         <width>9-col</width>
                         <height>2-row</height>
@@ -189,7 +189,7 @@
                         <width>1-col-textbox</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
+                        <texture diffuse="masks/circle.png">colors/white.png</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>highlight</colordiffuse>
                     </control>
@@ -212,13 +212,13 @@
                         <width>11-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
+                        <texture diffuse="masks/episodeMenu.png">colors/white.png</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
                         <visible>ListItem.IsParentFolder</visible>
-                        <posx>1-col-indent</posx>
+                        <posx>108</posx>
                         <posy>0</posy>
                         <width>9-col</width>
                         <height>2-row</height>
@@ -230,7 +230,7 @@
                         <scroll>false</scroll>
                     </control>
                     <control type="label">
-                        <posx>1-col-indent</posx>
+                        <posx>108</posx>
                         <posy>0</posy>
                         <width>9-col</width>
                         <height>2-row</height>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 6c20049..b92a684 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -151,7 +151,7 @@
 	                    <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx>12</posx>
-	                        <posy>306</posy>
+	                        <posy>312</posy>
 	                        <width>524</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
@@ -201,7 +201,7 @@
                             <control type="label">
     	                        <visible>!controlgroup(9000).hasfocus</visible>
     	                        <posx>12</posx>
-    	                        <posy>306</posy>
+    	                        <posy>312</posy>
     	                        <width>524</width>
     	                        <height>2-row</height>
     	                        <aligny>center</aligny>
@@ -287,7 +287,7 @@
 						<control type="textbox">
 							<visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
-							<posy>382</posy>
+							<posy>388</posy>
 							<width>228</width>
 							<height>60</height>
                             <align>center</align>
@@ -313,7 +313,7 @@
     						</control>
     						<control type="textbox">
     							<posx>12</posx>
-    							<posy>378</posy>
+    							<posy>388</posy>
     							<width>228</width>
     							<height>60</height>
                                 <align>center</align>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 78987ae..dedb936 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -129,7 +129,7 @@
                         <control type="label">
                             <visible>!controlgroup(9000).hasfocus + !ListItem.IsParentFolder</visible>
                             <posx>12</posx>
-                            <posy>382</posy>
+                            <posy>388</posy>
                             <width>228</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
@@ -190,7 +190,7 @@
                             <control type="label">
 	                            <visible>!controlgroup(9000).hasfocus + !ListItem.IsParentFolder</visible>
 	                            <posx>12</posx>
-	                            <posy>376</posy>
+	                            <posy>388</posy>
 	                            <width>228</width>
 	                            <height>2-row</height>
 	                            <aligny>center</aligny>
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index 2e877ae..9683697 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -71,7 +71,7 @@
 					<width>1-col-textbox</width>
 					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture>colors/black.png</texture>
+					<texture diffuse="masks/circle.png">colors/black.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>textboxInactive</colordiffuse>
 				</control>
@@ -88,7 +88,7 @@
 					<width>1-col-textbox</width>
 					<height>2-row</height>
 					<aspectratio>stretch</aspectratio>
-					<texture>colors/white.png</texture>
+					<texture diffuse="masks/circle.png">colors/white.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>highlight</colordiffuse>
 				</control>
@@ -129,10 +129,10 @@
 				<control type="image">
 					<posx>1-col</posx>
 					<posy>0</posy>
-					<width>12-col-textbox</width>
+					<width>861</width>
 					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture>colors/black.png</texture>
+					<texture diffuse="masks/songList1.png">colors/black.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>textboxInactive</colordiffuse>
 				</control>
@@ -143,10 +143,24 @@
 					<visible>ListItem.IsPlaying</visible>
 					<posx>1-col</posx>
 					<posy>0</posy>
-					<width>15-col</width>
-					<height>2-row</height>
+					<width>861</width>
+					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture>colors/white.png</texture>
+					<texture diffuse="masks/songList1.png">colors/white.png</texture>
+					<bordersize>0</bordersize>
+					<colordiffuse>highlight</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>13-col</posx>
+					<posy>0</posy>
+					<width>141</width>
+					<height>71</height>
+					<aspectratio>stretch</aspectratio>
+					<texture diffuse="masks/songList2.png">colors/white.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>highlight</colordiffuse>
 				</control>
@@ -154,16 +168,16 @@
 					<visible>!ListItem.IsPlaying</visible>
 					<posx>13-col</posx>
 					<posy>0</posy>
-					<width>2-col-textbox</width>
+					<width>141</width>
 					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture>colors/black.png</texture>
+					<texture diffuse="masks/songList2.png">colors/black.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>textboxInactive</colordiffuse>
 				</control>
 				<control type="label">
 					<visible>ListItem.IsParentFolder</visible>
-					<posx>1-col-indent</posx>
+					<posx>108</posx>
 					<posy>0</posy>
 					<width>11-col-gutter</width>
 					<height>2-row</height>
@@ -174,7 +188,7 @@
 					<label>..</label>
 				</control>
 				<control type="label">
-					<posx>1-col-indent</posx>
+					<posx>108</posx>
 					<posy>0</posy>
 					<width>11-col-gutter</width>
 					<height>2-row</height>
@@ -184,19 +198,6 @@
 					<shadowcolor/>
 					<label>$INFO[ListItem.Title]</label>
 				</control>
-				<control type="label">
-					<visible>!ListItem.IsParentFolder</visible>
-					<posx>12-col-gutter</posx>
-					<posy>0</posy>
-					<width>1-col</width>
-					<height>2-row</height>
-					<aligny>center</aligny>
-					<align>right</align>
-					<font>itemTitle</font>
-					<textcolor>textActive</textcolor>
-					<shadowcolor/>
-					<label fallback="•••">$INFO[ListItem.UserRating,,*]</label>
-				</control>
 				<control type="label">
 					<posx>13-col-indent</posx>
 					<posy>0</posy>
@@ -220,7 +221,7 @@
 					<width>1-col-textbox</width>
 					<height>2-row</height>
 					<aspectratio>stretch</aspectratio>
-					<texture>colors/white.png</texture>
+					<texture diffuse="masks/circle.png">colors/white.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>highlight</colordiffuse>
 					<include>spinFocusIcon</include>
@@ -231,7 +232,7 @@
 					<posy>0</posy>
 					<width>1-col-gutter</width>
 					<height>1-col-gutter</height>
-					<texture>equaliser.gif</texture>
+					<texture diffuse="masks/circle.png">equaliser.gif</texture>
 				</control>
 				<control type="label">
 					<visible>ListItem.IsPlaying + player.paused</visible>
@@ -265,16 +266,29 @@
 					</animation>
 					<posx>1-col</posx>
 					<posy>0</posy>
-					<width>15-col</width>
-					<height>2-row</height>
+					<width>861</width>
+					<height>69</height>
 					<aspectratio>stretch</aspectratio>
-					<texture>colors/white.png</texture>
+					<texture diffuse="masks/songList1.png">colors/white.png</texture>
+					<bordersize>0</bordersize>
+					<colordiffuse>highlight</colordiffuse>
+				</control>
+				<control type="image">
+					<animation type="condition" condition="player.playing">
+						<effect type="fade" start="100" end="33" time="0"/>
+					</animation>
+					<posx>13-col</posx>
+					<posy>0</posy>
+					<width>141</width>
+					<height>71</height>
+					<aspectratio>stretch</aspectratio>
+					<texture diffuse="masks/songList2.png">colors/white.png</texture>
 					<bordersize>0</bordersize>
 					<colordiffuse>highlight</colordiffuse>
 				</control>
 				<control type="label">
 					<visible>ListItem.IsParentFolder</visible>
-					<posx>1-col-indent</posx>
+					<posx>108</posx>
 					<posy>0</posy>
 					<width>11-col-gutter</width>
 					<height>2-row</height>
@@ -285,7 +299,7 @@
 					<label>..</label>
 				</control>
 				<control type="label">
-					<posx>1-col-indent</posx>
+					<posx>108</posx>
 					<posy>0</posy>
 					<width>11-col-gutter</width>
 					<height>2-row</height>
@@ -295,19 +309,6 @@
 					<shadowcolor/>
 					<label>$INFO[ListItem.Title]</label>
 				</control>
-				<control type="label">
-					<visible>!ListItem.IsParentFolder</visible>
-					<posx>12-col-gutter</posx>
-					<posy>0</posy>
-					<width>1-col</width>
-					<height>2-row</height>
-					<aligny>center</aligny>
-					<align>right</align>
-					<font>itemTitle</font>
-					<textcolor>textActive</textcolor>
-					<shadowcolor/>
-					<label fallback="•••">$INFO[ListItem.UserRating,,*]</label>
-				</control>
 				<control type="label">
 					<posx>13-col-indent</posx>
 					<posy>0</posy>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index dd46dc3..3b8c85d 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -152,7 +152,7 @@
 	                    <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus + String.IsEqual(skin.string(tvQuickLinkValue),special://skin/extras/playlists/recentEpisodes.xsp)</visible>
 	                        <posx>12</posx>
-	                        <posy>306</posy>
+	                        <posy>312</posy>
 	                        <width>524</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
@@ -163,7 +163,7 @@
 	                    <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus + String.IsEqual(skin.string(tvQuickLinkValue),special://skin/extras/playlists/inprogressTVShows.xsp)</visible>
 	                        <posx>12</posx>
-	                        <posy>306</posy>
+	                        <posy>312</posy>
 	                        <width>524</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
@@ -213,7 +213,7 @@
     	                    <control type="label">
     	                        <visible>!controlgroup(9000).hasfocus + String.IsEqual(skin.string(tvQuickLinkValue),special://skin/extras/playlists/recentEpisodes.xsp)</visible>
     	                        <posx>12</posx>
-    	                        <posy>306</posy>
+    	                        <posy>312</posy>
     	                        <width>524</width>
     	                        <height>2-row</height>
     	                        <aligny>center</aligny>
@@ -224,7 +224,7 @@
     	                    <control type="label">
     	                        <visible>!controlgroup(9000).hasfocus + String.IsEqual(skin.string(tvQuickLinkValue),special://skin/extras/playlists/inprogressTVShows.xsp)</visible>
     	                        <posx>12</posx>
-    	                        <posy>306</posy>
+    	                        <posy>312</posy>
     	                        <width>524</width>
     	                        <height>2-row</height>
     	                        <aligny>center</aligny>
@@ -299,7 +299,7 @@
 					<control type="textbox">
 						<visible>!controlgroup(9000).hasfocus</visible>
 						<posx>12</posx>
-						<posy>382</posy>
+						<posy>388</posy>
 						<width>228</width>
 						<height>60</height>
                         <align>center</align>
@@ -326,7 +326,7 @@
 						<control type="textbox">
                             <visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
-							<posy>378</posy>
+							<posy>388</posy>
 							<width>228</width>
 							<height>60</height>
                             <align>center</align>
diff --git a/1080i/custom_musicOverlay.xml b/1080i/custom_musicOverlay.xml
index bd0f343..efaea40 100644
--- a/1080i/custom_musicOverlay.xml
+++ b/1080i/custom_musicOverlay.xml
@@ -4,7 +4,7 @@
     <controls>
         <control type="group">
             <posx>col-12-begin</posx>
-            <posy>0</posy>
+            <posy>-2</posy>
             <animation type="windowopen">
                 <effect type="slide" start="0,-50" end="0,0" tween="cubic" easing="out" delay="500" time="300"/>
                 <effect type="fade" start="0" end="100" time="500" delay="500"/>
@@ -15,17 +15,17 @@
 				</animation>
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>1-col-textbox</width>
+                <width>69</width>
                 <height>54</height>
-                <texture>colors/white.png</texture>
+                <texture diffuse="masks/nowPlaying1.png">colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
             </control>
 			<control type="image">
                 <posx>1-col</posx>
                 <posy>0</posy>
-                <width>7-col</width>
+                <width>504</width>
                 <height>54</height>
-                <texture>colors/white.png</texture>
+                <texture diffuse="masks/nowPlaying2.png">colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
             </control>
             <control type="image">
diff --git a/media/masks/discSurface.png b/media/masks/discSurface.png
deleted file mode 100644
index b4fe9a1..0000000
Binary files a/media/masks/discSurface.png and /dev/null differ
diff --git a/media/masks/episodeMenu.png b/media/masks/episodeMenu.png
new file mode 100644
index 0000000..5af90ed
Binary files /dev/null and b/media/masks/episodeMenu.png differ
diff --git a/media/masks/nowPlaying1.png b/media/masks/nowPlaying1.png
new file mode 100644
index 0000000..fa46688
Binary files /dev/null and b/media/masks/nowPlaying1.png differ
diff --git a/media/masks/nowPlaying2.png b/media/masks/nowPlaying2.png
new file mode 100644
index 0000000..a128ed9
Binary files /dev/null and b/media/masks/nowPlaying2.png differ
diff --git a/media/masks/songList1.png b/media/masks/songList1.png
new file mode 100644
index 0000000..4b98c2b
Binary files /dev/null and b/media/masks/songList1.png differ
diff --git a/media/masks/songList2.png b/media/masks/songList2.png
new file mode 100644
index 0000000..20132e7
Binary files /dev/null and b/media/masks/songList2.png differ