diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index a005ee4..21d7cce 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -297,11 +297,6 @@
             </control>
         </control>
     </include>
-
-	<!--touchscreen screen edge controls-->
-	<include name="touchscreenControls">
-		
-	</include>
 	
    <!--debugging-->
     <include name="DialogID">
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index a40a952..ac468f0 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -171,7 +171,6 @@
                 <width>col-5-begin</width>
                 <height>832</height>
                 <orientation>vertical</orientation>
-                <onleft condition="!window.isactive(home)">activateWindow(contextmenu)</onleft>
                 <onright condition="!window.isactive(1103)">9999</onright>
                 <onright condition="window.isactive(1103)">9876</onright>
                 <onup condition="control.isvisible(5115)">control.setfocus(5115)</onup>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index e9e8bde..69ac429 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -96,7 +96,7 @@
                             <onclick>Container.SetSortDirection</onclick>
                             <onclick>Control.setfocus(54,0,absolute)</onclick>
                             <onclick>Control.setfocus(3223)</onclick>
-                        </control>   
+                        </control>
                     </control>
                 </control>
 				<!--quick links-->			
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index 6521923..eabf126 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -55,6 +55,18 @@
                         <label>$INFO[container.foldername]</label>
                     </control>
 					<control type="label">
+                        <visible>Integer.IsGreater(container(52).numitems,1)</visible>
+		                <posx>0</posx>
+		                <posy>5-row</posy>
+		                <width>12-col</width>
+		                <height>2-row</height>
+		                <align></align>
+		                <font>menuTitle</font>
+		                <textcolor>textActive</textcolor>
+		                <label>$INFO[Container(52).ListItemAbsolute(1).genre]</label>
+		            </control>
+					<control type="label">
+                        <visible>!Integer.IsGreater(container(52).numitems,1)</visible>
 		                <posx>0</posx>
 		                <posy>5-row</posy>
 		                <width>12-col</width>
@@ -85,14 +97,12 @@
 					<scrolltime tween="cubic" easing="out">600</scrolltime>
 					<itemlayout width="300" height="348">
 	                    <control type="image">
-	                        <posx>-6</posx>
-	                        <posy>-6</posy>
-	                        <width>276</width>
-	                        <height>276</height>
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>4-col-gutter</width>
+	                        <height>4-col-gutter</height>
 	                        <aspectratio>stretch</aspectratio>
-	                        <texture>colors/black.png</texture>
-	                        <bordersize>12</bordersize>
-							<colordiffuse>11FFFFFF</colordiffuse>
+	                        <texture diffuse="masks/albumThumb.png">colors/black.png</texture>
 	                    </control>
 						<control type="image">
 							<posx>0</posx>
@@ -100,9 +110,8 @@
 							<width>4-col-gutter</width>
 							<height>4-col-gutter</height>
 							<aspectratio>stretch</aspectratio>
-							<texture>$INFO[ListItem.Art(thumb)]</texture>
-							<bordersize>12</bordersize>
-							<colordiffuse>99FFFFFF</colordiffuse>
+							<texture diffuse="masks/albumThumb.png">$INFO[ListItem.Art(thumb)]</texture>
+							<colordiffuse>88FFFFFF</colordiffuse>
 						</control>
 						<control type="textbox">
 							<visible>String.IsEmpty(listitem.title)</visible>
@@ -115,16 +124,17 @@
 							<textcolor>textActive</textcolor>
 							<label>$INFO[ListItem.label]</label>
 						</control>
-						<control type="label">
+						<control type="textbox">
 							<visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
 							<posy>268</posy>
 							<width>240</width>
-							<height>1-row</height>
-							<aligny>center</aligny>
+							<height>60</height>
+                            <align>center</align>
+							<aligny>top</aligny>
 							<font>thumbTitle</font>
 							<textcolor>textActive</textcolor>
-							<label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.year]</label>
+							<label>$INFO[ListItem.Title]</label>
 						</control>
 					</itemlayout>
 					<focusedlayout width="4-col" height="348">
@@ -136,19 +146,10 @@
 								<width>4-col-gutter</width>
 								<height>4-col-gutter</height>
 								<aspectratio>stretch</aspectratio>
-								<texture>colors/black.png</texture>
-								<bordertexture colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-								<bordersize>6</bordersize>
-								<colordiffuse>FF000000</colordiffuse>
-							</control>
-							<control type="image">
-								<posx>0</posx>
-								<posy>0</posy>
-								<width>4-col-gutter</width>
-								<height>4-col-gutter</height>
-								<aspectratio>stretch</aspectratio>
-								<texture>$INFO[ListItem.Art(thumb)]</texture>
-								<bordersize>6</bordersize>
+    							<aspectratio>stretch</aspectratio>
+    							<texture fallback="colors/black.png" diffuse="masks/albumThumb.png">$INFO[ListItem.Art(thumb)]</texture>
+    	                        <bordertexture infill="false" diffuse="masks/albumThumb.png">colors/white.png</bordertexture>
+    	                        <bordersize>6</bordersize>
 							</control>
 							<control type="textbox">
 								<visible>String.IsEmpty(listitem.title)</visible>
@@ -161,16 +162,17 @@
 								<textcolor>textActive</textcolor>
 								<label>$INFO[ListItem.label]</label>
 							</control>
-							<control type="label">
+							<control type="textbox">
 								<visible>!controlgroup(9000).hasfocus</visible>
 								<posx>12</posx>
-								<posy>280</posy>
+								<posy>268</posy>
 								<width>240</width>
-								<height>1-row</height>
-								<aligny>center</aligny>
+								<height>60</height>
+                                <align>center</align>
+								<aligny>top</aligny>
 								<font>thumbTitle</font>
 								<textcolor>textActive</textcolor>
-								<label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.year]</label>
+								<label>$INFO[ListItem.Title]</label>
 							</control>
 						</control>
 					</focusedlayout>
diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml
index 265d448..025728b 100644
--- a/1080i/View_Artists.xml
+++ b/1080i/View_Artists.xml
@@ -60,7 +60,7 @@
                         <onclick>Container.SetSortDirection</onclick>
                         <onclick>Control.setfocus(51,0,absolute)</onclick>
                         <onclick>Control.setfocus(3223)</onclick>
-                    </control>   
+                    </control>    
                 </control>
             </control>
             <!--content-->
diff --git a/1080i/View_MusicFiles.xml b/1080i/View_MusicFiles.xml
index 230acf9..d8e73ba 100644
--- a/1080i/View_MusicFiles.xml
+++ b/1080i/View_MusicFiles.xml
@@ -23,7 +23,7 @@
                         <width>66</width>
                         <height>66</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
 						<colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="image">
@@ -32,11 +32,11 @@
                         <width>23-col</width>
                         <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
+						<texture border="0">masks/tvChannel.png</texture>
+						<colordiffuse>d0000000</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>1-col-indent</posx>
+                        <posx>108</posx>
                         <posy>0</posy>
                         <width>23-col-gutter</width>
                         <height>2-row</height>
@@ -54,7 +54,7 @@
                         <width>66</width>
                         <height>66</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
                         <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"/>
@@ -66,11 +66,11 @@
                         <width>23-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/white.png</texture>
-                        <colordiffuse>highlight</colordiffuse>
+						<texture border="0">masks/tvChannel.png</texture>
+						<colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>1-col-indent</posx>
+                        <posx>108</posx>
                         <posy>0</posy>
                         <width>23-col-gutter</width>
                         <height>2-row</height>
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index 27898dc..2e877ae 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -16,12 +16,10 @@
 			<control type="image">
 				<posx>0</posx>
 				<posy>8</posy>
-				<width>8-col</width>
-				<height>8-col</height>
+				<width>576</width>
+				<height>576</height>
 				<aspectratio>stretch</aspectratio>
-				<texture fallback="DefaultAlbumCover.png" diffuse="masks/discSurface.png">$VAR[songViewThumb]</texture>
-				<bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
-				<bordersize>6</bordersize>
+				<texture fallback="DefaultAlbumCover.png" diffuse="masks/songListAlbum.png">$VAR[songViewThumb]</texture>
 			</control>
 		</control>
 		<control type="group">
diff --git a/media/masks/songListAlbum.png b/media/masks/songListAlbum.png
new file mode 100644
index 0000000..0669751
Binary files /dev/null and b/media/masks/songListAlbum.png differ