diff --git a/720p/Font.xml b/720p/Font.xml
index 33f33d6..5543bdf 100644
--- a/720p/Font.xml
+++ b/720p/Font.xml
@@ -50,6 +50,16 @@
 			<filename>default.ttf</filename>
 			<size>30</size>
 		</font>
+		<font>
+			<name>font14m</name>
+			<filename>menu.ttf</filename>
+			<size>14</size>
+		</font>
+		<font>
+			<name>font16m</name>
+			<filename>menu.ttf</filename>
+			<size>16</size>
+		</font>
 	</fontset>
 	<fontset id="XBMC" idlock="31000" unicode="true">
 		<font>
diff --git a/720p/Home.xml b/720p/Home.xml
index f0dfae8..d45225f 100644
--- a/720p/Home.xml
+++ b/720p/Home.xml
@@ -24,11 +24,11 @@
 		</control>
 		<control type="grouplist" id="200">
 			<posx>140</posx>
-			<posy>57</posy>
+			<posy>61</posy>
 			<width>170</width>
 			<height>300</height>
 			<orientation>vertical</orientation>
-			<include>VisibleFade</include>
+			<include>SubMenuFade</include>
 			<onup>200</onup>
 			<ondown>200</ondown>
 			<onleft>1000</onleft>
@@ -63,11 +63,11 @@
 		</control>
 		<control type="grouplist" id="200">
 			<posx>140</posx>
-			<posy>132</posy>
+			<posy>136</posy>
 			<width>170</width>
 			<height>300</height>
 			<orientation>vertical</orientation>
-			<include>VisibleFade</include>
+			<include>SubMenuFade</include>
 			<onup>200</onup>
 			<ondown>200</ondown>
 			<onleft>1000</onleft>
@@ -117,11 +117,11 @@
 		</control>
 		<control type="grouplist" id="200">
 			<posx>140</posx>
-			<posy>207</posy>
+			<posy>211</posy>
 			<width>170</width>
 			<height>300</height>
 			<orientation>vertical</orientation>
-			<include>VisibleFade</include>
+			<include>SubMenuFade</include>
 			<onup>200</onup>
 			<ondown>200</ondown>
 			<onleft>1000</onleft>
@@ -166,11 +166,11 @@
 		</control>
 		<control type="grouplist" id="200">
 			<posx>140</posx>
-			<posy>282</posy>
+			<posy>286</posy>
 			<width>170</width>
 			<height>300</height>
 			<orientation>vertical</orientation>
-			<include>VisibleFade</include>
+			<include>SubMenuFade</include>
 			<onup>200</onup>
 			<ondown>200</ondown>
 			<onleft>1000</onleft>
@@ -190,11 +190,11 @@
 		</control>
 		<control type="grouplist" id="200">
 			<posx>140</posx>
-			<posy>357</posy>
+			<posy>361</posy>
 			<width>170</width>
 			<height>300</height>
 			<orientation>vertical</orientation>
-			<include>VisibleFade</include>
+			<include>SubMenuFade</include>
 			<onup>200</onup>
 			<ondown>200</ondown>
 			<onleft>1000</onleft>
@@ -249,18 +249,18 @@
 		</control>
 		<control type="grouplist" id="200">
 			<posx>140</posx>
-			<posy>432</posy>
+			<posy>436</posy>
 			<width>170</width>
 			<height>300</height>
 			<orientation>vertical</orientation>
-			<include>VisibleFade</include>
+			<include>SubMenuFade</include>
 			<onup>200</onup>
 			<ondown>200</ondown>
 			<onleft>1000</onleft>
 			<onright>1000</onright>
 			<visible>Container(1000).HasFocus(6)</visible>
 			<control type="button" id="201">
-				<label>Add-Ons</label>
+				<label>Get Add-Ons</label>
 				<include>HomeSubButton</include>
 				<onclick>-</onclick>
 			</control>
@@ -298,18 +298,18 @@
 		</control>
 		<control type="grouplist" id="200">
 			<posx>140</posx>
-			<posy>507</posy>
+			<posy>511</posy>
 			<width>170</width>
 			<height>300</height>
 			<orientation>vertical</orientation>
-			<include>VisibleFade</include>
+			<include>SubMenuFade</include>
 			<onup>200</onup>
 			<ondown>200</ondown>
 			<onleft>1000</onleft>
 			<onright>1000</onright>
 			<visible>Container(1000).HasFocus(7)</visible>
 			<control type="button" id="201">
-				<label>Weather</label>
+				<label>Refresh Weather</label>
 				<include>HomeSubButton</include>
 				<onclick>-</onclick>
 			</control>
@@ -319,14 +319,19 @@
 				<texture>white.png</texture>
 				<colordiffuse>normal</colordiffuse>
 			</control>
+			<control type="button" id="201">
+				<label>Change Location</label>
+				<include>HomeSubButton</include>
+				<onclick>-</onclick>
+			</control>
 		</control>
 		<control type="grouplist" id="200">
 			<posx>140</posx>
-			<posy>582</posy>
+			<posy>586</posy>
 			<width>170</width>
 			<height>300</height>
 			<orientation>vertical</orientation>
-			<include>VisibleFade</include>
+			<include>SubMenuFade</include>
 			<onup>200</onup>
 			<ondown>200</ondown>
 			<onleft>1000</onleft>
@@ -349,6 +354,11 @@
 				<colordiffuse>normal</colordiffuse>
 			</control>
 			<control type="button" id="204">
+				<label>Profile Settings</label>
+				<include>HomeSubButton</include>
+				<onclick>-</onclick>
+			</control>
+			<control type="button" id="205">
 				<label>Skin Settings</label>
 				<include>HomeSubButton</include>
 				<onclick>-</onclick>
diff --git a/720p/IncludesAnims.xml b/720p/IncludesAnims.xml
index 186bd7b..edd66ee 100644
--- a/720p/IncludesAnims.xml
+++ b/720p/IncludesAnims.xml
@@ -1,4 +1,12 @@
 <includes>
+	<include name="SubMenuFade">
+		<animation type="Visible">
+			<effect type="fade" start="0" end="100" time="150"/>
+		</animation>
+		<animation type="Hidden">
+			<effect type="fade" start="100" end="0" time="150"/>
+		</animation>
+	</include>
 	<include name="VisibleFade">
 		<animation type="Visible">
 			<effect type="fade" start="0" end="100" time="400"/>
diff --git a/720p/MyVideoNav.xml b/720p/MyVideoNav.xml
index cf80229..9fe9a35 100644
--- a/720p/MyVideoNav.xml
+++ b/720p/MyVideoNav.xml
@@ -3,7 +3,9 @@
 	<views>50</views>
 	<controls>
 		<include>DefaultBackground</include>
+		<include>Fanart</include>
 		<include>SideMenu</include>
+		<include>TopMenuVideo</include>
 		<include>ViewPanelVideo</include>
 	</controls>
 </window>
diff --git a/720p/Settings.xml b/720p/Settings.xml
index 844c78d..a62a885 100644
--- a/720p/Settings.xml
+++ b/720p/Settings.xml
@@ -2,232 +2,16 @@
 	<defaultcontrol>1000</defaultcontrol>
 	<controls>
 		<include>DefaultBackground</include>
-		<control type="group">
-			<include>WindowOpenCloseFade</include>
-			<control type="label">
-				<posx>0</posx>
-				<posy>55</posy>
-				<width>1280</width>
-				<height>30</height>
-				<label>[B]$LOCALIZE[5][/B]</label>
-				<font>font30</font>
-				<textcolor>dark</textcolor>
-				<align>center</align>
-			</control>
-		</control>
-		<control type="group">
-			<posx>30</posx>
-			<posy>50</posy>
-			<width>460</width>
-			<height>420</height>
-			<include>WindowOpenCloseZoomInOut</include>
-			<control type="list" id="1000">
-				<orientation>vertical</orientation>
-				<posx>30</posx>
-				<posy>30</posy>
-				<width>430</width>
-				<height>360</height>
-				<onup>21</onup>
-				<ondown>1000</ondown>
-				<onleft>1001</onleft>
-				<onright>1001</onright>
-				<itemlayout width="430" height="60">
-					<control type="image">
-						<posx>0</posx>
-						<posy>0</posy>
-						<width>400</width>
-						<height>60</height>
-						<texture border="35,8,35,8">ListNoFocus.png</texture>
-					</control>
-					<control type="label">
-						<posx>200</posx>
-						<posy>-1</posy>
-						<width>400</width>
-						<height>30</height>
-						<label>[UPPERCASE][B]$INFO[ListItem.Label][/B][/UPPERCASE]</label>
-						<font>font30</font>
-						<textcolor>lightgrey</textcolor>
-						<shadowcolor>FF000000</shadowcolor>
-						<align>center</align>
-					</control>
-				</itemlayout>
-				<focusedlayout width="430" height="60">
-					<control type="image">
-						<posx>0</posx>
-						<posy>0</posy>
-						<width>400</width>
-						<height>60</height>
-						<texture border="35,8,35,8">ListNoFocus.png</texture>
-					</control>
-					<control type="image">
-						<posx>0</posx>
-						<posy>0</posy>
-						<width>400</width>
-						<height>60</height>
-						<texture border="35,8,35,8">ListFocus.png</texture>
-						<animation effect="slide" start="0,-40" end="0,0" time="150" reversible="false" tween="quadratic" easing="out" condition="Container(1000).OnNext + !Container(1000).HasFocus(1)">focus</animation>
-						<animation effect="slide" start="0,40" end="0,0" time="150" reversible="false" tween="quadratic" easing="out" condition="Container(1000).OnPrevious + !Container(1000).HasFocus(6)">focus</animation>
-						<animation effect="fade" start="50" end="80" time="1500" pulse="true" condition="true">Conditional</animation>
-						<visible>Control.HasFocus(1000)</visible>
-					</control>
-					<control type="label">
-						<posx>200</posx>
-						<posy>-1</posy>
-						<width>400</width>
-						<height>30</height>
-						<label>[B]$INFO[ListItem.Label][/B]</label>
-						<font>font30</font>
-						<textcolor>lightgrey</textcolor>
-						<shadowcolor>FF000000</shadowcolor>
-						<align>center</align>
-					</control>
-					<control type="label">
-						<posx>200</posx>
-						<posy>-1</posy>
-						<width>400</width>
-						<height>30</height>
-						<label>[B]$INFO[ListItem.Label][/B]</label>
-						<font>font30</font>
-						<textcolor>normal</textcolor>
-						<align>center</align>
-						<animation effect="fade" start="0" end="100" time="200" condition="true">Conditional</animation>
-						<visible>Control.HasFocus(1000)</visible>
-					</control>
-				</focusedlayout>
-				<content>
-					<item id="1">
-						<label>$LOCALIZE[480]</label>
-						<onclick>ActivateWindow(AppearanceSettings)</onclick>
-					</item>
-					<item id="2">
-						<label>$LOCALIZE[3]</label>
-						<onclick>ActivateWindow(VideosSettings)</onclick>
-					</item>
-					<item id="3">
-						<label>$LOCALIZE[2]</label>
-						<onclick>ActivateWindow(MusicSettings)</onclick>
-					</item>
-					<item id="4">
-						<label>$LOCALIZE[1]</label>
-						<onclick>ActivateWindow(PicturesSettings)</onclick>
-					</item>
-					<item id="5">
-						<label>$LOCALIZE[8]</label>
-						<onclick>ActivateWindow(WeatherSettings)</onclick>
-					</item>
-					<item id="6">
-						<label>$LOCALIZE[13000]</label>
-						<onclick>ActivateWindow(SystemSettings)</onclick>
-					</item>
-				</content>
-			</control>
-		</control>
-		<control type="group">
-			<posx>800</posx>
-			<posy>50</posy>
-			<width>460</width>
-			<height>420</height>
-			<include>WindowOpenCloseZoomInOut</include>
-			<control type="list" id="1001">
-				<orientation>vertical</orientation>
-				<posx>30</posx>
-				<posy>30</posy>
-				<width>430</width>
-				<height>360</height>
-				<onup>21</onup>
-				<ondown>1001</ondown>
-				<onleft>1000</onleft>
-				<onright>1000</onright>
-				<itemlayout width="430" height="60">
-					<control type="image">
-						<posx>0</posx>
-						<posy>0</posy>
-						<width>400</width>
-						<height>60</height>
-						<texture border="35,8,35,8">ListNoFocus.png</texture>
-					</control>
-					<control type="label">
-						<posx>200</posx>
-						<posy>-1</posy>
-						<width>400</width>
-						<height>30</height>
-						<label>[B]$INFO[ListItem.Label][/B]</label>
-						<font>font30</font>
-						<textcolor>lightgrey</textcolor>
-						<shadowcolor>FF000000</shadowcolor>
-						<align>center</align>
-					</control>
-				</itemlayout>
-				<focusedlayout width="430" height="60">
-					<control type="image">
-						<posx>0</posx>
-						<posy>0</posy>
-						<width>400</width>
-						<height>60</height>
-						<texture border="35,8,35,8">ListNoFocus.png</texture>
-					</control>
-					<control type="image">
-						<posx>0</posx>
-						<posy>0</posy>
-						<width>400</width>
-						<height>60</height>
-						<texture border="35,8,35,8">ListFocus.png</texture>
-						<animation effect="slide" start="0,-40" end="0,0" time="150" reversible="false" tween="quadratic" easing="out" condition="Container(1001).OnNext + !Container(1000).HasFocus(1)">focus</animation>
-						<animation effect="slide" start="0,40" end="0,0" time="150" reversible="false" tween="quadratic" easing="out" condition="Container(1001).OnPrevious + !Container(1000).HasFocus(6)">focus</animation>
-						<animation effect="fade" start="50" end="80" time="1500" pulse="true" condition="true">Conditional</animation>
-						<visible>Control.HasFocus(1001)</visible>
-					</control>
-					<control type="label">
-						<posx>200</posx>
-						<posy>-1</posy>
-						<width>400</width>
-						<height>30</height>
-						<label>[B]$INFO[ListItem.Label][/B]</label>
-						<font>font30</font>
-						<textcolor>lightgrey</textcolor>
-						<shadowcolor>FF000000</shadowcolor>
-						<align>center</align>
-					</control>
-					<control type="label">
-						<posx>200</posx>
-						<posy>-1</posy>
-						<width>400</width>
-						<height>30</height>
-						<label>[B]$INFO[ListItem.Label][/B]</label>
-						<font>font40</font>
-						<textcolor>normal</textcolor>
-						<align>center</align>
-						<animation effect="fade" start="0" end="100" time="200" condition="true">Conditional</animation>
-						<visible>Control.HasFocus(1001)</visible>
-					</control>
-				</focusedlayout>
-				<content>
-					<item id="1">
-						<label>$LOCALIZE[705]</label>
-						<onclick>ActivateWindow(NetworkSettings)</onclick>
-					</item>
-					<item id="2">
-						<label>$LOCALIZE[13200]</label>
-						<onclick>ActivateWindow(Profiles)</onclick>
-					</item>
-					<item id="3">
-						<label>$LOCALIZE[24001]</label>
-						<onclick>ActivateWindow(AddonBrowser)</onclick>
-					</item>
-					<item id="4">
-						<label>$LOCALIZE[20077]</label>
-						<onclick>ActivateWindow(1111)</onclick>
-					</item>
-					<item id="5">
-						<label>$LOCALIZE[10003]</label>
-						<onclick>ActivateWindow(FileManager)</onclick>
-					</item>
-					<item id="6">
-						<label>$LOCALIZE[130]</label>
-						<onclick>ActivateWindow(SystemInfo)</onclick>
-					</item>
-				</content>
-			</control>
+		<control type="button" id="1000">
+			<posx>-10</posx>
+			<posy>-10</posy>
+			<width>1</width>
+			<height>1</height>
+			<label>-</label>
+			<font>font20</font>
+			<texturefocus>-</texturefocus>
+			<texturenofocus>-</texturenofocus>
+			<onfocus>ActivateWindow(Home)</onfocus>
 		</control>
 	</controls>
 </window>
diff --git a/720p/SettingsCategory.xml b/720p/SettingsCategory.xml
index 7de03c6..0ecd260 100644
--- a/720p/SettingsCategory.xml
+++ b/720p/SettingsCategory.xml
@@ -2,71 +2,73 @@
 	<defaultcontrol>3</defaultcontrol>
 	<controls>
 		<include>DefaultBackground</include>
-		<control type="group" id="1000">
+		<include>SideMenu</include>
+		<include>TopMenuSettings</include>
+		<control type="group">
 			<control type="group">
-				<posx>30</posx>
+				<posx>115</posx>
 				<posy>140</posy>
 				<width>410</width>
 				<height>575</height>
 				<include>WindowOpenCloseZoomInOut</include>
 				<control type="grouplist" id="3">
-					<posx>25</posx>
+					<posx>0</posx>
 					<posy>30</posy>
-					<width>360</width>
-					<height>450</height>
+					<width>250</width>
+					<height>660</height>
 					<itemgap>0</itemgap>
-					<onup>21</onup>
+					<onup>9000</onup>
 					<ondown>3</ondown>
-					<onleft>5</onleft>
+					<onleft>1000</onleft>
 					<onright>5</onright>
+					<onback>ActivateWindow(Home)</onback>
 				</control>
 			</control>
 			<control type="group">
-				<posx>300</posx>
+				<posx>400</posx>
 				<posy>100</posy>
+				<include>WindowOpenCloseZoomInOut</include>
 				<control type="grouplist" id="5">
-					<posx>50</posx>
+					<posx>0</posx>
 					<posy>30</posy>
-					<width>600</width>
+					<width>848</width>
 					<height>660</height>
 					<itemgap>0</itemgap>
-					<onup>21</onup>
+					<onup>9000</onup>
 					<ondown>5</ondown>
 					<onleft>3</onleft>
 					<onright>3</onright>
-					<include>WindowOpenCloseZoomInOut</include>
+					<onback>ActivateWindow(Home)</onback>
 				</control>
 			</control>
 		</control>
-		<control type="button" id="7">
+		<control type="button" id="10">
 			<posx>0</posx>
 			<posy>0</posy>
-			<width>360</width>
+			<width>250</width>
 			<height>50</height>
 			<label>-</label>
 		</control>
-		<control type="radiobutton" id="8">
+		<control type="button" id="7">
 			<posx>0</posx>
 			<posy>0</posy>
-			<width>360</width>
-			<height>50</height>
+			<width>848</width>
+			<height>30</height>
 			<label>-</label>
 		</control>
-		<control type="spincontrolex" id="9">
+		<control type="radiobutton" id="8">
 			<posx>0</posx>
 			<posy>0</posy>
-			<width>360</width>
-			<height>50</height>
+			<width>848</width>
+			<height>30</height>
 			<label>-</label>
 		</control>
-		<control type="button" id="10">
+		<control type="spincontrolex" id="9">
 			<posx>0</posx>
 			<posy>0</posy>
-			<width>360</width>
-			<height>50</height>
+			<width>848</width>
+			<height>30</height>
 			<label>-</label>
-			<texturefocus border="35,8,35,8">ButtonFocus.png</texturefocus>
-			<texturenofocus border="35,8,35,8">ListNoFocus.png</texturenofocus>
 		</control>
 	</controls>
 </window>
diff --git a/720p/ViewPanel.xml b/720p/ViewPanel.xml
index 42769ae..375e7fb 100644
--- a/720p/ViewPanel.xml
+++ b/720p/ViewPanel.xml
@@ -6,6 +6,15 @@
 			<width>1120</width>
 			<height>624</height>			
 			<include>WindowOpenCloseZoomInOut</include>
+			<visible>Control.IsVisible(50)</visible>
+			<control type="image">
+				<posx>-2</posx>
+				<posy>-2</posy>
+				<width>1124</width>
+				<height>628</height>
+				<texture>white.png</texture>
+				<colordiffuse>20FFFFFF</colordiffuse>
+			</control>
 			<control type="panel" id="50">
 				<posx>0</posx>
 				<posy>0</posy>
@@ -15,10 +24,10 @@
 				<pagecontrol>60</pagecontrol>
 				<scrolltime>200</scrolltime>
 				<preloaditems>4</preloaditems>
-				<onleft>9000</onleft>
-				<onright>60</onright>
-				<onup>50</onup>
-				<ondown>50</ondown>
+				<onleft>1000</onleft>
+				<onright>50</onright>
+				<onup>2</onup>
+				<ondown>60</ondown>
 				<orientation>horizontal</orientation>
 				<itemlayout width="140" height="208">
 					<control type="image">
@@ -30,32 +39,192 @@
 						<aspectratio scalediffuse="false">stretch</aspectratio>
 					</control>
 				</itemlayout>
-				<focusedlayout width="140" height="208">
+				<focusedlayout width="148" height="208" condition="![Container.Column(0) | Container.Column(7)] + Container.Row(1)">
 					<control type="image">
-						<posx>0</posx>
+						<posx>-4</posx>
 						<posy>0</posy>
-						<width>140</width>
+						<width>148</width>
+						<height>208</height>
+						<texture background="true">$INFO[ListItem.Icon]</texture>
+						<aspectratio scalediffuse="false">stretch</aspectratio>
+						<bordertexture border="24">thumb-back.png</bordertexture>
+						<bordersize>14</bordersize>
+						<animation type="Focus" reversible="false">
+							<effect type="zoom" start="116" end="140" center="auto" time="300" tween="back" easing="out"/>
+						</animation>
+					</control>
+				</focusedlayout>
+				<focusedlayout width="148" height="208" condition="Container.Column(0) + Container.Row(1)">
+					<control type="image">
+						<posx>-4</posx>
+						<posy>0</posy>
+						<width>148</width>
+						<height>208</height>
+						<texture background="true">$INFO[ListItem.Icon]</texture>
+						<aspectratio scalediffuse="false">stretch</aspectratio>
+						<bordertexture border="24">thumb-back.png</bordertexture>
+						<bordersize>14</bordersize>
+						<animation type="Focus" reversible="false">
+							<effect type="zoom" start="116" end="140" center="auto" time="300" tween="back" easing="out"/>
+							<effect type="slide" start="0,0" end="10,0" time="300" tween="back" easing="out"/>
+						</animation>
+					</control>
+				</focusedlayout>
+				<focusedlayout width="148" height="208" condition="![Container.Column(0) | Container.Column(7)] + Container.Row(0)">
+					<control type="image">
+						<posx>-4</posx>
+						<posy>0</posy>
+						<width>148</width>
+						<height>208</height>
+						<texture background="true">$INFO[ListItem.Icon]</texture>
+						<aspectratio scalediffuse="false">stretch</aspectratio>
+						<bordertexture border="24">thumb-back.png</bordertexture>
+						<bordersize>14</bordersize>
+						<animation type="Focus" reversible="false">
+							<effect type="zoom" start="116" end="140" center="auto" time="300" tween="back" easing="out"/>
+							<effect type="slide" start="0,0" end="0,16" time="300" tween="back" easing="out"/>
+						</animation>
+					</control>
+				</focusedlayout>
+				<focusedlayout width="148" height="208" condition="Container.Column(7) + Container.Row(1)">
+					<control type="image">
+						<posx>-4</posx>
+						<posy>0</posy>
+						<width>148</width>
+						<height>208</height>
+						<texture background="true">$INFO[ListItem.Icon]</texture>
+						<aspectratio scalediffuse="false">stretch</aspectratio>
+						<bordertexture border="24">thumb-back.png</bordertexture>
+						<bordersize>14</bordersize>
+						<animation type="Focus" reversible="false">
+							<effect type="zoom" start="116" end="140" center="auto" time="300" tween="back" easing="out"/>
+							<effect type="slide" start="0,0" end="-10,0" time="300" tween="back" easing="out"/>
+						</animation>
+					</control>
+				</focusedlayout>
+				<focusedlayout width="148" height="208" condition="![Container.Column(0) | Container.Column(7)] + Container.Row(2)">
+					<control type="image">
+						<posx>-4</posx>
+						<posy>0</posy>
+						<width>148</width>
+						<height>208</height>
+						<texture background="true">$INFO[ListItem.Icon]</texture>
+						<aspectratio scalediffuse="false">stretch</aspectratio>
+						<bordertexture border="24">thumb-back.png</bordertexture>
+						<bordersize>14</bordersize>
+						<animation type="Focus" reversible="false">
+							<effect type="zoom" start="116" end="140" center="auto" time="300" tween="back" easing="out"/>
+							<effect type="slide" start="0,0" end="0,-16" time="300" tween="back" easing="out"/>
+						</animation>
+					</control>
+				</focusedlayout>
+				<focusedlayout width="148" height="208" condition="Container.Column(0) + Container.Row(0)">
+					<control type="image">
+						<posx>-4</posx>
+						<posy>0</posy>
+						<width>148</width>
+						<height>208</height>
+						<texture background="true">$INFO[ListItem.Icon]</texture>
+						<aspectratio scalediffuse="false">stretch</aspectratio>
+						<bordertexture border="24">thumb-back.png</bordertexture>
+						<bordersize>14</bordersize>
+						<animation type="Focus" reversible="false">
+							<effect type="zoom" start="116" end="140" center="auto" time="300" tween="back" easing="out"/>
+							<effect type="slide" start="0,0" end="10,16" time="300" tween="back" easing="out"/>
+						</animation>
+					</control>
+				</focusedlayout>
+				<focusedlayout width="148" height="208" condition="Container.Column(7) + Container.Row(0)">
+					<control type="image">
+						<posx>-4</posx>
+						<posy>0</posy>
+						<width>148</width>
+						<height>208</height>
+						<texture background="true">$INFO[ListItem.Icon]</texture>
+						<aspectratio scalediffuse="false">stretch</aspectratio>
+						<bordertexture border="24">thumb-back.png</bordertexture>
+						<bordersize>14</bordersize>
+						<animation type="Focus" reversible="false">
+							<effect type="zoom" start="116" end="140" center="auto" time="300" tween="back" easing="out"/>
+							<effect type="slide" start="0,0" end="-10,16" time="300" tween="back" easing="out"/>
+						</animation>
+					</control>
+				</focusedlayout>
+				<focusedlayout width="148" height="208" condition="Container.Column(7) + Container.Row(2)">
+					<control type="image">
+						<posx>-4</posx>
+						<posy>0</posy>
+						<width>148</width>
 						<height>208</height>
 						<texture background="true">$INFO[ListItem.Icon]</texture>
 						<aspectratio scalediffuse="false">stretch</aspectratio>
-						<animation effect="zoom" start="100" end="130" time="200" center="auto">Focus</animation>
-						<animation effect="zoom" start="130" end="100" time="200" center="auto">UnFocus</animation>
+						<bordertexture border="24">thumb-back.png</bordertexture>
+						<bordersize>14</bordersize>
+						<animation type="Focus" reversible="false">
+							<effect type="zoom" start="116" end="140" center="auto" time="300" tween="back" easing="out"/>
+							<effect type="slide" start="0,0" end="-10,-16" time="300" tween="back" easing="out"/>
+						</animation>
+					</control>
+				</focusedlayout>
+				<focusedlayout width="148" height="208" condition="Container.Column(0) + Container.Row(2)">
+					<control type="image">
+						<posx>-4</posx>
+						<posy>0</posy>
+						<width>148</width>
+						<height>208</height>
+						<texture background="true">$INFO[ListItem.Icon]</texture>
+						<aspectratio scalediffuse="false">stretch</aspectratio>
+						<bordertexture border="24">thumb-back.png</bordertexture>
+						<bordersize>14</bordersize>
+						<animation type="Focus" reversible="false">
+							<effect type="zoom" start="116" end="140" center="auto" time="300" tween="back" easing="out"/>
+							<effect type="slide" start="0,0" end="10,-16" time="300" tween="back" easing="out"/>
+						</animation>
 					</control>
 				</focusedlayout>
 			</control>
 		</control>
+		<control type="scrollbar" id="60">
+			<posx>115</posx>
+			<posy>685</posy>
+			<width>1120</width>
+			<height>20</height>
+			<texturesliderbackground border="10,0,10,0">scrollbar-back.png</texturesliderbackground>
+			<texturesliderbar>-</texturesliderbar>
+			<texturesliderbarfocus>-</texturesliderbarfocus>
+			<textureslidernib>scrollbar-nib.png</textureslidernib>
+			<textureslidernibfocus>scrollbar-nib.png</textureslidernibfocus>
+			<onup>50</onup>
+			<ondown>50</ondown>
+			<showonepage>false</showonepage>
+			<orientation>horizontal</orientation>
+			<include>VisibleFade</include>
+			<visible allowhiddenfocus="true">Control.IsVisible(50) + Control.HasFocus(60)</visible>
+		</control>
 		<control type="group">
-			<visible>Control.IsVisible(50)</visible>
-			<control type="label">
+			<posx>200</posx>
+			<posy>610</posy>
+			<width>880</width>
+			<height>110</height>
+			<include>VisibleZoomInOut</include>
+			<visible>Control.IsVisible(50) + !IsEmpty(ListItem.Label) + System.IdleTime(1)</visible>
+			<control type="image">
 				<posx>0</posx>
-				<posy>690</posy>
-				<width>1280</width>
+				<posy>0</posy>
+				<width>880</width>
+				<height>110</height>
+				<texture border="40">busy_background.png</texture>
+				<colordiffuse>D0FFFFFF</colordiffuse>
+			</control>
+			<control type="label">
+				<posx>20</posx>
+				<posy>25</posy>
+				<width>840</width>
 				<height>30</height>
 				<label>[B]$INFO[ListItem.Label][/B]</label>
+				<align>center</align>
 				<font>font20</font>
 				<textcolor>white</textcolor>
-				<shadowcolor>FF000000</shadowcolor>
-				<align>center</align>
 			</control>
 		</control>
 	</include>
diff --git a/720p/defaults.xml b/720p/defaults.xml
index a8463ac..8299c2e 100644
--- a/720p/defaults.xml
+++ b/720p/defaults.xml
@@ -3,15 +3,15 @@
 		<posx>0</posx>
 		<posy>0</posy>
 		<width>300</width>
-		<height>50</height>
+		<height>30</height>
 		<label>-</label>
 		<font>font20</font>
 		<textcolor>lightgrey</textcolor>
-		<texturefocus border="35,8,35,8">ButtonFocus.png</texturefocus>
-		<texturenofocus border="35,8,35,8">ListNoFocus.png</texturenofocus>
-		<focusedcolor>normal</focusedcolor>
+		<texturefocus border="4">button_FO.png</texturefocus>
+		<texturenofocus border="6">button_NF.png</texturenofocus>
+		<focusedcolor>white</focusedcolor>
 		<disabledcolor>grey</disabledcolor>
-		<textoffsetx>0</textoffsetx>
+		<textoffsetx>5</textoffsetx>
 		<textoffsety>0</textoffsety>
 		<aligny>top</aligny>
 		<pulseonselect>true</pulseonselect>
@@ -20,15 +20,15 @@
 		<posx>0</posx>
 		<posy>0</posy>
 		<width>300</width>
-		<height>50</height>
+		<height>30</height>
 		<label>-</label>
 		<font>font20</font>
 		<textcolor>lightgrey</textcolor>
-		<texturefocus border="35,8,35,8">ButtonFocus.png</texturefocus>
-		<texturenofocus border="35,8,35,8">ListNoFocus.png</texturenofocus>
-		<focusedcolor>normal</focusedcolor>
+		<texturefocus border="4">button_FO.png</texturefocus>
+		<texturenofocus border="6">button_NF.png</texturenofocus>
+		<focusedcolor>white</focusedcolor>
 		<disabledcolor>grey</disabledcolor>
-		<textoffsetx>0</textoffsetx>
+		<textoffsetx>5</textoffsetx>
 		<textoffsety>0</textoffsety>
 		<aligny>top</aligny>
 		<pulseonselect>true</pulseonselect>
@@ -37,15 +37,15 @@
 		<posx>0</posx>
 		<posy>0</posy>
 		<width>300</width>
-		<height>50</height>
+		<height>30</height>
 		<label>-</label>
 		<font>font20</font>
 		<textcolor>lightgrey</textcolor>
-		<texturefocus border="35,8,35,8">ButtonFocus.png</texturefocus>
-		<texturenofocus border="35,8,35,8">ListNoFocus.png</texturenofocus>
-		<focusedcolor>normal</focusedcolor>
+		<texturefocus border="4">button_FO.png</texturefocus>
+		<texturenofocus border="6">button_NF.png</texturenofocus>
+		<focusedcolor>white</focusedcolor>
 		<disabledcolor>grey</disabledcolor>
-		<textoffsetx>0</textoffsetx>
+		<textoffsetx>5</textoffsetx>
 		<textoffsety>0</textoffsety>
 		<aligny>top</aligny>
 		<pulseonselect>true</pulseonselect>
@@ -60,15 +60,15 @@
 		<posx>0</posx>
 		<posy>0</posy>
 		<width>300</width>
-		<height>50</height>
+		<height>30</height>
 		<label>-</label>
 		<font>font20</font>
 		<textcolor>lightgrey</textcolor>
-		<texturefocus border="35,8,35,8">ButtonFocus.png</texturefocus>
-		<texturenofocus border="35,8,35,8">ListNoFocus.png</texturenofocus>
-		<focusedcolor>normal</focusedcolor>
+		<texturefocus border="4">button_FO.png</texturefocus>
+		<texturenofocus border="6">button_NF.png</texturenofocus>
+		<focusedcolor>white</focusedcolor>
 		<disabledcolor>grey</disabledcolor>
-		<textoffsetx>0</textoffsetx>
+		<textoffsetx>5</textoffsetx>
 		<textoffsety>0</textoffsety>
 		<aligny>top</aligny>
 		<pulseonselect>true</pulseonselect>
@@ -77,26 +77,26 @@
 		<textureupfocus>ArrowUpFocus.png</textureupfocus>
 		<texturedown>ArrowDown.png</texturedown>
 		<texturedownfocus>ArrowDownFocus.png</texturedownfocus>
-		<spinwidth>40</spinwidth>
-		<spinheight>50</spinheight>
+		<spinwidth>30</spinwidth>
+		<spinheight>30</spinheight>
 	</default>
 	<default type="togglebutton">
 		<posx>0</posx>
 		<posy>0</posy>
 		<width>300</width>
-		<height>50</height>
+		<height>30</height>
 		<label>-</label>
 		<font>font20</font>
 		<textcolor>lightgrey</textcolor>
-		<focusedcolor>normal</focusedcolor>
+		<focusedcolor>white</focusedcolor>
 		<disabledcolor>grey</disabledcolor>
-		<textoffsetx>0</textoffsetx>
+		<textoffsetx>5</textoffsetx>
 		<textoffsety>0</textoffsety>
 		<aligny>top</aligny>
 		<pulseonselect>true</pulseonselect>
-		<texturefocus>ArrowUpFocus.png</texturefocus>
-		<texturenofocus>ArrowUp.png</texturenofocus>
-		<alttexturefocus>ArrowDownFocus.png</alttexturefocus>
-		<alttexturenofocus>ArrowDown.png</alttexturenofocus>
+		<texturefocus border="4">button_FO.png</texturefocus>
+		<texturenofocus border="6">button_NF.png</texturenofocus>
+		<alttexturefocus border="4">button_FO.png</alttexturefocus>
+		<alttexturenofocus border="4">button_NF.png</alttexturenofocus>
 	</default>
 </includes>
diff --git a/720p/includes.xml b/720p/includes.xml
index 9ea9faf..0f82bde 100644
--- a/720p/includes.xml
+++ b/720p/includes.xml
@@ -71,7 +71,7 @@
 	<include name="HomeSubButton">
 		<width>170</width>
 		<height>26</height>
-		<font>font20</font>
+		<font>font14m</font>
 		<textcolor>white</textcolor>
 		<texturefocus>-</texturefocus>
 		<texturenofocus>-</texturenofocus>
@@ -109,15 +109,18 @@
 			<width>64</width>
 			<height>600</height>
 			<control type="list" id="1000">
-				<orientation>vertical</orientation>
 				<posx>0</posx>
 				<posy>0</posy>
 				<width>64</width>
 				<height>600</height>
+				<orientation>vertical</orientation>
 				<onup>1000</onup>
 				<ondown>1000</ondown>
 				<onleft>1000</onleft>
-				<onright>200</onright>
+				<onright condition="Window.IsVisible(Home)">200</onright>
+				<onright condition="Window.IsVisible(Videos)">50</onright>
+				<onright condition="!Window.IsVisible(Home) + !Window.IsVisible(Videos)">3</onright>
+				<onback condition="!Window.IsVisible(Home)">ActivateWindow(Home)</onback>
 				<itemlayout width="64" height="75">
 					<control type="image">
 						<posx>0</posx>
@@ -202,10 +205,415 @@
 						<label>-</label>
 						<icon>home_settings_NF.png</icon>
 						<property name="Icon_Focus">home_settings_FO.png</property>
-						<onclick>ActivateWindow(Settings)</onclick>
+						<onclick>ActivateWindow(AppearanceSettings)</onclick>
 					</item>
 				</content>
 			</control>
 		</control>
 	</include>
+	<include name="TopMenuVideo">
+		<control type="group">
+			<posx>115</posx>
+			<posy>24</posy>
+			<width>64</width>
+			<height>600</height>
+			<control type="grouplist" id="9000">
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>1130</width>
+				<height>30</height>
+				<itemgap>0</itemgap>
+				<orientation>horizontal</orientation>
+				<onup>50</onup>
+				<ondown>50</ondown>
+				<onleft>1000</onleft>
+				<onright>9000</onright>
+				<control type="button" id="3000">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>26</width>
+					<height>26</height>
+					<label>-</label>
+					<font>font16m</font>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus>home_FO.png</texturefocus>
+					<texturenofocus>home_NF.png</texturenofocus>
+					<onclick>ActivateWindow(Home)</onclick>
+				</control>
+				<control type="group" id="3001">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="2">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>210</width>
+					<height>26</height>
+					<label>-</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>-</onclick>
+				</control>
+				<control type="group" id="3002">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="3">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>210</width>
+					<height>26</height>
+					<label>-</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>-</onclick>
+				</control>
+				<control type="group" id="3003">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="togglebutton" id="4">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>210</width>
+					<height>26</height>
+					<label>Sort Direction:</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<alttexturefocus border="4">button_FO.png</alttexturefocus>
+					<alttexturenofocus border="4">-</alttexturenofocus>
+					<onclick>-</onclick>
+				</control>
+				<control type="group" id="3004">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="10">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>210</width>
+					<height>26</height>
+					<label>-</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>-</onclick>
+				</control>
+				<control type="group" id="3005">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="3006">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>210</width>
+					<height>26</height>
+					<label>Options</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>-</onclick>
+				</control>
+			</control>
+		</control>
+	</include>
+	<include name="TopMenuSettings">
+		<control type="group">
+			<posx>115</posx>
+			<posy>24</posy>
+			<width>64</width>
+			<height>600</height>
+			<control type="grouplist" id="9000">
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>1133</width>
+				<height>30</height>
+				<itemgap>0</itemgap>
+				<orientation>horizontal</orientation>
+				<onup>5</onup>
+				<ondown>5</ondown>
+				<onleft>1000</onleft>
+				<onright>9000</onright>
+				<onback>ActivateWindow(Home)</onback>
+				<control type="button" id="3000">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>26</width>
+					<height>26</height>
+					<label>-</label>
+					<font>font16m</font>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus>home_FO.png</texturefocus>
+					<texturenofocus>home_NF.png</texturenofocus>
+					<onclick>ActivateWindow(Home)</onclick>
+				</control>
+				<control type="group" id="3001">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="3002">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>149</width>
+					<height>26</height>
+					<label>Appearance</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>ActivateWindow(AppearanceSettings)</onclick>
+				</control>
+				<control type="group" id="3003">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="3004">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>149</width>
+					<height>26</height>
+					<label>Video</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>ActivateWindow(VideosSettings)</onclick>
+				</control>
+				<control type="group" id="3005">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="3006">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>149</width>
+					<height>26</height>
+					<label>Music</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>ActivateWindow(MusicSettings)</onclick>
+				</control>
+				<control type="group" id="3007">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="3008">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>149</width>
+					<height>26</height>
+					<label>Picture</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>ActivateWindow(PicturesSettings)</onclick>
+				</control>
+				<control type="group" id="3009">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="3010">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>149</width>
+					<height>26</height>
+					<label>Weather</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>ActivateWindow(WeatherSettings)</onclick>
+				</control>
+				<control type="group" id="3011">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="3012">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>149</width>
+					<height>26</height>
+					<label>Network</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>ActivateWindow(NetworkSettings)</onclick>
+				</control>
+				<control type="group" id="3013">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>9</width>
+					<height>26</height>
+					<control type="image">
+						<posx>4</posx>
+						<posy>0</posy>
+						<width>1</width>
+						<height>26</height>
+						<texture>white.png</texture>
+						<colordiffuse>80FFFFFF</colordiffuse>
+					</control>
+				</control>
+				<control type="button" id="3014">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>149</width>
+					<height>26</height>
+					<label>System</label>
+					<font>font16m</font>
+					<align>center</align>
+					<textcolor>lightgrey</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="4">button_FO.png</texturefocus>
+					<texturenofocus border="4">-</texturenofocus>
+					<onclick>ActivateWindow(SystemSettings)</onclick>
+				</control>
+			</control>
+		</control>
+	</include>
 </includes>
diff --git a/fonts/gui font license.txt b/fonts/menu font license.txt
similarity index 100%
rename from fonts/gui font license.txt
rename to fonts/menu font license.txt
diff --git a/fonts/gui.ttf b/fonts/menu.ttf
similarity index 100%
rename from fonts/gui.ttf
rename to fonts/menu.ttf
diff --git a/media/button_FO.png b/media/button_FO.png
new file mode 100644
index 0000000..63cf429
Binary files /dev/null and b/media/button_FO.png differ
diff --git a/media/button_NF.png b/media/button_NF.png
new file mode 100644
index 0000000..a0ac343
Binary files /dev/null and b/media/button_NF.png differ
diff --git a/media/home_FO.png b/media/home_FO.png
new file mode 100644
index 0000000..13b1da9
Binary files /dev/null and b/media/home_FO.png differ
diff --git a/media/home_NF.png b/media/home_NF.png
new file mode 100644
index 0000000..1daa221
Binary files /dev/null and b/media/home_NF.png differ
diff --git a/media/scrollbar-back.png b/media/scrollbar-back.png
new file mode 100644
index 0000000..96a8fd6
Binary files /dev/null and b/media/scrollbar-back.png differ
diff --git a/media/scrollbar-nib.png b/media/scrollbar-nib.png
new file mode 100644
index 0000000..689e6e6
Binary files /dev/null and b/media/scrollbar-nib.png differ
diff --git a/media/thumb-back.png b/media/thumb-back.png
new file mode 100644
index 0000000..de11865
Binary files /dev/null and b/media/thumb-back.png differ